From 3c38a9fbad595a4c35d5928f77ccfc9cfa5e3f58 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期一, 08 九月 2025 11:23:22 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 culture/src/views/strainReportLibrary/reportLibraryOneThree/components/evaluate/index.vue |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/culture/src/views/strainReportLibrary/reportLibraryOneThree/components/evaluate/index.vue b/culture/src/views/strainReportLibrary/reportLibraryOneThree/components/evaluate/index.vue
index fd1cd80..2d63368 100644
--- a/culture/src/views/strainReportLibrary/reportLibraryOneThree/components/evaluate/index.vue
+++ b/culture/src/views/strainReportLibrary/reportLibraryOneThree/components/evaluate/index.vue
@@ -45,7 +45,7 @@
                         <el-table-column prop="index" label="序号" width="60">
                             <template slot-scope="scope">{{ scope.row.index }}</template>
                         </el-table-column>
-                        <el-table-column prop="standard" :label="type == 1 || type == '1' ? '规程型课题评定标准' : '创新型课题评定标准'">
+                        <el-table-column prop="standard" :label="type == 2 || type == '2' ? '规程型课题评定标准' : '创新型课题评定标准'">
                             <template slot-scope="scope">{{ scope.row.standard }}</template>
                         </el-table-column>
                         <el-table-column prop="fullScore" label="满分值" width="80">
@@ -57,15 +57,15 @@
                                  placeholder="请输入" :controls="false" style="width: 100%;" />
                             </template>
                         </el-table-column>
-                        <el-table-column prop="rule" :label="type == 1 || type == '1' ? '规程型课题报告评分规则' : '创新型课题报告评分规则'">
+                        <el-table-column prop="rule" :label="type == 2 || type == '2' ? '规程型课题报告评分规则' : '创新型课题报告评分规则'">
                             <template slot-scope="scope">
-                                <span v-if="scope.$index === 0 && (type == 1 || type == '1')">
+                                <span v-if="scope.$index === 0 && (type == 2 || type == '2')">
                                     1. 规程型课题评定总分的满分为5分。<br>
                                     2. 某分项工作完成,但出现以下三种错误中的1种,则减1分:<br>
                                     ①有缺项、漏项;②或不完整衔接;③或工作被多人拖延。<br>
                                     3. 不能完成该分项的全部工作,或课题不涉及该分项内容,则该分项评0分。
                                 </span>
-                                <span v-if="scope.$index === 0 && (type == 2 || type == '2')">
+                                <span v-if="scope.$index === 0 && (type == 1 || type == '1')">
                                     1. 各分项评满分,应满足以下四项要求:<br>
                                     ①分项内容:清晰、系统、完整,结构逻辑清晰,无缺项;<br>
                                     ②团队工作运行顺畅,计划时间高效。<br>
@@ -193,9 +193,15 @@
             detailData: {}
         };
     },
+    watch: {
+        type(val) { 
+            console.log(val);
+            
+        } 
+    },
     computed: {
         currentAssessmentTable() {
-            return this.type == 1 || this.type == '1' ? this.assessmentTable2 : this.assessmentTable1;
+            return this.type == 2 || this.type == '2' ? this.assessmentTable1 : this.assessmentTable2;
         },
         fullScore() {
             return this.type == 2 || this.type == '2'
@@ -206,7 +212,7 @@
             return this.currentAssessmentTable.reduce((sum, item) => sum + (item.selectedScore || 0), 0);
         },
         dialogTitle() {
-            return this.type === "1" ? "创新型课题评定" : "规程型课题评定标准";
+            return this.type == "1" ? "创新型课题评定" : "规程型课题评定标准";
         }
     },
     methods: {
@@ -216,6 +222,9 @@
                         this.form.reportCode = res.reportCode || '';
                         this.form.reportName = res.reportName || '';
                         this.form.id = res.id || '';
+                        if( res.evaluate.split(',').length == 6){
+                            this.type = 1
+                        }
                         this.currentAssessmentTable = this.currentAssessmentTable.map((item,index)=> {
                             item.selectedScore = res.evaluate.split(',')[index] || 0;
                             return item;

--
Gitblit v1.7.1