Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/evaluation.vue

@@ -147,18 +147,12 @@
               <img src="../../assets/add.png" @click="addE(1)" alt />
             </div>
             <div class="e_add_list_body">
-              <div class="e_add_input">
-                <el-input v-model="evaObject.fName" />
-                <el-button @click="addInputName(1)" type="primary"
-                  >确 定</el-button
-                >
-              </div>
               <div
                 class="e_add_list_child"
                 v-for="(item, index) in eJson"
                 :key="index"
               >
-                <div v-if="!evaObject.isFInput">
+                <div v-if="evaObject.isFInput != '0-' + index">
                   <span
                     :class="{ active: item.id == fid }"
                     v-if="item.name.length < 8"
@@ -182,7 +176,7 @@
                     style="right: 40px"
                     src="../../assets/autorUp.png"
                     @click="
-                      (evaObject.isFInput = true),
+                      (evaObject.isFInput = '0-' + index),
                         (evaObject.fName1 = item.name)
                     "
                     alt
@@ -201,6 +195,12 @@
                   alt
                 />
               </div>
+              <div class="e_add_input">
+                <el-input v-model="evaObject.fName" />
+                <el-button @click="addInputName(1)" type="primary"
+                  >确 定</el-button
+                >
+              </div>
             </div>
             <div class="e_add_list_detail" v-if="fid">
               <textarea
@@ -221,18 +221,12 @@
               />
             </div>
             <div class="e_add_list_body">
-              <div class="e_add_input" v-if="fid != ''">
-                <el-input v-model="evaObject.sName" />
-                <el-button @click="addInputName(2)" type="primary"
-                  >确 定</el-button
-                >
-              </div>
               <div
                 class="e_add_list_child"
                 v-for="(item, index) in fid && eJson[fid].child"
                 :key="index"
               >
-                <div v-if="!evaObject.isSInput">
+                <div v-if="evaObject.isSInput != '1-' + index">
                   <span
                     :class="{ active: item.id == sid }"
                     v-if="item.name.length < 8"
@@ -256,7 +250,7 @@
                     style="right: 40px"
                     src="../../assets/autorUp.png"
                     @click="
-                      (evaObject.isSInput = true),
+                      (evaObject.isSInput = '1-' + index),
                         (evaObject.sName1 = item.name)
                     "
                     alt
@@ -274,6 +268,12 @@
                   alt
                 />
               </div>
+              <div class="e_add_input" v-if="fid != ''">
+                <el-input v-model="evaObject.sName" />
+                <el-button @click="addInputName(2)" type="primary"
+                  >确 定</el-button
+                >
+              </div>
             </div>
             <div class="e_add_list_detail" v-if="sid">
               <textarea
@@ -294,12 +294,6 @@
               />
             </div>
             <div class="e_add_list_body">
-              <div class="e_add_input" v-if="sid != ''">
-                <el-input v-model="evaObject.tName" />
-                <el-button @click="addInputName(3)" type="primary"
-                  >确 定</el-button
-                >
-              </div>
               <div
                 class="e_add_list_child"
                 v-for="(item, index) in fid &&
@@ -307,7 +301,7 @@
                 eJson[fid].child[sid].child"
                 :key="index"
               >
-                <div v-if="!evaObject.isTInput">
+                <div v-if="evaObject.isTInput != '2-' + index">
                   <span
                     :class="{ active: item.id == tid }"
                     v-if="item.name.length < 8"
@@ -331,7 +325,7 @@
                     style="right: 40px"
                     src="../../assets/autorUp.png"
                     @click="
-                      (evaObject.isTInput = true),
+                      (evaObject.isTInput = '2-' + index),
                         (evaObject.tName1 = item.name)
                     "
                     alt
@@ -349,6 +343,12 @@
                   alt
                 />
               </div>
+              <div class="e_add_input" v-if="sid != ''">
+                <el-input v-model="evaObject.tName" />
+                <el-button @click="addInputName(3)" type="primary"
+                  >确 定</el-button
+                >
+              </div>
             </div>
             <div class="e_add_list_detail" v-if="tid">
               <textarea
@@ -515,13 +515,13 @@ export default {
       evaObject: {
         fName: "",
         fName1: "",
-        isFInput: false,
+        isFInput: "",
         sName: "",
         sName1: "",
-        isSInput: false,
+        isSInput: "",
         tName: "",
         tName1: "",
-        isTInput: false,
+        isTInput: "",
       },
     };
   },
@@ -625,13 +625,13 @@ export default {
     noInput(id, n, t) {
       if (t == 1) {
         this.eJson[id].name = n;
-        this.evaObject.isFInput = false;
+        this.evaObject.isFInput = "";
       } else if (t == 2) {
         this.eJson[this.fid].child[id].name = n;
-        this.evaObject.isSInput = false;
+        this.evaObject.isSInput = "";
       } else if (t == 3) {
         this.eJson[this.fid].child[this.sid].child[id].name = n;
-        this.evaObject.isTInput = false;
+        this.evaObject.isTInput = "";
       }
       this.eJSONNum++;
       this.setMindData();
@@ -1172,7 +1172,7 @@ export default {
   flex-wrap: nowrap;
   align-items: center;
   justify-content: center;
-  padding: 10px 0;
+  padding: 10px;
 }
 .e_add_input > .el-input {
   width: 200px;