Merge remote-tracking branch 'origin/master'

src/components/UploadFile/src/UploadImgs.vue

@@ -8,7 +8,7 @@
       :class="['upload', drag ? 'no-border' : '']"
       :disabled="disabled"
       :drag="drag"
-      :http-request="httpRequest"
+      :http-request="httpRequestOnlyPath"
       :limit="limit"
       :multiple="true"
       :on-error="uploadError"
@@ -84,7 +84,7 @@ const props = defineProps({
   borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
 })
 
-const { uploadUrl, httpRequest } = useUpload()
+const { uploadUrl, httpRequest, httpRequestOnlyPath } = useUpload()
 
 const fileList = ref<UploadUserFile[]>([])
 const uploadNumber = ref<number>(0)

src/locales/en.ts

@@ -1006,14 +1006,16 @@ export default {
     exceptionDes:'ExceptionDes',
     inspectTime:'InspectionTime',
     createName:'creator',
-    itemNormal:'normalItem',
-    itemException:'exceptionItem',
-    itemNeed:'fillInItem',
-    deviceCount:'deviceCount',
-    exceptionCount:'exceptionDevice',
-    needDevice:'fillInDevice',
+    itemNormal:'NormalItem',
+    itemException:'ExceptionItem',
+    itemNeed:'FillInItem',
+    deviceCount:'DeviceCount',
+    exceptionCount:'ExceptionDevice',
+    needDevice:'FillInDevice',
     routeDesc:'routeDescription',
     routeDescHolder:'please enter route description',
+    generateTime:'GenerateTime',
+    executeTime:'ExecuteTime',
   },
   route:{
     RouteName:'RouteName',

src/locales/zh-CN.ts

@@ -1009,6 +1009,8 @@ export default {
     needDevice:'漏检设备数',
     routeDesc:'路线描述',
     routeDescHolder:'请输入路线描述',
+    generateTime:'生成时间',
+    executeTime:'执行时间'
   },
   route:{
     RouteName:'路线名称',

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

@@ -122,12 +122,19 @@
           </el-table-column>
 <!--          <el-table-column label="备注" align="center" prop="remark" />-->
           <el-table-column
-            label="生成时间"
+            :label="t('inspect.generateTime')"
             align="center"
             prop="createTime"
             :formatter="dateFormatter"
             width="180px"
           />
+          <el-table-column
+            :label="t('inspect.executeTime')"
+            align="center"
+            prop="executeDate"
+            :formatter="dateFormatter"
+            width="180px"
+          />
           <el-table-column :label="t('iotMaintain.operation')" align="center" min-width="120px">
             <template #default="scope">
               <!--          <el-button-->

src/views/pms/maintain/IotMaintain.vue

@@ -101,8 +101,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="t('iotMaintain.picture')" prop="pic">
-                <UploadImg v-model="formData.pic" height="55px" />
+              <el-form-item :label="t('iotMaintain.picture')" prop="pics">
+                <UploadImgs v-model="formData.pics" height="55px" />
               </el-form-item>
             </el-col>
             <el-col :span="8" v-if="formData.type === 'out'">
@@ -323,6 +323,7 @@ const formData = ref({
   failureSystem: undefined,
   description: undefined,
   pic: undefined,
+  pics: [],
   solution: undefined,
   maintainStartTime: undefined,
   maintainEndTime: undefined,
@@ -601,6 +602,7 @@ const resetForm = () => {
     failureSystem: undefined,
     description: undefined,
     pic: undefined,
+    pics:[],
     solution: undefined,
     maintainStartTime: undefined,
     maintainEndTime: undefined,

src/views/pms/maintain/IotMaintainDetail.vue

@@ -121,8 +121,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="t('iotMaintain.picture')" prop="pic">
-              <UploadImg v-model="formData.pic" :disabled="true" height="55px" />
+            <el-form-item :label="t('iotMaintain.picture')" prop="pics">
+              <UploadImgs v-model="formData.pics" :disabled="true" height="55px" />
             </el-form-item>
           </el-col>
 <!--          <el-col :span="8">-->
@@ -267,6 +267,7 @@ const formData = ref({
   failureSystem: undefined,
   description: undefined,
   pic: undefined,
+  pics:undefined,
   solution: undefined,
   maintainStartTime: undefined,
   maintainEndTime: undefined,

src/views/pms/maintain/index.vue

@@ -140,8 +140,8 @@
           </el-table-column>
 <!--          <el-table-column label="故障编码" align="center" prop="failureCode" />-->
 <!--          <el-table-column label="故障名称" align="center" prop="failureName" />-->
-          <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" />
-          <el-table-column :label="t('maintain.deviceName')" align="center" prop="deviceName" />
+          <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" width="150" />
+          <el-table-column :label="t('maintain.deviceName')" align="center" prop="deviceName" width="185" />
           <el-table-column :label="t('maintain.status')" align="center" prop="status" width="85" >
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.PMS_MAIN_STATUS" :value="scope.row.status" />
@@ -163,6 +163,13 @@
               <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifStop" />
             </template>
           </el-table-column>
+                    <el-table-column
+                      label="执行时间"
+                      align="center"
+                      prop="executeDate"
+                      :formatter="dateFormatter"
+                      width="180px"
+                    />
           <el-table-column :label="t('maintain.dept')" align="center" prop="deptName" width="135"/>
           <el-table-column :label="t('inspect.createName')" align="center" prop="createName" width="130"/>
 <!--          <el-table-column-->
@@ -194,7 +201,7 @@
 <!--            :formatter="dateFormatter"-->
 <!--            width="180px"-->
 <!--          />-->
-          <el-table-column :label="t('maintain.operation')" align="center" width="200">
+          <el-table-column :label="t('maintain.operation')" align="center" width="170" fixed="right">
             <template #default="scope">
               <el-button
                 link