From 9b2771d30a9e426f92ce963f4d2365f112b95d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 28 Sep 2022 11:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/baseurl.js                            |  3 +
 src/views/system/action/index.vue             |  2 +-
 .../system/kindergartenCheckReport/index.vue  |  1 +
 src/views/system/testItemScore/index.vue      | 72 +++++++++++--------
 4 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 src/api/baseurl.js

diff --git a/src/api/baseurl.js b/src/api/baseurl.js
new file mode 100644
index 0000000..79cea49
--- /dev/null
+++ b/src/api/baseurl.js
@@ -0,0 +1,3 @@
+var baseurl = "http://192.168.16.64:8080";
+
+export default baseurl
\ No newline at end of file
diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue
index cc1bbb0..c8cd09c 100644
--- a/src/views/system/action/index.vue
+++ b/src/views/system/action/index.vue
@@ -29,7 +29,7 @@
       ></right-toolbar>
     </el-row>
     <el-row :gutter="24">
-      <div v-if="itemshow" style="margin: 10px auto; width: 100%  ">
+      <div v-if="itemshow" style="margin: 10px auto; width: 100%">
         <el-table
           :data="actionlist"
           border
diff --git a/src/views/system/kindergartenCheckReport/index.vue b/src/views/system/kindergartenCheckReport/index.vue
index 557a7d7..b5d7daa 100644
--- a/src/views/system/kindergartenCheckReport/index.vue
+++ b/src/views/system/kindergartenCheckReport/index.vue
@@ -328,6 +328,7 @@ export default {
       report(item.id).then((res) => {
         this.pdfurl = window.URL.createObjectURL(res);
         this.openiframe = true;
+        console.log(this.pdfurl);
         // window.open(this.pdfurl);
       });
     },
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index 81b174c..c30fd7f 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -430,25 +430,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            <el-input
-              type="number"
-              v-model="scope.row.itemFraction"
-              @input="oninputscore(scope.row)"
-              placeholder="请先输入个人成绩"
-              :disabled="true"
-              v-if="
-                scope.row.itemScore != null ||
-                scope.row.scoreDictId == ResultType1.dictCode
-              "
-            ></el-input>
-            <el-input
-              @input="oninputscore(scope.row)"
-              v-model="scope.row.itemFraction"
-              v-if="
-                scope.row.scoreDictValue != null ||
-                scope.row.scoreDictId == ResultType2.dictCode
-              "
-            ></el-input>
+            <el-input v-model="scope.row.itemFraction"></el-input>
           </template>
         </el-table-column>
 
@@ -564,6 +546,7 @@
             <el-input
               type="number"
               v-model="scope.row.itemScore"
+              @input="oninputscore2(scope.row)"
               v-if="
                 scope.row.itemScore != null ||
                 scope.row.scoreDictId == ResultType1.dictCode
@@ -1369,18 +1352,51 @@ export default {
   },
 
   methods: {
-    oninputscore(item) {
-      getStudentFraction(
-        this.addqueryParams.studentId,
-        item.itemId,
-        item.itemScore
-      ).then((res) => {
+    oninputscore2(item) {
+      if (item.itemScore == "") {
+        console.log(1);
         this.form.itemScoreList.forEach((e) => {
-          if (e.itemId == res.data.itemId) {
-            e.itemFraction = res.data.fraction;
+          if (e.testItemId == item.testItemId) {
+            e.itemFraction = "";
           }
         });
-      });
+      } else {
+        console.log(item);
+        getStudentFraction(
+          this.addqueryParams.studentId,
+          item.testItemId,
+          item.itemScore
+        ).then((res) => {
+          this.form.itemScoreList.forEach((e) => {
+            if (e.testItemId == res.data.itemId) {
+              e.itemFraction = res.data.fraction;
+            }
+          });
+        });
+      }
+    },
+    oninputscore(item) {
+      console.log(item);
+      if (item.itemScore == "") {
+        console.log(1);
+        this.form.itemScoreList.forEach((e) => {
+          if (e.itemId == item.itemId) {
+            e.itemFraction = "";
+          }
+        });
+      } else {
+        getStudentFraction(
+          this.addqueryParams.studentId,
+          item.itemId,
+          item.itemScore
+        ).then((res) => {
+          this.form.itemScoreList.forEach((e) => {
+            if (e.itemId == res.data.itemId) {
+              e.itemFraction = res.data.fraction;
+            }
+          });
+        });
+      }
     },
     handledbClick(row, event, column) {
       this.$refs.table.toggleRowSelection(row);