lyy před 1 rokem
rodič
revize
b70376dc97
4 změnil soubory, kde provedl 78 přidání a 70 odebrání
  1. 0 4
      components.d.ts
  2. 32 0
      src/request/api.js
  3. 2 2
      src/views/HomeView.vue
  4. 44 64
      src/views/roleman/index.vue

+ 0 - 4
components.d.ts

@@ -11,12 +11,10 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCalendar: typeof import('element-plus/es')['ElCalendar']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
@@ -26,7 +24,6 @@ declare module 'vue' {
     ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputb: typeof import('element-plus/es')['ElInputb']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -38,7 +35,6 @@ declare module 'vue' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
     IconCommunity: typeof import('./src/components/icons/IconCommunity.vue')['default']

+ 32 - 0
src/request/api.js

@@ -462,7 +462,39 @@ export const  apisystemrolelist = query => {
     });
 };
 
+//导出角色信息列表https://khy.xiaole.vip/api/system/role/export
 
+export const  apisystemroleexport = query => {
+    return service({
+        url: '/api/system/role/export',
+        method: 'POST',
+		data:query,
+        responseType:'arraybuffer'
+    });
+};
+//新增角色https://khy.xiaole.vip/api/system/role
 
+export const  apisystemroleAdd= query => {
+    return service({
+        url: '/api/system/role',
+        method: 'POST',
+		data:query
+    });
+};
+//修改保存角色https://khy.xiaole.vip/api/system/role
 
+export const  apisystemroleUpdate = query => {
+    return service({
+        url: '/api/system/role',
+        method: 'PUT',
+		data:query
+    });
+};
+//删除角色https://khy.xiaole.vip/api/system/role/{roleIds}
 
+export const  apisystemroleDel = query => {
+    return service({
+        url: `/api/system/role/${query.id}`,
+        method: 'DELETE'
+    });
+};

+ 2 - 2
src/views/HomeView.vue

@@ -192,7 +192,7 @@ watch(() => route, (newRoute, oldRoute) => {
             <el-icon><ArrowRightBold /></el-icon>
           </div>
         </el-menu-item>
-        <!-- <el-menu-item index="roleman">
+        <el-menu-item index="roleman">
           <div class="ima-icon">
             <img style="width:12px;height:auto" src="../../public/imgs/orderman.png" alt="">
           </div>
@@ -200,7 +200,7 @@ watch(() => route, (newRoute, oldRoute) => {
           <div class="next-img">
             <el-icon><ArrowRightBold /></el-icon>
           </div>
-        </el-menu-item> -->
+        </el-menu-item>
         <el-menu-item index="bannerman">
           <div class="ima-icon">
             <img style="width:12px;height:auto" src="../../public/imgs/orderman.png" alt="">

+ 44 - 64
src/views/roleman/index.vue

@@ -1,40 +1,40 @@
 <script setup lang="ts">
-import { apisystemdzbcArealist,apisystemdzbcPathlist,apisystemdzbcPathexport,apisystemdzbcPathDel,apisystemdzbcPathAdd,apisystemdzbcPathUpdate } from '../../request/api.js'
+import { apisystemdzbcArealist,apisystemrolelist,apisystemroleexport,apisystemroleDel,apisystemroleAdd,apisystemroleUpdate } from '../../request/api.js'
 import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 interface RuleForm {
-  id: any,
-  name: string,
-  startArea: any,
-  endArea: any,
-  mtime: string,
-  remark: string,
-  price: any
+  roleId: string,
+  roleName: string,
+  roleKey: any,
+  roleSort: any,
+  status: any,
+  remark: string
 }
 const initData={
-  id:'',
-  name: "",
-  startArea: "",
-  endArea: "",
-  mtime: "",
-  remark: "",
-  price: ""
+  roleId: '',
+  roleName: '',
+  roleKey: '',
+  roleSort: '',
+  status: 0,
+  remark: ""
 }
 const formSize = ref<ComponentSize>('default')
 const ruleFormRef = ref<FormInstance>()
 const ruleForm = reactive<RuleForm>({
-  id:'',
-  name: "",
-  startArea: "",
-  endArea: "",
-  mtime: "",
-  remark: "",
-  price: ""
+  roleId: '',
+  roleName: '',
+  roleKey: '',
+  roleSort: '',
+  status: 0,
+  remark: ""
 })
 
 
 const rules = reactive<FormRules<RuleForm>>({
-  name: [
+  roleName: [
+    { required: true, message: '必填项', trigger: 'blur' }
+  ],
+  roleKey: [
     { required: true, message: '必填项', trigger: 'blur' }
   ]
 })
@@ -50,9 +50,9 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if(ruleForm.id){
+      if(ruleForm.roleId){
         
-        apisystemdzbcPathUpdate(ruleForm).then((res:any)=>{
+        apisystemroleUpdate(ruleForm).then((res:any)=>{
           getTableData()
           ElMessage({
                 message: '操作成功',
@@ -64,7 +64,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           console.log(err)
         })
       }else{
-        apisystemdzbcPathAdd(ruleForm).then((res:any)=>{
+        apisystemroleAdd(ruleForm).then((res:any)=>{
           getTableData()
           ElMessage({
                 message: '操作成功',
@@ -102,7 +102,7 @@ const tableData = ref([])
 let activeName=ref('first')
 
 const addItem=data=>{
-  if(data.id){
+  if(data.roleId){
     for(let key in data){
       ruleForm[key]=data[key]
     }
@@ -117,7 +117,7 @@ const addItem=data=>{
 }
 const downExcell=()=>{
   excellloading.value=true
-  apisystemdzbcPathexport({}).then((res:any)=>{
+  apisystemroleexport({}).then((res:any)=>{
 
      // 这里 data 是返回来的二进制数据
      let blob = new Blob([res], {
@@ -140,7 +140,7 @@ const downExcell=()=>{
   })
 }
 const getTableData=()=>{
-  apisystemdzbcPathlist({
+  apisystemrolelist({
     
   }).then(res=>{
     if(res.code==200){
@@ -155,7 +155,7 @@ const getTableData=()=>{
 }
 //
 const deleteItem=(id)=>{
-  apisystemdzbcPathDel({id}).then((res:any)=>{
+  apisystemroleDel({id}).then((res:any)=>{
     getTableData()
     ElMessage({
           message: '操作成功',
@@ -219,36 +219,28 @@ onMounted(()=>{
                     </div>
                 </div>
                     <el-table element-loading-text='加载中' header-row-class-name="reset-gray-head" :data="tableData"  style="width: 100%" v-loading="loading">
-                        <el-table-column prop="name" label="角色编号">
+                        <el-table-column prop="roleName" label="角色名称">
                          
                         </el-table-column>
-                        <el-table-column prop="startArea" label="出发区域" />
-                        <el-table-column prop="endArea" label="目的区域">
+                        <el-table-column prop="roleKey" label="值" />
+                        <el-table-column prop="roleSort" label="顺序">
                         
                         </el-table-column>
-                        <el-table-column prop="mtime" label="出发时间">
-                        
-                    </el-table-column>
-                    <el-table-column prop="role" label="基础票价(元)">
+                        <el-table-column prop="status" label="状态">
                         
                     </el-table-column>
-                    <el-table-column prop="role" label="浮动范围">
+                    <el-table-column prop="remark" label="备注">
                         
                     </el-table-column>
-                        <el-table-column prop="status" label="排班状态">
-                          <template #default>
-                           <!-- <div style="background:#DCFCE7;width:64px;height:20px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
-                            已排班
-                           </div> -->
-                          </template>
-                        </el-table-column>
-                        <el-table-column prop="ypl" label="余票量" />
+                 
+                       
+                     
                         <el-table-column fixed="right" label="操作" min-width="120">
                           <template #default="scope">
                             <el-button link type="primary" @click="addItem(scope.row)" size="small">
                               编辑
                             </el-button>
-                            <el-popconfirm @confirm="deleteItem(scope.row.id)" title="确定删除?">
+                            <el-popconfirm @confirm="deleteItem(scope.row.roleId)" title="确定删除?">
                               <template #reference>
                                 <el-button  link type="danger" size="small">删除</el-button>
                               </template>
@@ -296,30 +288,18 @@ onMounted(()=>{
         >
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="名称" prop="name">
-                <el-input placeholder="名称" v-model="ruleForm.name" />
+              <el-form-item label="角色名称" prop="roleName">
+                <el-input placeholder="角色名称" v-model="ruleForm.roleName" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="出发区域">
+              <el-form-item label="角色字符串" prop="roleKey">
                
-                <el-select
-                  v-model="ruleForm.startArea"
-                  placeholder="出发区域"
-                  
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in areaList"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                <el-input placeholder="角色字符串" v-model="ruleForm.roleKey" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="结束区域">
+              <el-form-item label="状态">
                
                 <el-select
                   v-model="ruleForm.endArea"