微调

frontend/src/views/authority/resource/components/resourcePopup.vue

@@ -15,6 +15,9 @@
         <el-form-item label="名称" prop="name" :label-width="100">
           <el-input v-model="formContent.name" />
         </el-form-item>
+        <el-form-item label="编码" prop="code" :label-width="100">
+          <el-input v-model="formContent.code" />
+        </el-form-item>
         <el-form-item label="图标" prop="icon" :label-width="100">
           <IconSelect
           :iconValue="formContent.icon"
@@ -31,14 +34,12 @@
         <el-form-item label="排序" prop="sort" :label-width="100">
           <el-input-number v-model="formContent.sort" :min='1' :max='999' />
         </el-form-item>
-        <el-form-item label="类型" prop="type" :label-width="100">
-          <el-select v-model="formContent.type" placeholder="请选择资源类型">
-            <el-option
-            v-for="item in dictStore.getDictData('resourceType')"
-            :key="item.id"
-            :label="item.name"
-            :value="item.code"
-          />
+        <el-form-item label='类型'  prop='type' :label-width="100">
+          <el-select v-model="formContent.type"  clearable placeholder="请选择资源类型">
+            <el-option label="菜单" :value="0"></el-option>
+            <el-option label="按钮" :value="1"></el-option>
+            <el-option label="公共资源" :value="2"></el-option>
+            <el-option label="服务间调用资源" :value="3"></el-option>
           </el-select>
         </el-form-item>                             
         <el-form-item label="描述" prop="remark" :label-width="100">

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

@@ -44,31 +44,47 @@
     {
       prop: 'name',
       label: '名称',
-      minWidth: 200,
-      search: { el: 'input', tooltip: '我是搜索提示' },
+      minWidth: 150,
+      search: { el: 'input' },
     },
     {
       prop: 'code',
-      label: '资源标识',
+      label: '编码',
       minWidth: 100,
     },
-    {
-      prop: 'path',
-      label: '路径',
-      minWidth: 200,
-    },
     {
     prop: 'type',
     label: '类型',
-    width: 150,
+    width: 100,
     enum: dictStore.getDictData('resourceType'),
     search: { el: 'select', props: { filterable: true } },
     fieldNames: { label: 'label', value: 'code' },
-  },
+    },
+    {
+      prop: 'icon',
+      label: '图标',
+      minWidth: 100,
+    },
+    {
+      prop: 'path',
+      label: '路由地址',
+      minWidth: 200,
+    },
+    {
+      prop: 'component',
+      label: '组件地址',
+      minWidth: 200,
+    },
+    {
+      prop: 'sort',
+      label: '排序',
+      width: 70,
+    },
+
     {
       prop: 'state',
       label: '权限资源状态',
-      minWidth: 120,
+      minWidth: 100,
       enum: dictStore.getDictData('status'),
       fieldNames: { label: 'label', value: 'code' },
       render: scope => {
@@ -77,7 +93,7 @@
         )
       },
     },
-    { prop: 'operation', label: '操作', fixed: 'right',minWidth: 200 },
+    { prop: 'operation', label: '操作', fixed: 'right',width: 200 },
   ])
 
  

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

@@ -77,12 +77,12 @@ const columns = reactive<ColumnProps<Role.RoleBO>[]>([
     prop: 'code',
     label: '编码',
     search: { el: 'input' },
-    minWidth: 180,
+    minWidth: 200,
   },
   {
     prop: 'remark',
     label: '描述',
-    minWidth: 380,
+    minWidth: 300,
   },
   {
     prop: 'state',

frontend/src/views/machine/device/components/devicePopup.vue

@@ -77,8 +77,8 @@
                         </el-row>     
                         <el-row  :gutter="24" >
                             <el-col :span="8">
-                                <el-form-item label='生产厂家'  prop='manufacturer'>
-                                    <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择生产厂家">
+                                <el-form-item label='生产厂商'  prop='manufacturer'>
+                                    <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择生产厂商">
                                     <el-option
                                     v-for="item in dictStore.getDictData('Dev_Manufacturers')"
                                     :key="item.id"

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

@@ -84,7 +84,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
         return (
             <div class='flx-flex-start'>
               <TimeControl
-                  include={['日', '周', '月', '季度','年','自定义']}
+                  
                   default={'月'}
                   onUpdate-dates={handleDateChange}
               />
@@ -97,25 +97,19 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     prop: 'devChns',
     label: '设备通道数',
     minWidth: 110,
-    render: scope => {
-       return String(scope.row.devChns) // 将数字转换为字符串
-      },
+    
   },
   {
     prop: 'devVolt',
     label: '额定电压（V）',
     minWidth: 130,
-    render: scope => {
-       return String(scope.row.devVolt) // 将数字转换为字符串
-      },
+ 
   },
   {
     prop: 'devCurr',
     label: '额定电流（A）',
     minWidth: 130,
-    render: scope => {
-       return String(scope.row.devCurr) // 将数字转换为字符串
-      },
+ 
   },
   {
     prop: 'manufacturer',
@@ -155,7 +149,7 @@ const handleDelete = async (params: Device.ResPqDev) => {
 }
 
 // 导出设备
-const downloadFile = async (params: Device.ReqPqDevParams) => {
+const downloadFile = async () => {
     // 获取当前的搜索参数
     const searchParam = proTable.value?.searchParam || {};
 

frontend/src/views/system/dictionary/dictPq/index.vue

@@ -148,9 +148,7 @@ const columns = reactive<ColumnProps<Dict.ResDictPq>[]>([
       prop: 'sort',
       label: '排序',
       width:70,
-      render: scope => {
-       return String(scope.row.sort) // 将数字转换为字符串
-      },
+
     },
   {
     prop: 'operation',

frontend/src/views/system/dictionary/dictTree/index.vue

@@ -56,9 +56,7 @@
       prop: 'sort',
       label: '排序',
       width:70,
-      render: scope => {
-       return String(scope.row.sort) // 将数字转换为字符串
-      },
+
     },
     {
       prop: 'state',

frontend/src/views/system/dictionary/dictType/index.vue

@@ -69,9 +69,6 @@ const columns = reactive<ColumnProps<Dict.ResDictType>[]>([
     prop: 'sort',
     label: '排序',
     minWidth: 70,
-    render: scope => {
-       return String(scope.row.sort) // 将数字转换为字符串
-      },
   },
   {
     prop: 'createTime',