From f70cdfb07479e751d46397df051eadd0cd308a20 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 30 Dec 2024 17:43:08 +0800
Subject: [PATCH 1/2] sc

---
 src/views/Kpi/Appraise/Components/DialogAppraise.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/Kpi/Appraise/Components/DialogAppraise.vue b/src/views/Kpi/Appraise/Components/DialogAppraise.vue
index 8bb40f9..ab89fca 100644
--- a/src/views/Kpi/Appraise/Components/DialogAppraise.vue
+++ b/src/views/Kpi/Appraise/Components/DialogAppraise.vue
@@ -11,6 +11,7 @@
           <el-form-item label="生效日期" prop="effectiveDate">
             <el-date-picker
               v-model="form.effectiveDate"
+              :disabled="form.id"
               type="date"
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
@@ -150,15 +151,17 @@ async function open(type, val) {
     }
   }
   getOptions()
-  const checkedCount = form.value.examinedUserIdList?.length || 0
-  isIndeterminate.value = checkedCount > 0 && checkedCount < employeeOptions.value.length
 }
 
 function getOptions() {
   KpiApi.getKpiEmployees().then((data) => {
     employeeOptions.value = data
-    handleCheckAllChange(true)
-    checkAll.value = true
+    if (formType.value == 'update') {
+      handleCheckedChange(form.value.examinedUserIdList)
+    } else {
+      handleCheckAllChange(true)
+      checkAll.value = true
+    }
   })
 }
 

From e10fedb4dcd602962a9989a9d16fedb9ebb35ece Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 30 Dec 2024 18:05:58 +0800
Subject: [PATCH 2/2] sc

---
 .env.base                     | 4 ++--
 src/views/Kpi/Score/index.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.env.base b/.env.base
index d470c46..b37d409 100644
--- a/.env.base
+++ b/.env.base
@@ -4,8 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
-# VITE_BASE_URL='http://114.55.169.15:48080'
+# VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
diff --git a/src/views/Kpi/Score/index.vue b/src/views/Kpi/Score/index.vue
index b4b71c8..eda77c6 100644
--- a/src/views/Kpi/Score/index.vue
+++ b/src/views/Kpi/Score/index.vue
@@ -198,7 +198,8 @@ function getSummaries({ columns, data }) {
     const values = data.map((item) => Number(item[column.property]))
     if (!values.every((value) => Number.isNaN(value))) {
       if (column.property == 'weightSocre') {
-        sums[index] = 5.6
+        const employee = employeeOptions.value.find((it) => it.examinedUser == employeeId.value)
+        sums[index] = employee.scoreTotal + '分'
       } else {
         sums[index] = ''
       }