Browse Source

报错信息重复修改

duy 7 tháng trước cách đây
mục cha
commit
934da0683a

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 447 - 443
src/views/data-fill/division.vue


+ 4 - 4
src/views/data-fill/query.vue

@@ -70,7 +70,7 @@
                         </HcTooltip>
                         <HcTooltip keys="query_download">
                             <el-button
-                            :disabled="isCanDown||tableCheckedKeys.length <= 0" :loading="downloadLoading" hc-btn
+                                :disabled="isCanDown || tableCheckedKeys.length <= 0" :loading="downloadLoading" hc-btn
                                 color="#A16222" @click="batchDownload"
                             >
                                 <HcIcon name="download" />
@@ -79,7 +79,7 @@
                         </HcTooltip>
                         <HcTooltip keys="query_print">
                             <el-button
-                            :disabled="isCanDown||tableCheckedKeys.length <= 0"  :loading="printLoading" hc-btn
+                                :disabled="isCanDown || tableCheckedKeys.length <= 0" :loading="printLoading" hc-btn
                                 color="#A16222" @click="batchPrint"
                             >
                                 <HcIcon name="printer" />
@@ -297,7 +297,7 @@ watch(() => [useAppState.getCollapse, searchTreeVal.value, useAppState.isLayout]
     }
 })
 //是否禁用下载打印按钮
-const isCanDown=ref(false)
+const isCanDown = ref(false)
 //自动展开缓存
 const treeAutoExpandKeys = ref(getStoreValue('wbsTreeExpandKeys') || [])
 
@@ -584,7 +584,7 @@ const getTableData = async () => {
             tableListData.value = getArrValue(data['records'])
             searchForm.value.total = data.total || 0
         } else {
-            window.$message?.error(msg)
+            // window.$message?.error(msg)
             tableListData.value = []
             searchForm.value.total = 0
         }

+ 9 - 25
src/views/data-fill/wbs.vue

@@ -1920,9 +1920,7 @@ const firstItemHttp = async (info) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         window?.location?.reload() //刷新页面
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //编辑节点
@@ -1980,7 +1978,7 @@ const editNodeClick = async () => {
             unitName,
             excellentNum,
             unitNum,
-            digitizeTime
+            digitizeTime,
         } = formEditNodeModel.value
         const { error, code, msg } = await wbsApi.wbsTreeUpdateNode({
             nodeName: title || '',
@@ -1990,7 +1988,7 @@ const editNodeClick = async () => {
             unitName,
             unitNum,
             excellentNum,
-            digitizeTime
+            digitizeTime,
         })
         //处理数据
         editNodeLoading.value = false
@@ -2000,9 +1998,7 @@ const editNodeClick = async () => {
             nodeDataInfo.value['partitionCode'] = partitionCode || ''
             editNodeModal.value = false
             window?.location?.reload() //刷新页面
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 
@@ -2246,9 +2242,7 @@ const copyContractTreeNode = async (type, form, table, classify) => {
             window?.$message?.success('复制成功')
             copyNodeModal.value = false
             window?.location?.reload() //刷新页面
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     } else {
         const { error, code, msg } = await wbsApi.copyContractTreeNode({
             copyType: type,
@@ -2265,9 +2259,7 @@ const copyContractTreeNode = async (type, form, table, classify) => {
             window?.$message?.success('复制成功')
             copyNodeModal.value = false
             window?.location?.reload() //刷新页面
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 //复制数据
@@ -2453,9 +2445,7 @@ const addNodeClickData = async () => {
         window?.$message?.success('新增成功')
         addNodeModalData.value = false
         window?.location?.reload() //刷新页面
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //选中的节点
@@ -3183,9 +3173,7 @@ const hideTreeNode = async () => {
         setTimeout(() => {
             window?.location?.reload() //刷新页面
         }, 1000)
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 const loadMenu = ({ node, item, level }, resolve) => {
@@ -3267,8 +3255,6 @@ const NodeSaveClick = async () => {
     if (!error && code === 200) {
         window?.$message?.success('批量保存成功')
         window?.location?.reload() //刷新页面
-    } else {
-        window?.$message?.error(msg)
     }
 }
 
@@ -3331,9 +3317,7 @@ const sortFormSubmit = async () => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         window?.location?.reload() //刷新页面
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 </script>
 

+ 1 - 1
src/views/ledger/components/construction.vue

@@ -167,7 +167,7 @@ const getTableConstructionData = async () => {
     } else {
         tableConstructionData.value = []
         searchConstructionForm.value.total = 0
-        window?.$message?.error(msg)
+      
     }
 }
 

+ 1 - 1
src/views/login/index.vue

@@ -182,7 +182,7 @@ const formValidateClick = async () => {
     const { error, msg, data } = await useAppLogin(formValue.value)
     if (error) {
         loading.value = false
-       window?.$message?.error(msg)
+      
         return false
     }
     //登录成功

+ 1 - 1
src/views/login/new.vue

@@ -134,7 +134,7 @@ const formValidateClick = async () => {
     const { error, msg } = await useAppLogin(formValue.value)
     if (error) {
         loading.value = false
-        window?.$message?.error(msg)
+      
         return false
     }
     //登录成功

+ 1 - 3
src/views/other/hide-data.vue

@@ -674,9 +674,7 @@ const showTreeNode = async ()=>{
                 isShowLeft.value = true
             }, 500)
 
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 </script>
 

+ 1 - 1
src/views/tentative/detect/collapse-form/src/index.vue

@@ -623,7 +623,7 @@ const saveExcelBussData = async ({ pKeyId }, dragItem = null, showTip = true) =>
             }
             return true
         } else {
-             window?.$message?.error(msg)
+         
             return false
         }
     } else {

+ 4 - 12
src/views/tentative/detect/outside.vue

@@ -587,9 +587,7 @@ const submitFormApi = async () => {
        }, 100)
         await getTableData()
         // window?.location?.reload() //刷新页面
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 
 }
 
@@ -620,9 +618,7 @@ const copyFormApi = async () => {
         window?.$message?.success('操作成功')
         addEditFormModal.value = false
         await getTableData()
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 
 }
 
@@ -640,9 +636,7 @@ const batchCopyFormApi = async (ids) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await getTableData()
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //删除
@@ -671,9 +665,7 @@ const tableRemoveData = async () => {
                     isShowTree.value = true
             }, 100)
 
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 

+ 1 - 3
src/views/tentative/detect/test-form.vue

@@ -1274,9 +1274,7 @@ const tableFormSaveClick = async () => {
                             ListItemRef.value?.setCollapseKey(ActiveKey)
                         })
                     }
-                } else {
-                    window?.$message?.error(msg)
-                }
+                } 
             }
         }
     }

+ 11 - 15
src/views/tentative/detect/test.vue

@@ -92,7 +92,7 @@
                             <span>打印空表</span>
                         </el-button>
                     </HcTooltip> -->
-                    <el-dropdown trigger="click" >
+                    <el-dropdown trigger="click">
                         <el-button hc-btn type="success" :loading="dataBtnLoad">
                             <span>综合功能</span>
                             <hc-icon name="arrow-down-s" />
@@ -100,7 +100,7 @@
                         <template #dropdown>
                             <el-dropdown-menu>
                                 <template v-for="item in dataSyncMenu" :key="item.key">
-                                    <el-dropdown-item @click="dataSyncMenuClick(item)" :disabled="tableCheckedKeys.length <= 0" >{{ item.name }}</el-dropdown-item>
+                                    <el-dropdown-item :disabled="tableCheckedKeys.length <= 0" @click="dataSyncMenuClick(item)">{{ item.name }}</el-dropdown-item>
                                 </template>
                             </el-dropdown-menu>
                         </template>
@@ -108,7 +108,7 @@
                     <HcTooltip keys="tentative_detect_test_del">
                         <el-button
                             :disabled="tableCheckedKeys.length <= 0" :loading="removeLoading" hc-btn
-                            color="#e03997" @click="delModalClick"  class="ml-2"
+                            color="#e03997" class="ml-2" @click="delModalClick"
                         >
                             <hc-icon name="delete-bin-2" />
                             <span>删除</span>
@@ -312,8 +312,8 @@
             url="informationWriteQuery/batchTask" @finish="showReportFinish"
             @hide="showReportModal = false"
         />
-         <!-- 一键重签弹窗 -->
-         <hc-new-dialog v-model="resignModal" title="一键重签" widths="38rem" :loading="signLoading" @close="cancelresign" @save="signClick">
+        <!-- 一键重签弹窗 -->
+        <hc-new-dialog v-model="resignModal" title="一键重签" widths="38rem" :loading="signLoading" @close="cancelresign" @save="signClick">
             <div>
                 是否重新生成pdf:
                 <el-radio-group v-model="resignModalRadio">
@@ -340,7 +340,7 @@ import dataApi from '~api/tentative/detect/test'
 import testSampleApi from '~api/tentative/material/testSample'
 import commissionApi from '~api/tentative/detect/commission'
 import acquisitionApi from '~api/tentative/acquisition/data'
-import { arrToId, formValidate, getArrValue, getObjVal, getObjValue, isNullES, isString,arrToKey } from 'js-fast-way'
+import { arrToId, arrToKey, formValidate, getArrValue, getObjVal, getObjValue, isNullES, isString } from 'js-fast-way'
 import { HcDelMsg } from 'hc-vue3-ui'
 import { toPdfPage } from '~uti/btn-auth'
 
@@ -537,7 +537,7 @@ const pageChange = ({ current, size }) => {
 }
 
 
-const dataBtnLoad=ref(false)
+const dataBtnLoad = ref(false)
 //综合功能菜单
 const dataSyncMenu = [
     { key: 'copy', name: '复制', load: true },
@@ -554,7 +554,7 @@ const dataSyncMenuClick = (item) => {
         printPdfClick()
     } else if (key === 'delete') {
         quitPdfClick()
-    }else if (key === 'printExcel') {
+    } else if (key === 'printExcel') {
         printNullPdfClick()
     }
     
@@ -685,9 +685,7 @@ const copyDataApi = async (ids) => {
     if (!error && code === 200) {
         window.$message?.success('复制成功')
         searchClick()
-    } else {
-        window.$message?.error(msg)
-    }
+    } 
 }
 
 //删除
@@ -718,9 +716,7 @@ const removeDataApi = async (ids) => {
     if (!error && code === 200) {
         window.$message?.success('删除成功')
         searchClick()
-    } else {
-        window.$message?.error(msg)
-    }
+    } 
 }
 
 //批量打印
@@ -781,7 +777,7 @@ const quitPdfClick = async () => {
                 searchClick()
             } else {
                 quitPdfLoading.value = false
-                window.$message?.error(msg)
+                // window.$message?.error(msg)
             }
         }
 

+ 4 - 12
src/views/tentative/detect/third.vue

@@ -588,9 +588,7 @@ const submitFormApi = async () => {
         }, 100)
         await getTableData()
 
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //复制
@@ -623,9 +621,7 @@ const copyFormApi = async () => {
         addEditFormModal.value = false
 
         await getTableData()
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 
 }
 
@@ -643,9 +639,7 @@ const batchCopyFormApi = async (ids) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await getTableData()
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //删除
@@ -674,9 +668,7 @@ const tableRemoveData = async () => {
                     isShowTree.value = true
                 }, 100)
                 await getTableData()
-         } else {
-                window?.$message?.error(msg)
-         }
+         } 
     }
 }
 

+ 4 - 12
src/views/tentative/device/approach.vue

@@ -489,8 +489,6 @@ const addEditNodeFormModalSave = async () => {
             addEditNodeFormModal.value = false
             addEditNodeFormLoading.value = false
             await getClassListData()
-        } else {
-            window?.$message?.error(msg)
         }
     }
 }
@@ -519,9 +517,7 @@ const setClassRemove = async (id) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await getClassListData()
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //删除表格数据
@@ -544,9 +540,7 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 
@@ -577,7 +571,7 @@ const printerClick = async () => {
 const importModal = ref(false)
 const uploadData = ref({})
 const importModalClick = () => {
-    if(!searchForm.value?.deviceClassId){
+    if (!searchForm.value?.deviceClassId) {
         window?.$message?.warning('请选择左边的数据')
         return
     }
@@ -640,7 +634,7 @@ const tableImportData = ref([])
 //多选
 const tableImportKeys = ref([])
 const tableImportSelection = (rows) => {
-    rows.deviceClassName = menuItem.value.deviceClassName;
+    rows.deviceClassName = menuItem.value.deviceClassName
     tableImportKeys.value = rows
 }
 
@@ -714,8 +708,6 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
-        } else {
-            window?.$message?.error(msg)
         }
         addEditFormLoading.value = false
     }

+ 5 - 9
src/views/tentative/device/employ.vue

@@ -2,7 +2,7 @@
     <div class="hc-page-layout-box">
         <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box menu">
             <div class="hc-menu-header-box">
-                <div class="text-xl name">设备分类 - 使用记录</div>
+                <div class="name text-xl">设备分类 - 使用记录</div>
             </div>
             <div class="hc-menu-contents-box">
                 <el-scrollbar>
@@ -53,7 +53,7 @@
                     <div class="w-64">
                         <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                     </div>
-                    <div class="w-72 ml-2">
+                    <div class="ml-2 w-72">
                         <el-input
                             v-model="searchForm.queryValue" clearable placeholder="请输入设备名称\设备型号查询"
                             @keyup="keyUpEvent"
@@ -178,7 +178,7 @@
             v-model="importModal" :loading="importModalLoading" is-table title="导入设备使用数据"
             widths="70rem" @close="importModalClose" @save="importModalYesClick"
         >
-            <div class="text-orange mb-6">
+            <div class="mb-6 text-orange">
                 <span>请先下载模板模板表格 (</span>
                 <span class="text-link" @click="downloadImportClick">范例试验设备文件</span>
                 <span>) ,按模板样式编辑试验容器后,在点击“选择文件”按钮选择编辑好的文件,点击确认即可导入成功!</span>
@@ -385,9 +385,7 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 
@@ -634,9 +632,7 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
 
             await getTableData()
-        } else {
-                window?.$message?.error(msg)
-            }
+        } 
         }
 }
 

+ 4 - 8
src/views/tentative/device/overhaul.vue

@@ -2,7 +2,7 @@
     <div class="hc-page-layout-box">
         <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box menu">
             <div class="hc-menu-header-box">
-                <div class="text-xl name">设备分类 - 检修记录</div>
+                <div class="name text-xl">设备分类 - 检修记录</div>
             </div>
             <div class="hc-menu-contents-box">
                 <el-scrollbar>
@@ -53,7 +53,7 @@
                     <div class="w-64">
                         <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                     </div>
-                    <div class="w-72 ml-2">
+                    <div class="ml-2 w-72">
                         <el-input
                             v-model="searchForm.queryValue" clearable placeholder="请输入设备名称\设备型号查询"
                             @keyup="keyUpEvent"
@@ -149,7 +149,7 @@
             v-model="importModal" :loading="importModalLoading" is-table title="导入设备检修数据"
             widths="70rem" @close="importModalClose" @save="importModalYesClick"
         >
-            <div class="text-orange mb-6">
+            <div class="mb-6 text-orange">
                 <span>请先下载模板模板表格 (</span>
                 <span class="text-link" @click="downloadImportClick">范例试验设备文件</span>
                 <span>) ,按模板样式编辑试验容器后,在点击“选择文件”按钮选择编辑好的文件,点击确认即可导入成功!</span>
@@ -343,8 +343,6 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
-        } else {
-            window?.$message?.error(msg)
         }
     }
 }
@@ -529,9 +527,7 @@ const addEditFormClick = async () => {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
             await getTableData()
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 

+ 2 - 6
src/views/tentative/laboratory/user.vue

@@ -416,9 +416,7 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
            
             await getTableData()
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
         addEditFormModal.value = false
         addEditFormLoading.value = false
     }
@@ -445,9 +443,7 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
-        } else {
-            window?.$message?.error(msg)
-        }
+        } 
     }
 }
 </script>

+ 1 - 3
src/views/uni-app/components/data-form.vue

@@ -161,9 +161,7 @@ const toSaveClick = async () => {
     if (!error && code === 200) {
         postForm('saveSuccess')
         postMsg('保存成功', 'success')
-    } else {
-        window?.$message?.error(msg)
-    }
+    } 
 }
 
 //发送消息

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác