From 408e207f2c554731246debbdbe4a6435727d0280 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 19 Apr 2024 07:57:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/basic/basciYearEquipment/index.vue    | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/eam/basic/basciYearEquipment/index.vue b/src/views/eam/basic/basciYearEquipment/index.vue
index 1e9aa76..fb1bc9a 100644
--- a/src/views/eam/basic/basciYearEquipment/index.vue
+++ b/src/views/eam/basic/basciYearEquipment/index.vue
@@ -181,26 +181,29 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType, data) => {
-  var isHave = BasciYearEquipment.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime'
-  })
-  if (isHave) {
-    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
-      message.error('失效时间要大于生效时间')
-      return
+  try {
+    var isHave = BasciYearEquipment.allSchemas.formSchema.some(function (item) {
+      return item.field === 'activeTime' || item.field === 'expireTime'
+    })
+    if (isHave) {
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+        message.error('失效时间要大于生效时间')
+        return
+      }
     }
-  }
-  if (data.activeTime == 0) data.activeTime = null
-  if (data.expireTime == 0) data.expireTime = null
-  if (formType === 'create') {
-    await BasciYearEquipmentApi.createBasciYearEquipment(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await BasciYearEquipmentApi.updateBasciYearEquipment(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
+    if (data.activeTime == 0) data.activeTime = null
+    if (data.expireTime == 0) data.expireTime = null
+    if (formType === 'create') {
+      await BasciYearEquipmentApi.createBasciYearEquipment(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BasciYearEquipmentApi.updateBasciYearEquipment(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    getList()
+  }catch{
+    basicFormRef.value.dialogVisible = false}
 }
 
 /** 详情操作 */

From 69267ef218b1ff0ac5a3539f7aa044e8cad84273 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 19 Apr 2024 09:19:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/device/deviceSpotInspectionRecordMain/index.vue | 1 +
 src/views/eam/mold/moldSpotInspectionRecordMain/index.vue     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
index 5fb82b0..d668d07 100644
--- a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
+++ b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
@@ -523,6 +523,7 @@ const onSubmit = async (status: string) => {
     getList();
   } finally {
     formRef.value.formLoading = false;
+    updateFormValue.value.approveOpinion = "";
   }
 }
 
diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
index 449b876..75fe315 100644
--- a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
+++ b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
@@ -538,6 +538,7 @@ const onSubmit = async (status: string) => {
     getList();
   } finally {
     formRef.value.formLoading = false;
+    updateFormValue.value.approveOpinion = "";
   }
 }
 

From f68719a7fef9238893c800fb58dc70ca3bbad60e Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 19 Apr 2024 10:26:25 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceSpotInspectionRecordMain.data.ts             |  1 +
 .../device/deviceSpotInspectionRecordMain/index.vue    |  1 +
 .../eam/mold/moldSpotInspectionRecordMain/index.vue    |  1 +
 .../moldSpotInspectionRecordMain.data.ts               | 10 ++++++----
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
index 187a53d..3a70469 100644
--- a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
+++ b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
@@ -255,6 +255,7 @@ export const DeviceSpotInspectionRecordDetail = useCrudSchemas(reactive<CrudSche
     field: 'action',
     isForm: false,
     isTable: false,
+    isDetail:false,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
index d668d07..03575ed 100644
--- a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
+++ b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
@@ -77,6 +77,7 @@
     :apiPage="DeviceSpotInspectionRecordDetailApi.getDeviceSpotInspectionRecordDetailPage"
     :apiDelete="DeviceSpotInspectionRecordDetailApi.deleteDeviceSpotInspectionRecordDetail"
     :Echo="Echo"
+    :isShowAddBtn="false"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
index 75fe315..460cf1f 100644
--- a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
+++ b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
@@ -77,6 +77,7 @@
     :apiPage="DeviceSpotInspectionRecordDetailApi.getDeviceSpotInspectionRecordDetailPage"
     :apiDelete="DeviceSpotInspectionRecordDetailApi.deleteDeviceSpotInspectionRecordDetail"
     :Echo="Echo"
+    :isShowAddBtn="false"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts b/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts
index 797d16c..88ad4dc 100644
--- a/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts
+++ b/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts
@@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { selectAllFactoryArea } from '@/api/system/dept'
 import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+import * as MOldAccountsApi from '@/api/eam/mold/moldAccounts'
 import { useUserStore } from '@/store/modules/user'
 import { selecUserByType } from '@/api/system/dept'
 import { ItemSearchTable } from '../../basic/item/item.data'
@@ -14,8 +15,8 @@ const factoryList = await selectAllFactoryArea()
 const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({})
 const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: 1 })
 const userListAll = await UserApi.getSimpleUserList()
-const deviceListNoPage = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
-const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'DEVICE')
+const deviceListNoPage = await MOldAccountsApi.getMoldAccountsAllNoPage({})
+const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'MOLD')
 const deviceDeviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
 const isConformList = [{
   label:'是',
@@ -211,7 +212,7 @@ export const DeviceSpotInspectionRecordDetailRules = reactive({
 export const DeviceSpotInspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
  
   {
-    label: '检修工单号',
+    label: '巡检点检工单号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -254,7 +255,8 @@ export const DeviceSpotInspectionRecordDetail = useCrudSchemas(reactive<CrudSche
     label: '操作',
     field: 'action',
     isForm: false,
-    isTable: true,
+    isTable: false,
+    isDetail:false,
     table: {
       width: 150,
       fixed: 'right'

From 87c36acaff08729dd523d0faac157145ae918894 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 19 Apr 2024 11:24:17 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=8C=87=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/basic/basciYearEquipment/index.vue      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/basic/basciYearEquipment/index.vue b/src/views/eam/basic/basciYearEquipment/index.vue
index fb1bc9a..3d5009b 100644
--- a/src/views/eam/basic/basciYearEquipment/index.vue
+++ b/src/views/eam/basic/basciYearEquipment/index.vue
@@ -38,10 +38,10 @@
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
       <template #goal="{ row }">
-        <span>{{ row.goal+"%" }}</span>
+        <span>{{ row.type=='0'?row.goal+"%":row.goal }}</span>
       </template>
       <template #actual="{ row }">
-        <span>{{ row.goal==null?"":row.goal+"%" }}</span>
+        <span>{{ row.actual==null||row.actual==""||row.type!='0'?row.actual:row.actual+"%" }}</span>
       </template>
     </Table>
   </ContentWrap>
@@ -170,12 +170,13 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  if (type == 'update') {
-    console.log("123",BasciYearEquipment.allSchemas.formSchema);
-    BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factoryType').componentProps.disabled = true//编辑置灰
-   // BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factory_type').componentProps.disabled = true//编辑置灰
-    //BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'year_index').componentProps.disabled = true//编辑置灰
-  }
+  // if (type == 'update') {
+  //   BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factoryType').componentProps.disabled = true//编辑置灰
+  //  // BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factory_type').componentProps.disabled = true//编辑置灰
+  //   //BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'year_index').componentProps.disabled = true//编辑置灰
+  // }else{
+  //   BasciYearEquipment.allSchemas.formSchema.find(item => item.field == 'factoryType').componentProps.disabled = false//编辑置灰
+  // }
   basicFormRef.value.open(type, row)
 }
 

From bf092fe7aadaf066a3c404bd4428f9c7c551dbbf Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 19 Apr 2024 15:09:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index c833f88..2118d17 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -127,7 +127,7 @@
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障恢复时间(MTTR/min)</li>
-              <li class="two orange">{{ yearTarget.zsHFGoal || '0%' }}</li>
+              <li class="two orange">{{ yearTarget.zsHFGoal || '0' }}</li>
               <li
                 class="three"
                 :class="
@@ -135,12 +135,12 @@
                     ? 'red'
                     : 'green'
                 "
-                >{{ yearTarget.zsHFActual || '0%' }}</li
+                >{{ yearTarget.zsHFActual || '0' }}</li
               >
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障间隔时间(H)</li>
-              <li class="two orange">{{ yearTarget.zsJGGoal || '0%' }}</li>
+              <li class="two orange">{{ yearTarget.zsJGGoal || '0' }}</li>
               <li
                 class="three"
                 :class="
@@ -148,7 +148,7 @@
                     ? 'red'
                     : 'green'
                 "
-                >{{ yearTarget.zsJGActual || '0%' }}</li
+                >{{ yearTarget.zsJGActual || '0' }}</li
               >
             </ul>
           </div>
@@ -178,7 +178,7 @@
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障恢复时间(MTTR/min)</li>
-              <li class="two orange">{{ yearTarget.zpHFGoal || '0%' }}</li>
+              <li class="two orange">{{ yearTarget.zpHFGoal || '0' }}</li>
               <li
                 class="three"
                 :class="
@@ -186,12 +186,12 @@
                     ? 'red'
                     : 'green'
                 "
-                >{{ yearTarget.zpHFActual || '0%' }}</li
+                >{{ yearTarget.zpHFActual || '0' }}</li
               >
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障间隔时间(H)</li>
-              <li class="two orange">{{ yearTarget.zpJGGoal || '0%' }}</li>
+              <li class="two orange">{{ yearTarget.zpJGGoal || '0' }}</li>
               <li
                 class="three"
                 :class="
@@ -199,7 +199,7 @@
                     ? 'red'
                     : 'green'
                 "
-                >{{ yearTarget.zpJGActual || '0%' }}</li
+                >{{ yearTarget.zpJGActual || '0' }}</li
               >
             </ul>
           </div>
@@ -229,7 +229,7 @@
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障恢复时间(MTTR/min)</li>
-              <li class="two orange">{{ yearTarget.tzHFGoal || '0%' }}</li>
+              <li class="two orange">{{ yearTarget.tzHFGoal || '0' }}</li>
               <li
                 class="three"
                 :class="
@@ -237,12 +237,12 @@
                     ? 'red'
                     : 'green'
                 "
-                >{{ yearTarget.tzHFActual || '0%' }}</li
+                >{{ yearTarget.tzHFActual || '0' }}</li
               >
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障间隔时间(H)</li>
-              <li class="two orange">{{ yearTarget.tzJGGoal || '0%' }}</li>
+              <li class="two orange">{{ yearTarget.tzJGGoal || '0' }}</li>
               <li
                 class="three"
                 :class="
@@ -250,7 +250,7 @@
                     ? 'red'
                     : 'green'
                 "
-                >{{ yearTarget.tzJGActual || '0%' }}</li
+                >{{ yearTarget.tzJGActual || '0' }}</li
               >
             </ul>
           </div>