Merge remote-tracking branch 'origin/master'

src/api/pms/inspect/route/index.ts

@@ -1,47 +1,49 @@
-import request from '@/config/axios'
-
-// 巡检路线 VO
-export interface IotInspectRouteVO {
-  id: number // 主键id
-  routeName: string // 路线名称
-  deviceClassify: number // 设备分类
-  deviceId: number // 设备id
-  deviceClassifyName: string // 设备分类名称
-  deviceName: string // 设备名称
-  itemJson: string // 巡检项
-  remark: string // 备注
-  deptId: number // 部门id
-}
-
-// 巡检路线 API
-export const IotInspectRouteApi = {
-  // 查询巡检路线分页
-  getIotInspectRoutePage: async (params: any) => {
-    return await request.get({ url: `/rq/iot-inspect-route/page`, params })
-  },
-
-  // 查询巡检路线详情
-  getIotInspectRoute: async (id: number) => {
-    return await request.get({ url: `/rq/iot-inspect-route/get?id=` + id })
-  },
-
-  // 新增巡检路线
-  createIotInspectRoute: async (data: IotInspectRouteVO) => {
-    return await request.post({ url: `/rq/iot-inspect-route/create`, data })
-  },
-
-  // 修改巡检路线
-  updateIotInspectRoute: async (data: IotInspectRouteVO) => {
-    return await request.put({ url: `/rq/iot-inspect-route/update`, data })
-  },
-
-  // 删除巡检路线
-  deleteIotInspectRoute: async (id: number) => {
-    return await request.delete({ url: `/rq/iot-inspect-route/delete?id=` + id })
-  },
-
-  // 导出巡检路线 Excel
-  exportIotInspectRoute: async (params) => {
-    return await request.download({ url: `/rq/iot-inspect-route/export-excel`, params })
-  },
-}
+import request from '@/config/axios'
+
+// 巡检路线 VO
+export interface IotInspectRouteVO {
+  id: number // 主键id
+  routeName: string // 路线名称
+  deviceClassify: number // 设备分类
+  deviceId: number // 设备id
+  deviceClassifyName: string // 设备分类名称
+  deviceName: string // 设备名称
+  itemJson: string // 巡检项
+  remark: string // 备注
+  deptId: number // 部门id
+}
+
+// 巡检路线 API
+export const IotInspectRouteApi = {
+  // 查询巡检路线分页
+  getIotInspectRoutePage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-inspect-route/page`, params })
+  },
+  getDeviceIotInspectRoutePage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-inspect-route/plan/page`, params })
+  },
+  // 查询巡检路线详情
+  getIotInspectRoute: async (id: number) => {
+    return await request.get({ url: `/rq/iot-inspect-route/get?id=` + id })
+  },
+
+  // 新增巡检路线
+  createIotInspectRoute: async (data: IotInspectRouteVO) => {
+    return await request.post({ url: `/rq/iot-inspect-route/create`, data })
+  },
+
+  // 修改巡检路线
+  updateIotInspectRoute: async (data: IotInspectRouteVO) => {
+    return await request.put({ url: `/rq/iot-inspect-route/update`, data })
+  },
+
+  // 删除巡检路线
+  deleteIotInspectRoute: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-inspect-route/delete?id=` + id })
+  },
+
+  // 导出巡检路线 Excel
+  exportIotInspectRoute: async (params) => {
+    return await request.download({ url: `/rq/iot-inspect-route/export-excel`, params })
+  },
+}

src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue

@@ -907,7 +907,6 @@ const handleTransfer = async () => {
 }
 
 const handleTransferType = async (formRef: FormInstance | undefined) => {
-  debugger
   formLoading.value = true
   try {
     // 1.1 校验表单

src/views/pms/device/DeviceUpload.vue

@@ -57,14 +57,6 @@
                 </el-button>
               </template>
             </el-table-column>
-<!--            <el-table-column label="备注" align="center" prop="remark" />-->
-<!--            <el-table-column-->
-<!--              label="创建时间"-->
-<!--              align="center"-->
-<!--              prop="createTime"-->
-<!--              :formatter="dateFormatter"-->
-<!--              width="180px"-->
-<!--            />-->
             <el-table-column label="操作" align="center" width="160">
               <template #default="scope">
                 <div class="flex items-center justify-center">
@@ -276,7 +268,7 @@ const getList = async () => {
   }
 }
 const successList = async (id) => {
-  // queryParams.classId = id
+  queryParams.classId = id
   await getList()
   // queryParams.classId = ''
 }

src/views/pms/device/IotDeviceForm.vue

@@ -49,6 +49,7 @@
           <el-col :span="8">
             <el-form-item label="设备类别" prop="assetClass">
               <el-tree-select
+                :disabled="formType==='update'"
                 v-model="formData.assetClass"
                 :data="productClassifyList"
                 :props="defaultProps"

src/views/pms/device/RecordInfo.vue

@@ -39,7 +39,7 @@
                   disabled
                 />
                 <el-input
-                  v-else
+                  disabled
                   v-model="item.fillContent"
                   clearable
                   style="width: 200px"

src/views/pms/device/index.vue

@@ -141,24 +141,6 @@
               <dict-tag :type="DICT_TYPE.PMS_ASSET_PROPERTY" :value="scope.row.assetProperty" />
             </template>
           </el-table-column>
-          <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker
-              v-model="queryParams.createTime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-              class="!w-240px"
-            />
-          </el-form-item>
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            :formatter="dateFormatter"
-            width="180px"
-          />
           <el-table-column label="操作" align="center" min-width="120px">
             <template #default="scope">
               <el-button
@@ -249,7 +231,7 @@ const queryParams = reactive({
   infoUrl: undefined,
   templateJson: undefined,
   creator: undefined,
-  sortingFields: {}
+  sortingFields: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -265,8 +247,10 @@ const shou = (tree) =>{
 }
 
 const handleSortChange = (params: any) => {
-  console.log(`排序字段: ${prop}, 排序方式: ${order}`);
+  //console.log(`排序字段: ${prop}, 排序方式: ${order}`);
+  queryParams.sortingFields = []
   queryParams.sortingFields = [buildSortingField(params)]
+  getList()
 };
 
 /** 查询列表 */
@@ -355,6 +339,11 @@ const handleExport = async () => {
 const { wsCache } = useCache()
 /** 初始化 **/
 onMounted(() => {
+  const sort = {
+    field: 'sortColumn',
+    order: 'asc',
+  }
+  queryParams.sortingFields.push(sort);
   getList()
 })
 </script>

src/views/pms/device/monitor/TdDeviceInfo.vue

@@ -1,33 +1,33 @@
 <template>
   <ContentWrap v-loading="formLoading">
     <ContentWrap>
-      <el-form style="height:89px;margin-left: 15px;">
+      <el-form style="height:89px;margin-left: 20px;">
         <el-row style="display: flex;flex-direction: row; ">
-<!--          <el-col :span="6">-->
+          <el-col :span="8">
             <el-form-item prop="deviceCode">
               <template #label>
                 <span class="custom-label">资产编码:</span>
               </template>
               <span class="custom-label">{{ formData.deviceCode }}</span>
             </el-form-item>
-<!--          </el-col>-->
-<!--          <el-col :span="6">-->
+          </el-col>
+          <el-col :span="8">
             <el-form-item prop="deviceName">
               <template #label>
                 <span class="custom-label">设备类别:</span>
               </template>
               <span class="custom-label">{{ formData.deviceName }}</span>
             </el-form-item>
-<!--          </el-col>-->
-<!--          <el-col :span="6">-->
+          </el-col>
+          <el-col :span="8">
             <el-form-item prop="dept">
               <template #label>
                 <span class="custom-label">所在部门:</span>
               </template>
               <span class="custom-label">{{ formData.dept }}</span>
             </el-form-item>
-<!--          </el-col>-->
-<!--          <el-col :span="6">-->
+          </el-col>
+          <el-col :span="8">
             <el-form-item  prop="ifInline">
               <template #label>
                 <span class="custom-label">是否在线:</span>
@@ -40,15 +40,15 @@
                 </template>
 <!--              </span>-->
             </el-form-item>
-<!--          </el-col>-->
-<!--          <el-col :span="6">-->
+          </el-col>
+          <el-col :span="8">
             <el-form-item prop="lastInlineTime">
               <template #label>
                 <span class="custom-label">最后数据时间:</span>
               </template>
               <span class="custom-label">{{ formData.lastInlineTime }}</span>
             </el-form-item>
-<!--          </el-col>-->
+          </el-col>
         </el-row>
       </el-form>
     </ContentWrap>

src/views/pms/failure/IotFailureReportForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 65em">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 68em">
     <el-form
       ref="formRef"
       :model="formData"
@@ -62,7 +62,7 @@
       </el-form-item>
         </el-col>
         <el-col :span="12" v-if="formData.ifDeal">
-          <el-form-item label="故障解决时间" prop="dealTime">
+          <el-form-item label="解决时间" prop="dealTime">
             <el-date-picker
               @change="endTimeBlur"
               :disabled="disabled"
@@ -178,7 +178,7 @@ const endTimeBlur = () => {
   const now = dayjs();
   const target = dayjs(formData.value.dealTime);
   if (target.isAfter(now)) {
-    message.error('故障解决时间不得早于当前时间')
+    message.error('故障解决时间不得晚于当前时间')
     formData.value.dealTime = undefined
   }
 }
@@ -198,6 +198,7 @@ const formRules = ref({
   needHelp: [{ required: true, message: '是否协助不能为空', trigger: 'blur' }],
   failureTime:[{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
   failureSystem:[{ required: true, message: '故障系统不能为空', trigger: 'blur' }],
+  dealTime:[{ required: true, message: '故障解决时间不能为空', trigger: 'blur' }],
   // solution:[{required: ()=> formData.value.ifDeal==='true', message: '解决办法不能为空', trigger: 'blur'}],
 })
 const solutionRule = [

src/views/pms/inspect/order/InspectOrderDetail.vue

@@ -50,7 +50,7 @@
     <ContentWrap>
       <ContentWrap>
         <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-          <el-table-column label="资产编号" align="center" prop="deviceCode" />
+          <el-table-column label="设备编号" align="center" prop="deviceCode" />
           <el-table-column label="设备名称" align="center" prop="deviceName" />
 <!--          <el-table-column label="路线名称" align="center" prop="routeName" />-->
           <el-table-column label="操作" align="center" min-width="120px">

src/views/pms/inspect/plan/InspectRouteList.vue

@@ -186,6 +186,7 @@ const handleRowClick = (row) => {
 const open = async (classify) => {
   dialogVisible.value = true
   queryParams.assetClass = classify
+  debugger
   queryParams.deviceName = undefined
   queryParams.createTime = undefined
   await getList()
@@ -196,7 +197,7 @@ const { wsCache } = useCache()
 const getList = async () => {
   loading.value = true
   try {
-    const data = await IotInspectRouteApi.getIotInspectRoutePage(queryParams)
+    const data = await IotInspectRouteApi.getDeviceIotInspectRoutePage(queryParams)
     debugger
     list.value = data.list
     total.value = data.total

src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -88,7 +88,7 @@
         </ContentWrap>
         <ContentWrap>
           <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-            <el-table-column label="资产编号" align="center" prop="deviceCode" />
+            <el-table-column label="设备编号" align="center" prop="deviceCode" />
             <el-table-column label="设备名称" align="center" prop="deviceName" />
             <el-table-column label="路线名称" align="center" prop="routeName" />
             <el-table-column label="操作" align="center" min-width="120px">

src/views/pms/iotopeationfill/IotOpeationFillForm.vue

@@ -9,8 +9,8 @@
     >
       <el-row>
         <el-col :span="12">
-          <el-form-item label="资产编号" prop="deviceCode">
-            <el-input v-model="formData.deviceCode" placeholder="请输入资产编号" disabled/>
+          <el-form-item label="设备编号" prop="deviceCode">
+            <el-input v-model="formData.deviceCode" placeholder="请输入设备编号" disabled/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -78,7 +78,7 @@ const formData = ref({
   creDate: undefined
 })
 const formRules = reactive({
-  deviceCode: [{ required: true, message: '资产编号不能为空', trigger: 'blur' }],
+  deviceCode: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   fillContent: [{ required: true, message: '填写内容不能为空', trigger: 'blur' }],
   deviceType: [{ required: true, message: '设备类别不能为空', trigger: 'change' }],

src/views/pms/maintain/IotMaintain.vue

@@ -432,7 +432,7 @@ const endTimeBlur = () => {
   const now = dayjs();
   const target = dayjs(formData.value.maintainEndTime);
   if (target.isAfter(now)) {
-    message.error('维修结束时间不得早于当前时间')
+    message.error('维修结束时间不得晚于当前时间')
     formData.value.maintainEndTime = undefined
   }
 }

src/views/system/tree/index.vue

@@ -275,8 +275,8 @@ const handleFileNodeClick = async (row) => {
   } else if (row.type === 'file'){
     clickNodeId.value = row.originId
   } else if (row.type==='dept') {
-    message.error("请选择设备及文件节点")
-    return
+    // message.error("请选择设备及文件节点")
+    // return
   }
   nodeId.value = row.id
   await getList()