Merge remote-tracking branch 'origin/xf_dev' into xf_dev

.env.development

@@ -12,7 +12,7 @@ VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
 # VITE_APP_API_URL = 'http://192.168.101.4:8078'
 #VITE_APP_API_URL = 'http://192.168.101.188:8078'
- VITE_APP_API_URL = 'http://192.168.101.4:8078'  #lup
+ VITE_APP_API_URL = 'http://192.168.101.188:8078'  #lup
 #VITE_APP_API_URL = 'http://192.168.101.64:8078'  #hetao
 
 # 是否启用 Mock 服务

.gitignore

@@ -16,3 +16,4 @@ dist-ssr
 package-lock.json
 pnpm-lock.yaml
 stats.html
+/docker/.run

src/views/device/data/index.vue

@@ -60,17 +60,17 @@ const searchPage = (params, done) =>{
         props: { label: "deviceName", value: "deviceNo", },
       },
         {
-          label: "任务编号",
+          label: "任务信息",
           prop: "taskNo",
           search: true,
           hide: true,
         },
-        {
+        /*{
           label: "序列号",
           prop: "seqNo",
           search: true,
           hide: true,
-        },
+        },*/
         {
           label: "采集时间",
           prop: "ts",
@@ -123,17 +123,17 @@ option.value = Object.assign(option.value, {
     props: { label: "deviceName", value: "deviceNo", },
   },
     {
-      label: "任务编号",
+      label: "任务信息",
       prop: "taskNo",
       search: true,
       hide: true,
     },
-    {
+   /* {
       label: "序列号",
       prop: "seqNo",
       search: true,
       hide: true,
-    },
+    },*/
     {
       label: "采集时间",
       prop: "ts",

src/views/system/dept/index.vue

@@ -17,8 +17,8 @@
             clearable
             class="!w-[100px]"
           >
-            <el-option :value=0 label="正常" />
-            <el-option :value=1 label="禁用" />
+            <el-option :value="0" label="正常" />
+            <el-option :value="1" label="禁用" />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -53,7 +53,7 @@
         <el-table-column prop="orgType" label="组织类型">
           <template #default="scope">
             <el-tag v-if="scope.row.orgType == 0" type="success">公司</el-tag>
-            <el-tag v-else type="edit">部门</el-tag>
+            <el-tag v-else type="primary">部门</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="state" label="状态">
@@ -108,12 +108,12 @@
         :rules="rules"
         label-width="80px"
       >
-        <el-form-item label="上级组织" prop="parentId" >
+        <el-form-item label="上级组织" prop="parentId">
           <el-tree-select
             v-model="formData.parentId"
             placeholder="选择上级组织"
             :data="deptOptions"
-            :props="{ value: 'id', label: 'deptName'}"
+            :props="{ value: 'id', label: 'deptName' }"
             filterable
             check-strictly
             :render-after-expand="false"
@@ -127,14 +127,14 @@
         </el-form-item>
         <el-form-item label="组织类别">
           <el-radio-group v-model="formData.orgType">
-            <el-radio :value=0>公司</el-radio>
-            <el-radio :value=1>部门</el-radio>
+            <el-radio :value="0">公司</el-radio>
+            <el-radio :value="1">部门</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="组织状态">
           <el-radio-group v-model="formData.state">
-            <el-radio :value=0>正常</el-radio>
-            <el-radio :value=1>禁用</el-radio>
+            <el-radio :value="0">正常</el-radio>
+            <el-radio :value="1">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -153,8 +153,9 @@
 import {
   deleteDept,
   updateDept,
-  addDept
-  , queryTreeList, treeList,
+  addDept,
+  queryTreeList,
+  treeList,
 } from "@/api/system/dept";
 
 defineOptions({
@@ -211,11 +212,13 @@ function handleSelectionChange(selection: any) {
 /** 获取组织下拉数据  */
 async function loadDeptOptions() {
   treeList().then((response) => {
-    deptOptions.value = [{
-      id: "0",
-      deptName: "顶级组织",
-      children: response.data,
-    }]
+    deptOptions.value = [
+      {
+        id: "0",
+        deptName: "顶级组织",
+        children: response.data,
+      },
+    ];
   });
 }
 
@@ -276,7 +279,7 @@ function handleDelete(deptId?: number) {
     ElMessage.warning("请勾选删除项");
     return;
   }
-  const params = {ids: deptIds}
+  const params = { ids: deptIds };
   ElMessageBox.confirm(`确认删除已选中的数据项?`, "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",