瀏覽代碼

fix: bug fixed

haifeng.zhang 2 周之前
父節點
當前提交
9a47da52c0

+ 3 - 0
src/views/draw/children/department/componements/seach.vue

@@ -59,6 +59,7 @@ onMounted(() => {
     assessmentModelId: route.query.mid
   });
   getAssessmentIndNameApi();
+  handClickInit3();
 });
 
 // -----------------------------------
@@ -75,6 +76,8 @@ const handClickInit3 = value => {
       item => item.assessmentObjectId === value
     );
     init.assessmentObjectName = selectedItem.assessmentObjectName;
+  } else {
+    init.assessmentObjectName = "";
   }
 
   $emit(

+ 6 - 0
src/views/draw/children/department/componements/seachOld.vue

@@ -75,6 +75,12 @@ const handClickInit1 = value => {
     assessmentModelId: "",
     assessmentObjectId: ""
   });
+  Object.assign(init, {
+    assessmentModelName: "",
+    deptName: "",
+    assessmentObjectName: "",
+    dimensionName: ""
+  });
   $emit(
     "handClick",
     {

+ 1 - 3
src/views/draw/children/department/dataDetail.vue

@@ -40,9 +40,7 @@ const getPersonDimensionChartsListApi = async () => {
 };
 const init = (item, type) => {
   seachParams.value = item;
-  if (Number(type)) {
-    getPersonDimensionChartsListApi();
-  }
+  getPersonDimensionChartsListApi();
 };
 
 // 返回上一页

+ 3 - 0
src/views/draw/children/department/departmentDrank.vue

@@ -143,6 +143,9 @@ const init = (item, type) => {
       getChartsListApi();
       activeName.value = "1";
     });
+  } else {
+    showLength.value = 0;
+    return;
   }
   // setTimeout(() => {
   //   nextTick(() => {

+ 1 - 1
src/views/draw/children/department/departmentRank.vue

@@ -80,7 +80,7 @@ const getPageScoreInfoByAssessmentApi = async (obj: any = {}) => {
       averageScore.value = resultNum;
     }
   } else {
-    ElMessage.error(msg);
+    tableData.value = [];
   }
 };
 

+ 3 - 0
src/views/draw/children/head/componements/seach.vue

@@ -59,6 +59,7 @@ onMounted(() => {
     assessmentModelId: route.query.mid
   });
   getAssessmentIndNameApi();
+  handClickInit3();
 });
 
 // -----------------------------------
@@ -75,6 +76,8 @@ const handClickInit3 = value => {
       item => item.assessmentObjectId === value
     );
     init.assessmentObjectName = selectedItem.assessmentObjectName;
+  } else {
+    init.assessmentObjectName = "";
   }
 
   $emit(

+ 6 - 0
src/views/draw/children/head/componements/seachOld.vue

@@ -95,6 +95,12 @@ const handClickInit1 = value => {
     assessmentModelId: "",
     assessmentObjectId: ""
   });
+  Object.assign(init, {
+    assessmentModelName: "",
+    deptName: "",
+    assessmentObjectName: "",
+    dimensionName: ""
+  });
   $emit("handClick", {
     ...dataList.params,
     ...init

+ 1 - 3
src/views/draw/children/head/dataDetail.vue

@@ -40,9 +40,7 @@ const getPersonDimensionChartsListApi = async () => {
 };
 const init = (item, type) => {
   seachParams.value = item;
-  if (Number(type)) {
-    getPersonDimensionChartsListApi();
-  }
+  getPersonDimensionChartsListApi();
 };
 
 // 返回上一页

+ 3 - 0
src/views/draw/children/head/headDrank.vue

@@ -151,6 +151,9 @@ const init = (item, type) => {
       getChartsListApi();
       activeName.value = "1";
     });
+  } else {
+    showLength.value = 0;
+    return;
   }
   setTimeout(() => {
     nextTick(() => {

+ 4 - 3
src/views/draw/children/head/headRank.vue

@@ -80,7 +80,7 @@ const getPageScoreInfoByAssessmentApi = async (obj: any = {}) => {
       averageScore.value = resultNum;
     }
   } else {
-    ElMessage.error(msg);
+    tableData.value = [];
   }
 };
 
@@ -140,10 +140,11 @@ const toDetail = (row: any = {}) => {
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="科室" min-width="150">
+        <el-table-column prop="deptName" label="科室" min-width="120" />
+        <el-table-column prop="groupName" label="科室主任" min-width="150">
           <template #default="{ row }">
             <el-button type="primary" link @click="toDetail(row)">
-              {{ row.deptName }}
+              {{ row.groupName }}
             </el-button>
           </template>
         </el-table-column>

+ 3 - 0
src/views/draw/children/health/componements/seach.vue

@@ -59,6 +59,7 @@ onMounted(() => {
     assessmentModelId: route.query.mid
   });
   getAssessmentIndNameApi();
+  handClickInit3();
 });
 
 // -----------------------------------
@@ -75,6 +76,8 @@ const handClickInit3 = value => {
       item => item.assessmentObjectId === value
     );
     init.assessmentObjectName = selectedItem.assessmentObjectName;
+  } else {
+    init.assessmentObjectName = "";
   }
 
   $emit(

+ 6 - 0
src/views/draw/children/health/componements/seachOld.vue

@@ -75,6 +75,12 @@ const handClickInit1 = value => {
     assessmentModelId: "",
     assessmentObjectId: ""
   });
+  Object.assign(init, {
+    assessmentModelName: "",
+    deptName: "",
+    assessmentObjectName: "",
+    dimensionName: ""
+  });
   $emit(
     "handClick",
     {

+ 1 - 3
src/views/draw/children/health/dataDetail.vue

@@ -40,9 +40,7 @@ const getPersonDimensionChartsListApi = async () => {
 };
 const init = (item, type) => {
   seachParams.value = item;
-  if (Number(type)) {
-    getPersonDimensionChartsListApi();
-  }
+  getPersonDimensionChartsListApi();
 };
 
 // 返回上一页

+ 3 - 0
src/views/draw/children/health/healthDrank.vue

@@ -142,6 +142,9 @@ const init = (item, type) => {
       getChartsListApi();
       activeName.value = "1";
     });
+  } else {
+    showLength.value = 0;
+    return;
   }
   setTimeout(() => {
     nextTick(() => {

+ 1 - 1
src/views/draw/children/health/healthRank.vue

@@ -80,7 +80,7 @@ const getPageScoreInfoByAssessmentApi = async (obj: any = {}) => {
       averageScore.value = resultNum;
     }
   } else {
-    ElMessage.error(msg);
+    tableData.value = [];
   }
 };
 

+ 3 - 0
src/views/draw/children/worker/componements/seach.vue

@@ -77,6 +77,7 @@ onMounted(() => {
     0
   );
   getAssessmentIndNameApi();
+  handClickInit4();
 });
 
 // -----------------------------------
@@ -93,6 +94,8 @@ const handClickInit4 = value => {
       item => item.assessmentObjectId === value
     );
     init.assessmentObjectName = selectedItem.assessmentObjectName;
+  } else {
+    init.assessmentObjectName = "";
   }
   $emit(
     "handClick",

+ 6 - 0
src/views/draw/children/worker/componements/seachOld.vue

@@ -109,6 +109,12 @@ const handClickInit1 = value => {
     deptCode: "",
     assessmentObjectId: ""
   });
+  Object.assign(init, {
+    assessmentModelName: "",
+    deptName: "",
+    assessmentObjectName: "",
+    dimensionName: ""
+  });
   $emit(
     "handClick",
     {

+ 1 - 3
src/views/draw/children/worker/dataDetail.vue

@@ -40,9 +40,7 @@ const getPersonDimensionChartsListApi = async () => {
 };
 const init = (item, type) => {
   seachParams.value = item;
-  if (Number(type)) {
-    getPersonDimensionChartsListApi();
-  }
+  getPersonDimensionChartsListApi();
 };
 
 // 返回上一页

+ 3 - 0
src/views/draw/children/worker/workerDrak.vue

@@ -145,6 +145,9 @@ const init = (item: any, type: any) => {
       getChartsListApi();
       activeName.value = "1";
     });
+  } else {
+    showLength.value = 0;
+    return;
   }
   setTimeout(() => {
     nextTick(() => {

+ 1 - 1
src/views/draw/children/worker/workerRank.vue

@@ -80,7 +80,7 @@ const getPageScoreInfoByAssessmentApi = async (obj: any = {}) => {
       averageScore.value = resultNum;
     }
   } else {
-    ElMessage.error(msg);
+    tableData.value = [];
   }
 };
 

+ 0 - 2
src/views/evaluate/children/change/components/settingIndexDrawer.vue

@@ -175,8 +175,6 @@ const postUpdateApi = async () => {
     disabledValue.value = true;
     editShow.value = true;
     drawer.value = !drawer.value;
-  } else {
-    ElMessage.error(msg);
   }
 };
 // 公式验证

+ 9 - 1
src/views/evaluate/children/change/mould/manageObject.vue

@@ -844,7 +844,7 @@ const automaticCollectionApi = async () => {
     ElMessage.success("同步数据成功");
     getAssessmentQuotaDetailsApi();
   } else {
-    ElMessage.error(msg);
+    bistatus.value = 1;
   }
 };
 const assessmentHeader = reactive({
@@ -1766,6 +1766,7 @@ const selectAllChangeEvent = row => {
                             v-model="showTargetValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1776,6 +1777,7 @@ const selectAllChangeEvent = row => {
                             v-model="showAddValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1786,6 +1788,7 @@ const selectAllChangeEvent = row => {
                             v-model="showDecValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1796,6 +1799,7 @@ const selectAllChangeEvent = row => {
                             v-model="showChallengeValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1806,6 +1810,7 @@ const selectAllChangeEvent = row => {
                             v-model="showStartValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1818,6 +1823,7 @@ const selectAllChangeEvent = row => {
                             v-model="showUpperValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1830,6 +1836,7 @@ const selectAllChangeEvent = row => {
                             v-model="showAgupperValueSwitch"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                         <div class="w-full flex justify-evenly items-center">
@@ -1840,6 +1847,7 @@ const selectAllChangeEvent = row => {
                             v-model="remarkValueValue"
                             size="small"
                             class="ml-2"
+                            :disabled="bistatus == 0"
                           />
                         </div>
                       </div>