Merge remote-tracking branch 'origin/master'

src/permission.ts

@@ -88,7 +88,6 @@ router.beforeEach(async (to, from, next) => {
     if (to.path === '/login') {
       next({ path: '/' })
     } else {
-      debugger
       // 获取所有字典
       const dictStore = useDictStoreWithOut()
       const userStore = useUserStoreWithOut()

src/views/pms/dingding.vue

@@ -40,7 +40,8 @@ const businessRoutes: Record<string, string> = {
   'failureReport': 'BpmProcessInstanceDetail',
   'maintainOut': 'BpmProcessInstanceDetail',
   'generateOperation' :'',
-  'generateMaintenance' : ''
+  'generateMaintenance' : '',
+  'generateMaintain':''
 }
 
 const href = ref('')
@@ -78,6 +79,7 @@ onMounted(async () => {
     }
     authUtil.setToken(res)
     // PC端路由跳转
+    debugger
     if (type === 'generateInspect') {
       push({ name:'InspectOrderWrite', params:{id} })
     }else if(type === 'failureReport') {
@@ -88,6 +90,7 @@ onMounted(async () => {
         }
       })
     } else if (type === 'generateMaintain') {
+      debugger
       push({ name: 'MaintainEdit', params: {id } })
     } else if (type === 'maintainOut') {
       push({

src/views/pms/failure/FailureInfo.vue

@@ -7,28 +7,17 @@
   >
     <el-row>
       <el-col :span="12">
-        <el-form-item label="设备编码" prop="deviceName">
-          <el-input v-model="formData.failureCode" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="故障名称" prop="deviceName">
-          <el-input v-model="formData.deviceName" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="设备名称" prop="deviceName">
-          <el-input v-model="formData.deviceName" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="故障系统" prop="failureSystem">
-          <el-input v-model="formData.failureSystem" disabled />
+        <el-form-item :label="t('faultForm.device')" prop="deviceName">
+          <el-select
+            disabled
+            v-model="formData.deviceName"
+            :placeholder="t('faultForm.choose')"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="是否解决" prop="ifDeal">
-          <el-select v-model="formData.ifDeal" disabled>
+        <el-form-item :label="t('faultForm.solve')" prop="ifDeal">
+          <el-select v-model="formData.ifDeal" :placeholder="t('faultForm.choose')" disabled>
             <el-option
               v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
               :key="dict.label"
@@ -39,10 +28,10 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="formData.status" disabled>
+        <el-form-item :label="t('faultForm.assist')" prop="needHelp" >
+          <el-select v-model="formData.needHelp" :placeholder="t('faultForm.choose')" disabled>
             <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.PMS_FAILURE_STATUS)"
+              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
               :key="dict.label"
               :label="dict.label"
               :value="dict.value"
@@ -51,35 +40,38 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="是否停机" prop="ifStop">
-          <el-select v-model="formData.ifStop" disabled>
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.label"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
+        <el-form-item :label="t('faultForm.faultySystem')" prop="failureSystem" disabled="true">
+          <el-input v-model="formData.failureSystem" :placeholder="t('faultForm.faultySystemHolder')" disabled />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="故障时间" prop="failureTime">
+        <el-form-item :label="t('faultForm.failureTime')" prop="failureTime" disabled="true">
           <el-date-picker
             disabled
+            style="width: 150%"
             v-model="formData.failureTime"
-            type="date"
+            type="datetime"
             value-format="x"
+            :placeholder="t('faultForm.failureTimeHolder')"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="故障系统" prop="failureSystem">
-          <el-input v-model="formData.failureSystem"  disabled/>
+      <el-col :span="12" v-if="formData.ifDeal">
+        <el-form-item :label="t('faultForm.dealTime')" prop="dealTime">
+          <el-date-picker
+            @change="endTimeBlur"
+            disabled
+            style="width: 150%"
+            v-model="formData.dealTime"
+            type="datetime"
+            value-format="x"
+            placeholder="选择故障解决时间"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="是否需要协助" prop="needHelp">
-          <el-select v-model="formData.needHelp" disabled>
+        <el-form-item :label="t('faultForm.shutDown')" prop="ifStop">
+          <el-select v-model="formData.ifStop" :placeholder="t('faultForm.choose')" disabled>
             <el-option
               v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
               :key="dict.label"
@@ -90,32 +82,28 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="图片" prop="pic">
-          <UploadImg v-model="formData.pic" height="60px"/>
+        <el-form-item :label="t('faultForm.picture')" prop="pic">
+          <UploadImg v-model="formData.pic" height="60px" disabled="true" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="故障影响" prop="failureInfluence">
-          <el-input
-            disabled
-            type="textarea"
-            v-model="formData.failureInfluence"
-          />
+      <el-col :span="24">
+        <el-form-item :label="t('faultForm.faultImpact')" prop="failureInfluence">
+          <el-input type="textarea" v-model="formData.failureInfluence" :placeholder="t('faultForm.faultImpactHolder')" disabled />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="解决办法" prop="solution">
-          <el-input v-model="formData.solution" type="textarea" disabled/>
+      <el-col :span="24">
+        <el-form-item label="解决办法" v-if="formData.ifDeal" prop="solution" :rules="formData.ifDeal?solutionRule:[]">
+          <el-input v-model="formData.solution" type="textarea" placeholder="请输入解决办法" disabled />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="故障描述" prop="description">
-          <el-input type="textarea" v-model="formData.description" disabled/>
+      <el-col :span="24">
+        <el-form-item :label="t('faultForm.faultDescription')" prop="description">
+          <el-input type="textarea" v-model="formData.description" disabled />
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="formData.remark" type="textarea" disabled/>
+        <el-form-item :label="t('faultForm.remark')" prop="remark">
+          <el-input v-model="formData.remark" type="textarea" :placeholder="t('faultForm.rHolder')" disabled />
         </el-form-item>
       </el-col>
     </el-row>

src/views/pms/inspect/item/index.vue

@@ -8,7 +8,18 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item :label="t('inspect.InspectionItems')" prop="item" style="margin-left: 45px">
+      <el-form-item :label="t('deviceForm.category')" prop="deviceClassify" style="width: 15vw" >
+        <el-tree-select
+          v-model="queryParams.deviceClassify"
+          :data="productClassifyList"
+          :props="defaultProps"
+          check-strictly
+          node-key="id"
+          :placeholder="t('deviceForm.categoryHolder')"
+          filterable
+        />
+      </el-form-item>
+      <el-form-item :label="t('inspect.InspectionItems')" prop="item" style="margin-left: 30px">
         <el-input
           v-model="queryParams.item"
           :placeholder="t('inspect.itemHolder')"
@@ -115,6 +126,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotInspectItemApi, IotInspectItemVO } from '@/api/pms/inspect/item'
 import IotInspectItemForm from './IotInspectItemForm.vue'
+import {defaultProps, handleTree} from "@/utils/tree";
+import * as ProductClassifyApi from "@/api/pms/productclassify";
 
 /** 巡检项 列表 */
 defineOptions({ name: 'IotInspectItem' })
@@ -129,12 +142,14 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   item: undefined,
+  deviceClassify: undefined,
   standard: undefined,
   sort: undefined,
   remark: undefined,
   createTime: [],
   deptId: undefined,
 })
+const productClassifyList = ref<Tree[]>([]) // 树形结构
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
@@ -197,7 +212,10 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  productClassifyList.value = handleTree(
+    await ProductClassifyApi.IotProductClassifyApi.getSimpleProductClassifyList()
+  )
+  await getList()
 })
 </script>