Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/api/role/role.ts

@@ -20,7 +20,7 @@ export const getRoleList = (params: Role.ReqRoleParams) => {
 
 // 新增角色
 export const addRole = (params: { id: string }) => {
-  return http.post(`${rePrefix}/role/add`, params)
+  return http.post(`/RoleList_Add`, params)
 }
 
 // 批量添加角色
@@ -35,7 +35,7 @@ export const editRole = (params: { id: string }) => {
 
 // 删除角色
 export const deleteRole = (params: { id: string[] }) => {
-  return http.post(`${rePrefix}/role/delete`, params)
+  return http.post(`/RoleList_Del`, params)
 }
 
 // 切换角色状态

frontend/src/api/system/dict/dictExample.ts

@@ -5,10 +5,10 @@ export const dictTypeList: Dict.ResDictType[] = [
     id: "1",
     name: "用户性别",
     code: "EXAMPLE_CODE1",
-    sort: 1,
+    sort: 100,
     openLevel: 1,
     openDescribe: 1,
-    remark: "示例描述1221",
+    remark: "示例描述示例描述示例描述12231",
     state: 1,
     createBy: "admin",
     createTime: "2023-10-01 12:00:00",
@@ -19,10 +19,10 @@ export const dictTypeList: Dict.ResDictType[] = [
     id: "231",
     name: "菜单状态",
     code: "EXAMPLE_CODE2",
-    sort: 1,
+    sort: 100,
     openLevel: 1,
     openDescribe: 1,
-    remark: "示例描述11133",
+    remark: "示例描述示例描述示例描述11133",
     state: 0,
     createBy: "admin",
     createTime: "2023-10-01 12:00:00",
@@ -33,10 +33,10 @@ export const dictTypeList: Dict.ResDictType[] = [
     id: "33",
     name: "系统开关",
     code: "EXAMPLE_CODE3",
-    sort: 1,
+    sort: 100,
     openLevel: 1,
     openDescribe: 1,
-    remark: "示例描述111344",
+    remark: "示例描述示例描述示例描述11144",
     state: 1,
     createBy: "admin",
     createTime: "2023-10-01 12:00:00",
@@ -51,7 +51,7 @@ export const dictDataList: Dict.ResDictData[] = [
     typeId: "101",
     name: "字典项1",
     code: "EXAMPLE_00111",
-    sort: 1,
+    sort:100,
     level: 1,
     algoDescribe: null,
     value: "字典值1",
@@ -66,7 +66,7 @@ export const dictDataList: Dict.ResDictData[] = [
     typeId: "101",
     name: "字典项2",
     code: "EXAMPLE_00121",
-    sort: 1,
+    sort:100,
     level: 2,
     algoDescribe: null,
     value: "字典值2",
@@ -81,7 +81,7 @@ export const dictDataList: Dict.ResDictData[] = [
     typeId: "101",
     name: "字典项3",
     code: "EXAMPLE_00141",
-    sort: 1,
+    sort:100,
     level: 3,
     algoDescribe: null,
     value: "字典值3",
@@ -96,7 +96,7 @@ export const dictDataList: Dict.ResDictData[] = [
     typeId: "101",
     name: "字典项4",
     code: "EXAMPLE_00311",
-    sort: 1,
+    sort:100,
     level: null,
     algoDescribe: null,
     value: "字典值4",
@@ -111,7 +111,7 @@ export const dictDataList: Dict.ResDictData[] = [
     typeId: "101",
     name: "字典项5",
     code: "EXAMPLE_00341",
-    sort: 1,
+    sort:100,
     level: undefined,
     algoDescribe: null,
     value: "字典值5",
@@ -126,7 +126,7 @@ export const dictDataList: Dict.ResDictData[] = [
     typeId: "101",
     name: "字典项6",
     code: "EXAMPLE_00318",
-    sort: 1,
+    sort:100,
     level: 0,
     algoDescribe: null,
     value: "字典值6",

frontend/src/views/authority/role/components/roleUnit.vue

@@ -3,13 +3,13 @@
   <el-dialog :model-value="dialogVisible" :title="title" v-bind="dialogSmall" @close="handleCancel" width="500" draggable>
     <div>
         <el-form :model="data">
-        <el-form-item label="角色类型名称" :label-width="100">
+        <el-form-item label="名称" :label-width="100">
-          <el-input v-model="data.rolename" placeholder="请输入类型名称" autocomplete="off" />
+          <el-input v-model="data.rolename" placeholder="请输入名称" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="角色类型编码" :label-width="100">
+        <el-form-item label="编码" :label-width="100">
-          <el-input v-model="data.id" placeholder="请输入角色类型编码" autocomplete="off" />
+          <el-input v-model="data.id" placeholder="请输入编码" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="角色类型状态" :label-width="100">
+        <el-form-item label="状态" :label-width="100">
           <el-switch
             v-model=value
             inline-prompt
@@ -18,15 +18,15 @@
             inactive-text="禁用"
           />
         </el-form-item>
-        <el-form-item label="角色类型备注" :label-width="100">
+        <el-form-item label="备注" :label-width="100">
-          <el-input v-model="data.describe" placeholder="请输入备注" autocomplete="off" />
+          <el-input v-model="data.describe" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" />
         </el-form-item>
       </el-form>
       </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleCancel">
+        <el-button type="primary" @click="handleOK">
           保存
         </el-button>
       </div>
@@ -38,8 +38,11 @@
   <script lang="ts" setup>
   import { ref,computed  } from 'vue'
   import {dialogSmall} from '@/utils/elementBind'
+  import {
+    addRole,
+  } from '@/api/role/role'
 
-  const {dialogVisible,title,data}  = defineProps<{
+  const {dialogVisible,title,data,updataList}  = defineProps<{
     dialogVisible:boolean;
     title:string;
     data:{
@@ -48,10 +51,15 @@
       status:number;
       describe:string;
     }
+    updataList:Function
   }>();
 
   const value = computed({
-    get: () => data.status === 1,
+    get: () => { 
+      if(title === '新增角色')
+        return true
+      data.status === 1
+    },
     set: (value: boolean) => data.status = value ? 1 : 0
   })
   
@@ -63,4 +71,14 @@
     emit('update:visible',false)
   }
   
+  const handleOK = () => {
+    addRole(data).then(res => {
+      if(res.code === "200")
+        ElMessage.success(res.message)
+
+        updataList()
+    })
+    emit('update:visible',false)
+  }
+  
   </script>

frontend/src/views/authority/role/index.vue

@@ -8,11 +8,11 @@
         <!-- :requestApi="getRoleList" -->
         <!-- 表格 header 按钮 -->
         <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增角色</el-button>
+          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
-          <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出角色数据</el-button>
+          <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出数据</el-button>
           <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                      @click='batchDelete(scope.selectedListIds)'>
-            批量删除角色
+            批量删除
           </el-button>
         </template>
         <!-- 表格操作 -->
@@ -28,6 +28,7 @@
    :dialogVisible = roleUnitVisible 
    :title = roleUnitTitle 
    :data = roleUnitData 
+   :updataList = "updataList"
    @update:visible="roleUnitVisible = $event"
    />
   <permissionUnit 
@@ -81,6 +82,8 @@
 
   //const roleData = roleDataList
   const roleData = ref<Role.ResRoleList[]>([])
+
+  function updataList() {
     getRoleList({
     id: '',
     rolename: '',
@@ -91,8 +94,13 @@
   }).then(res => {
     if(res.code == '200') {
       roleData.value = res.data.list
+
+      console.log(11111);
+      
   }
   })
+  }
+  updataList()
 
   // ProTable 实例
   const proTable = ref<ProTableInstance>()
@@ -166,6 +174,7 @@
   const deleteAccount = async (params: Role.ResRoleList) => {
     await useHandleData(deleteRole, { id: [params.id] }, `删除【${params.rolename}】角色`)
     proTable.value?.getTableList()
+    updataList()
   }
 
   // 批量删除角色信息

frontend/src/views/authority/user/index.vue

@@ -7,11 +7,11 @@
       >
         <!-- 表格 header 按钮 -->
         <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增用户')">新增用户</el-button>
+          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增用户')">新增</el-button>
-          <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出用户数据</el-button>
+          <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出数据</el-button>
           <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                      @click='batchDelete(scope.selectedListIds)'>
-            批量删除角色
+            批量删除
           </el-button>
         </template>
         <!-- 表格操作 -->

frontend/src/views/machine/device/index.vue

@@ -8,10 +8,10 @@
         <!-- :requestApi="getRoleList" -->
         <!-- 表格 header 按钮 -->
         <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' >新增设备</el-button>
+          <el-button type='primary' :icon='CirclePlus' >新增</el-button>
-          <el-button type='primary' :icon='Download' plain >导出设备数据</el-button>
+          <el-button type='primary' :icon='Download' plain >导出数据</el-button>
           <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
-            批量删除设备
+            批量删除
           </el-button>
         </template>
         <!-- 表格操作 -->

frontend/src/views/machine/testScript/index.vue

@@ -8,10 +8,10 @@
       <!-- :requestApi="getRoleList" -->
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
-        <el-button type='primary' :icon='CirclePlus' >新增检测脚本</el-button>
+        <el-button type='primary' :icon='CirclePlus' >新增</el-button>
-        <el-button type='primary' :icon='Download' plain >导出脚本数据</el-button>
+        <el-button type='primary' :icon='Download' plain >导出数据</el-button>
         <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
-          批量删除脚本
+          批量删除
         </el-button>
       </template>
       <!-- 表格操作 -->

frontend/src/views/machine/testSource/index.vue

@@ -8,10 +8,10 @@
         <!-- :requestApi="getRoleList" -->
         <!-- 表格 header 按钮 -->
         <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' >新增检测源</el-button>
+          <el-button type='primary' :icon='CirclePlus' >新增</el-button>
-          <el-button type='primary' :icon='Download' plain >导出检测源数据</el-button>
+          <el-button type='primary' :icon='Download' plain >导出数据</el-button>
           <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
-            批量删除检测源
+            批量删除
           </el-button>
         </template>
         <!-- 表格操作 -->

frontend/src/views/system/dict/data.vue

@@ -34,14 +34,7 @@
           <el-input v-model="dialogForm.value" placeholder="请输入" autocomplete="off" />
         </el-form-item>
         <el-form-item label="显示排序" :label-width="100">
-          <el-input-number v-model="dialogForm.sort" :min="1" :max="100" />
+          <el-input-number v-model="dialogForm.sort"/>
-        </el-form-item>
-        <el-form-item label="状态" :label-width="100">
-          <el-radio-group v-model.number="dialogForm.state">
-            <el-radio v-for="item in dictStore.getDictData('status')" :key="item.id" :value="item.code">{{
-              item.label
-            }}</el-radio>
-          </el-radio-group>
         </el-form-item>
       </el-form>
     </div>
@@ -88,34 +81,28 @@ const columns = reactive<ColumnProps<Dict.ResDictData>[]>([
   {
     prop: 'name',
     label: '名称',
-    width: 160,
+    width: 180,
     search: {
-      el: 'input',
+      el: 'input'
-      props: {
-        placeholder: '请输入名称'
-      }
     }
   },
   {
     prop: 'code',
     label: '编码',
-    width: 160,
+    width: 180,
     search: {
-      el: 'input',
+      el: 'input'
-      props: {
-        placeholder: '请输入编码'
-      }
     }
   },
   {
     prop: 'value',
     label: '值',
-    width: 160
+    width: 180
   },
   {
     prop: 'level',
     label: '事件等级',
-    width: 100,
+    width: 150,
     render: scope => {
       return (
         <>
@@ -132,6 +119,7 @@ const columns = reactive<ColumnProps<Dict.ResDictData>[]>([
   {
     prop: 'state',
     label: '状态',
+    minWidth: 100,
     enum: dictStore.getDictData('status'),
     search: {
       el: 'tree-select',
@@ -175,8 +163,7 @@ function useCount() {
     name: "",
     code: "",
     value: "",
-    sort: 1,
+    sort:100,
-    state: 1, // 状态：0-删除 1-正常
   })
 
   return { dialogVisible, dialogType, dialogForm };
@@ -231,8 +218,7 @@ const close = () => {
     name: "",
     code: "",
     value: "",
-    sort: 1,
+    sort:100
-    state: 1,
   }
 }
 

frontend/src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="table-box">
-    <ProTable :columns="columns" :data="data" :request-api="getDictTypeList">
+    <ProTable :columns="columns" :data="data">
       <template #tableHeader="scope">
         <el-button type="primary" :icon="CirclePlus" @click="openDrawer('新增')">新增</el-button>
         <el-button type="primary" :icon="Download" plain @click="downloadFile">导出</el-button>
@@ -28,16 +28,10 @@
           <el-input v-model="dialogForm.code" placeholder="请输入" autocomplete="off" />
         </el-form-item>
         <el-form-item label="显示排序" :label-width="100">
-          <el-input-number v-model="dialogForm.sort" :min="1" :max="100" />
+          <el-input-number v-model="dialogForm.sort" />
-        </el-form-item>
-        <el-form-item label="状态" :label-width="100">
-          <el-radio-group v-model.number="dialogForm.state">
-            <el-radio v-for="item in dictStore.getDictData('status')" :key="item.id" :value="item.code">{{ item.label
-              }}</el-radio>
-          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" :label-width="100">
-          <el-input v-model="dialogForm.remark" placeholder="请输入备注" autocomplete="off" />
+          <el-input v-model="dialogForm.remark" placeholder="请输入备注" autocomplete="off" :rows="2" type="textarea" />
         </el-form-item>
       </el-form>
     </div>
@@ -86,25 +80,24 @@ const columns = reactive<ColumnProps<Dict.ResDictType>[]>([
   {
     prop: 'name',
     label: '类型名称',
-    width: 160,
+    width: 180,
     search: {
-      el: 'input',
+      el: 'input'
-      props: {
-        placeholder: '请输入字典名称'
-      }
     }
   },
   {
     prop: 'code',
     label: '类型编码',
-    width: 160,
+    width: 180,
     search: {
-      el: 'input',
+      el: 'input'
-      props: {
-        placeholder: '请输入字典编码'
-      }
     }
   },
+  {
+    prop: 'remark',
+    label: '描述',
+    width: 340,
+  },
   {
     prop: 'state',
     label: '状态',
@@ -124,11 +117,6 @@ const columns = reactive<ColumnProps<Dict.ResDictType>[]>([
       )
     },
   },
-  {
-    prop: 'remark',
-    label: '描述',
-    width: 200,
-  },
   {
     prop: 'createTime',
     label: '创建时间',
@@ -155,8 +143,7 @@ function useCount() {
     id: "",
     name: "",
     code: "",
-    sort: 1,
+    sort:100,
-    state: 1, // 状态：0-删除 1-正常
     remark: ""
   })
 
@@ -204,8 +191,7 @@ const close = () => {
     id: "",
     name: "",
     code: "",
-    state: 1,
+    sort:100,
-    sort: 1,
     remark: ""
   }
 }