Merge branch 'master' of http://119.23.210.103:3000/ZhuJiaHao/zdqy_firm_former

src/views/component/device/deviceDialog.vue

@@ -708,7 +708,8 @@
                                 placeholder="任意时间点"
                                 size="mini"
                                 style="width: 100%"
-                                value-format="HH:mm:ss"
+                                :format="timeFormat"
+                                :value-format="timeFormat"
                               />
                               <span v-else
                                 >{{ form.kaiShiShiYong || '/' }}
@@ -725,7 +726,8 @@
                                 placeholder="任意时间点"
                                 size="mini"
                                 style="width: 100%"
-                                value-format="HH:mm:ss"
+                                :format="timeFormat"
+                                :value-format="timeFormat"
                               />
                               <span v-else
                                 >{{ form.shiJiShiYongF || '/' }}
@@ -857,7 +859,7 @@
                               />
                             </el-form-item>
                           </el-col>
-                    
+
                           <el-col v-else>
                             <el-form-item
                               label="检定/校准单位："
@@ -873,7 +875,6 @@
                               </span>
                             </el-form-item>
                           </el-col>
-
                         </el-row>
                         <el-row v-if="form.shiFouXiaoZhun === '是'">
                           <el-col>
@@ -1214,6 +1215,10 @@ export default {
       type: Boolean,
       default: false
     },
+    timeFormat: {
+      type: String,
+      default: 'HH:mm:ss'
+    },
     tabList: {
       type: Object,
       default: function () {
@@ -1478,7 +1483,7 @@ export default {
         //   { required: true, message: '出厂日期不能为空', trigger: 'blur' }
         // ]
       },
-      projectName: setting?.system?.projectName,
+      projectName: setting?.system?.projectName
     }
   },
   computed: {

src/views/component/device/index.vue

@@ -389,6 +389,7 @@
       :hide-sys-device-no="hideSysDeviceNo"
       :has-fu-ze-ren-dian-hua="hasFuZeRenDianHua"
       :has-chang-jia-lian-xi-ren="hasChangJiaLianXiRen"
+      :time-format="timeFormat"
       :readonly="!hasRole || readOnly"
       :actionDialog="actionDialog"
       :hidefu-jian-shang="hidefuJianShang"
@@ -958,6 +959,7 @@ export default {
       hidefuJianShang: false,
       hasFuZeRenDianHua: false,
       hasChangJiaLianXiRen: false,
+      timeFormat: 'HH:mm:ss',
       tabList: {},
       hasRole: true,
       readOnly: this.$route.fullPath === '/xxgl/sbda',
@@ -970,7 +972,7 @@ export default {
       tagName: '',
       tagData: {},
       config: setting?.postJob?.allocation || false,
-      projectName: setting?.system?.projectName,
+      projectName: setting?.system?.projectName
     }
   },
   async mounted() {
@@ -983,7 +985,8 @@ export default {
       hasDeviceRole,
       typeList,
       hasFuZeRenDianHua,
-      hasChangJiaLianXiRen
+      hasChangJiaLianXiRen,
+      timeFormat
     } = res.device || {}
     const { tagData, tagName } = res.deviceTag || {}
     if (tagName) {
@@ -1031,6 +1034,9 @@ export default {
     if (hasChangJiaLianXiRen) {
       this.hasChangJiaLianXiRen = hasChangJiaLianXiRen
     }
+    if (timeFormat) {
+      this.timeFormat = timeFormat
+    }
     if (tabList) {
       console.debug('tabList', tabList)
       this.tabList = tabList
@@ -1504,10 +1510,10 @@ export default {
           item.weiHuFangShi,
           deviceGroupData
         )
-        if(this.projectName != 'dev4'){
+        if (this.projectName != 'dev4') {
           item.shiYongKeShi = this.switchGYSIdToName(item.shiYongKeShi, gysData)
         }
-         
+
         if (this.stateList[item.sheBeiZhuangTa]) {
           item.sheBeiZhuangTa = this.stateList[item.sheBeiZhuangTa]
         }
@@ -1931,10 +1937,10 @@ export default {
       if (list.length < 1) {
         return
       }
-      if(this.projectName != 'dev4'){
+      if (this.projectName != 'dev4') {
         this.handleSupplierInfo(list, supplierList)
       }
-      
+
       this.handlePositionInfo(list, positionList)
       this.handlePersonInfo(list, employeeList)
       this.handleDeviceGroupInfo(list, deviceGroupList)