案例征集bug修改

src/components/login.vue

@@ -311,12 +311,16 @@ export default {
               if (isU == 1) {
                 this.$router.push("/eventCenter?steps=" + "1");
               } else if (isU == 2 || isU == 4) {
+                //市级账号 munAdmin
                 this.$router.push("/anliList");
               } else if (isU == 5 || isU == 6) {
+                //区县账号 disAdmin
                 this.$router.push("/anliList1");
               } else if (isU == 3) {
+                //省级账号 proAdmin
                 this.$router.push("/anliList2");
               } else if (isU == 0) {
+                //admin账号
                 this.$router.push("/eventCenter?steps=" + "1");
               }
               // console.log(_this.$store.state);

src/components/pages/disAdmin/anliList.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 区县级案例管理 -->
   <div class="pb_content">
     <div class="pb_head">
       <div>
@@ -53,7 +54,7 @@
         </div>
       </div>
     </div>
-    <div class="anliBox" v-if="tableData.length">
+    <div class="anliBox" v-loading="isLoading">
       <div v-for="(a, aIndex) in tableData" :key="aIndex" class="anLi">
         <div class="anliImg">
           <img
@@ -297,6 +298,7 @@ export default {
       checkboxList: [],
       checkboxIdList: [],
       isIndeterminate: false,
+      isLoading: false,
       checkAll: false,
       dialogVisibleMember: false,
       dialogVisibleScore: false,
@@ -394,9 +396,9 @@ export default {
       this.getAnliList();
     },
     getAnliList(rc) {
+      this.isLoading = true;
       var typeE = [];
       var typea, typeb, typec, typed;
-      this.tableData = [];
       for (var i = 0; i < this.CourseType[0].length; i++) {
         if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
           typeE.push(this.CourseType[0][i].id);
@@ -434,6 +436,7 @@ export default {
             this.tableData[i].proexc = JSON.parse(this.tableData[i].proexc);
             this.tableData[i].results = JSON.parse(this.tableData[i].results);
           }
+          this.isLoading = false;
         })
         .catch((err) => {
           console.error(err);
@@ -1064,7 +1067,7 @@ export default {
   font-size: 18px;
 }
 .reTitle > div:nth-child(2) {
-  width: 60%;
+  width: 99%;
   border: 1px solid #dbdbdb;
   font-size: 16px;
   height: 35px;
@@ -1072,6 +1075,10 @@ export default {
   text-indent: 10px;
   border-radius: 5px;
   margin: 10px 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
 }
 .reDetail,
 .reScore {

src/components/pages/disAdmin/school.vue

@@ -107,12 +107,27 @@
           </span>
         </el-form-item>
         <el-form-item label="学校选择" :label-width="formLabelWidth">
-          <el-select v-model="sSchool" filterable clearable @clear="clearSchoolList" :allow-create="false"
-                @focus="remoteMethodclick" remote placeholder="请输入学校" :remote-method="remoteMethod" :loading="loading"
-                no-data-text="暂未查询到此学校">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
+          <el-select
+            v-model="sSchool"
+            filterable
+            clearable
+            @clear="clearSchoolList"
+            :allow-create="false"
+            @focus="remoteMethodclick"
+            remote
+            placeholder="请输入学校"
+            :remote-method="remoteMethod"
+            :loading="loading"
+            no-data-text="暂未查询到此学校"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <div style="text-align: center; color: #adb3b7">
           注：添加账号账号密码为123456
@@ -190,12 +205,12 @@ export default {
     },
     remoteMethodclick() {
       if (!this.options.length) {
-        var _option = []
+        var _option = [];
         for (var i = 0; i < 10; i++) {
           var _a = this.randomNum(0, 10);
-          _option.push(this.list[_a])
+          _option.push(this.list[_a]);
         }
-        this.options = _option
+        this.options = _option;
       }
     },
     remoteMethod(query) {
@@ -209,12 +224,12 @@ export default {
         }, 200);
       } else {
         // this.options = [];
-        var _option = []
+        var _option = [];
         for (var i = 0; i < 10; i++) {
           var _a = this.randomNum(0, 10);
-          _option.push(this.list[_a])
+          _option.push(this.list[_a]);
         }
-        this.options = _option
+        this.options = _option;
       }
     },
     handleClose(done) {
@@ -225,7 +240,7 @@ export default {
       this.getAdmin();
     },
     clearSchoolList() {
-      this.sSchool = ""
+      this.sSchool = "";
     },
     search() {
       this.page = 1;
@@ -300,7 +315,7 @@ export default {
         n: this.sName,
         p: this.sPhone,
         t: 6,
-        s:this.sSchool,
+        s: this.sSchool,
         uid: this.upId,
       };
       this.ajax
@@ -323,22 +338,30 @@ export default {
         });
     },
     deUser(id) {
-      let params = {
-        uid: id,
-      };
-      this.ajax
-        .get(this.$store.state.api + "deleteReviewer", params)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.dialogVisible = false;
-          this.getAdmin();
+      this.$confirm("确定删除该账号吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {
+            uid: id,
+          };
+          this.ajax
+            .get(this.$store.state.api + "deleteReviewer", params)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.dialogVisible = false;
+              this.getAdmin();
+            })
+            .catch((err) => {
+              console.error(err);
+            });
         })
-        .catch((err) => {
-          console.error(err);
-        });
+        .catch(() => {});
     },
     getAdmin() {
       let params = {
@@ -369,12 +392,12 @@ export default {
           this.list = this.schoolList.map((item) => {
             return { value: item.id, label: item.name };
           });
-          var _option = []
+          var _option = [];
           for (var i = 0; i < 10; i++) {
             var _a = this.randomNum(0, this.list.length);
-            _option.push(this.list[_a])
+            _option.push(this.list[_a]);
           }
-          this.options = _option
+          this.options = _option;
           this.isloading = false;
         })
         .catch((err) => {

src/components/pages/disAdmin/score.vue

@@ -386,9 +386,9 @@ export default {
       this.getAnliList();
     },
     getAnliList(rc) {
+      this.isLoading = true;
       var typeE = [];
       var typea, typeb, typec, typed;
-      this.tableData = [];
       for (var i = 0; i < this.CourseType[0].length; i++) {
         if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
           typeE.push(this.CourseType[0][i].id);
@@ -436,6 +436,7 @@ export default {
               this.tableData[i].sum = sumScore;
             }
           }
+          this.isLoading = false;
         })
         .catch((err) => {
           console.error(err);
@@ -697,7 +698,12 @@ export default {
   justify-content: space-between;
   width: 95%;
 }
-
+.touLeft {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
 .touLeft > div:nth-child(1) {
   display: flex;
   flex-direction: row;
@@ -706,7 +712,7 @@ export default {
 }
 
 .touLeft > div > div {
-  margin: 0 10px 10px 0;
+  margin: 0 10px 0 0;
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -1007,7 +1013,7 @@ export default {
   font-size: 18px;
 }
 .reTitle > div:nth-child(2) {
-  width: 60%;
+  width: 99%;
   border: 1px solid #dbdbdb;
   font-size: 16px;
   height: 35px;
@@ -1015,6 +1021,10 @@ export default {
   text-indent: 10px;
   border-radius: 5px;
   margin: 10px 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
 }
 .reDetail,
 .reScore {
@@ -1072,9 +1082,9 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  color: #43A0F5;
+  color: #43a0f5;
 }
-.tableButton>div{
+.tableButton > div {
   margin-right: 10px;
   cursor: pointer;
 }

src/components/pages/disAdmin/user.vue

@@ -56,7 +56,7 @@
               <div>
                 {{
                   scope.row.type == 6
-                    ? "县区子评审员"
+                    ? "区级评审员"
                     : scope.row.type == 5
                     ? "区县评委"
                     : "暂无"
@@ -119,7 +119,7 @@
         </el-form-item>
         <el-form-item label="权限" :label-width="formLabelWidth">
           <el-select v-model="sType" placeholder="请选择权限">
-            <el-option label="区县子评审员" value="6">区县子评审员</el-option>
+            <el-option label="区级评审员" value="6">区级评审员</el-option>
           </el-select>
         </el-form-item>
         <div style="text-align: center; color: #adb3b7">
@@ -390,22 +390,30 @@ export default {
         });
     },
     deUser(id) {
-      let params = {
-        uid: id,
-      };
-      this.ajax
-        .get(this.$store.state.api + "deleteReviewer", params)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.dialogVisible = false;
-          this.getAdmin();
+      this.$confirm("确定删除该账号吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {
+            uid: id,
+          };
+          this.ajax
+            .get(this.$store.state.api + "deleteReviewer", params)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.dialogVisible = false;
+              this.getAdmin();
+            })
+            .catch((err) => {
+              console.error(err);
+            });
         })
-        .catch((err) => {
-          console.error(err);
-        });
+        .catch(() => {});
     },
     getAnliBox() {
       this.ajax

src/components/pages/munAdmin/anliList.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 市级案例管理 -->
   <div class="pb_content">
     <div class="pb_head">
       <div>
@@ -53,7 +54,7 @@
         </div>
       </div>
     </div>
-    <div class="anliBox" v-if="tableData.length">
+    <div class="anliBox" v-loading="isLoading">
       <div v-for="(a, aIndex) in tableData" :key="aIndex" class="anLi">
         <div class="anliImg">
           <img
@@ -296,6 +297,7 @@ export default {
       anliBox1: [],
       checkboxList: [],
       checkboxIdList: [],
+      isLoading: false,
       isIndeterminate: false,
       checkAll: false,
       dialogVisibleMember: false,
@@ -394,9 +396,9 @@ export default {
       this.getAnliList();
     },
     getAnliList(rc) {
+      this.isLoading = true;
       var typeE = [];
       var typea, typeb, typec, typed;
-      this.tableData = [];
       for (var i = 0; i < this.CourseType[0].length; i++) {
         if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
           typeE.push(this.CourseType[0][i].id);
@@ -434,6 +436,7 @@ export default {
             this.tableData[i].proexc = JSON.parse(this.tableData[i].proexc);
             this.tableData[i].results = JSON.parse(this.tableData[i].results);
           }
+          this.isLoading = false;
         })
         .catch((err) => {
           console.error(err);
@@ -1064,7 +1067,7 @@ export default {
   font-size: 18px;
 }
 .reTitle > div:nth-child(2) {
-  width: 60%;
+  width: 99%;
   border: 1px solid #dbdbdb;
   font-size: 16px;
   height: 35px;
@@ -1072,6 +1075,10 @@ export default {
   text-indent: 10px;
   border-radius: 5px;
   margin: 10px 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
 }
 .reDetail,
 .reScore {

src/components/pages/munAdmin/county.vue

@@ -52,19 +52,8 @@
             label="权限等级"
             min-width="10"
             align="center"
-            ><template slot-scope="scope">
-              <div>
-                {{
-                  scope.row.type == 4
-                    ? "评审员"
-                    : scope.row.type == 1
-                    ? "教师"
-                    : scope.row.type == 5
-                    ? "县级评委"
-                    : "暂无"
-                }}
-              </div>
-            </template>
+          >
+            <div>区县评委</div>
           </el-table-column>
           <el-table-column label="操作" min-width="20">
             <template slot-scope="scope">
@@ -118,8 +107,8 @@
         </el-form-item>
         <el-form-item label="权限" :label-width="formLabelWidth">
           <el-select v-model="sType" placeholder="请选择权限">
-            <el-option label="教师" value="1">教师</el-option>
-            <el-option label="评审员" value="4">评审员</el-option>
+            <!-- <el-option label="教师" value="1">教师</el-option> -->
+            <!-- <el-option label="评审员" value="4">评审员</el-option> -->
             <el-option label="区县评委" value="5">区县评委</el-option>
           </el-select>
         </el-form-item>
@@ -140,7 +129,6 @@
         >
       </span>
     </el-dialog>
-
   </div>
 </template>
 
@@ -311,22 +299,30 @@ export default {
         });
     },
     deUser(id) {
-      let params = {
-        uid: id,
-      };
-      this.ajax
-        .get(this.$store.state.api + "deleteReviewer", params)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.dialogVisible = false;
-          this.getAdmin();
+      this.$confirm("确定删除该账号吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {
+            uid: id,
+          };
+          this.ajax
+            .get(this.$store.state.api + "deleteReviewer", params)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.dialogVisible = false;
+              this.getAdmin();
+            })
+            .catch((err) => {
+              console.error(err);
+            });
         })
-        .catch((err) => {
-          console.error(err);
-        });
+        .catch(() => {});
     },
   },
   created() {

src/components/pages/munAdmin/notice.vue

@@ -108,6 +108,7 @@
       :append-to-body="true"
       width="600px"
       :before-close="handleClose"
+      :close-on-click-modal="false"
       class="dialog_diy"
     >
       <div>
@@ -116,7 +117,7 @@
           <el-input v-model="nTitle" placeholder="请输入通知标题"></el-input>
         </div>
         <div>
-          <div style="margin: 10px 0;">通知内容：</div>
+          <div style="margin: 10px 0">通知内容：</div>
           <el-input
             type="textarea"
             placeholder="请输入通知内容"
@@ -132,8 +133,12 @@
       </div>
       <span slot="footer" class="dialog-footer flex">
         <el-button class="left" @click="dialogVisible1 = false">取消</el-button>
-        <el-button class="right" @click="addNotice" v-if="isAddOrUp == false">确认</el-button>
-        <el-button class="right" v-if="isAddOrUp == true">修改</el-button>
+        <el-button class="right" @click="addNotice" v-if="isAddOrUp == false"
+          >确认</el-button
+        >
+        <el-button class="right" @click="addNotice" v-if="isAddOrUp == true"
+          >修改</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -230,7 +235,26 @@ export default {
       this.isAddOrUp = false;
       this.dialogVisible1 = true;
     },
-    addNotice(){},
+    addNotice() {
+      let params = {
+        t: this.nTitle,
+        c: this.nText,
+        uid: this.$store.state.userInfo.userid,
+      };
+      this.ajax
+        .get(this.$store.state.api + "insertRaceNote", params)
+        .then((res) => {
+          this.dialogVisible1 = false;
+          this.getNotice();
+          this.$message({
+            message: "添加成功",
+            type: "success",
+          });
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
+    },
   },
   created() {
     this.getNotice();

src/components/pages/munAdmin/school.vue

@@ -107,12 +107,27 @@
           </span>
         </el-form-item>
         <el-form-item label="学校选择" :label-width="formLabelWidth">
-          <el-select v-model="sSchool" filterable clearable @clear="clearSchoolList" :allow-create="false"
-                @focus="remoteMethodclick" remote placeholder="请输入学校" :remote-method="remoteMethod" :loading="loading"
-                no-data-text="暂未查询到此学校">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
+          <el-select
+            v-model="sSchool"
+            filterable
+            clearable
+            @clear="clearSchoolList"
+            :allow-create="false"
+            @focus="remoteMethodclick"
+            remote
+            placeholder="请输入学校"
+            :remote-method="remoteMethod"
+            :loading="loading"
+            no-data-text="暂未查询到此学校"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <div style="text-align: center; color: #adb3b7">
           注：添加账号账号密码为123456
@@ -190,12 +205,12 @@ export default {
     },
     remoteMethodclick() {
       if (!this.options.length) {
-        var _option = []
+        var _option = [];
         for (var i = 0; i < 10; i++) {
           var _a = this.randomNum(0, 10);
-          _option.push(this.list[_a])
+          _option.push(this.list[_a]);
         }
-        this.options = _option
+        this.options = _option;
       }
     },
     remoteMethod(query) {
@@ -209,12 +224,12 @@ export default {
         }, 200);
       } else {
         // this.options = [];
-        var _option = []
+        var _option = [];
         for (var i = 0; i < 10; i++) {
           var _a = this.randomNum(0, 10);
-          _option.push(this.list[_a])
+          _option.push(this.list[_a]);
         }
-        this.options = _option
+        this.options = _option;
       }
     },
     handleClose(done) {
@@ -225,7 +240,7 @@ export default {
       this.getAdmin();
     },
     clearSchoolList() {
-      this.sSchool = ""
+      this.sSchool = "";
     },
     search() {
       this.page = 1;
@@ -300,7 +315,7 @@ export default {
         n: this.sName,
         p: this.sPhone,
         t: 4,
-        s:this.sSchool,
+        s: this.sSchool,
         uid: this.upId,
       };
       this.ajax
@@ -323,22 +338,30 @@ export default {
         });
     },
     deUser(id) {
-      let params = {
-        uid: id,
-      };
-      this.ajax
-        .get(this.$store.state.api + "deleteReviewer", params)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.dialogVisible = false;
-          this.getAdmin();
+      this.$confirm("确定删除该账号吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {
+            uid: id,
+          };
+          this.ajax
+            .get(this.$store.state.api + "deleteReviewer", params)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.dialogVisible = false;
+              this.getAdmin();
+            })
+            .catch((err) => {
+              console.error(err);
+            });
         })
-        .catch((err) => {
-          console.error(err);
-        });
+        .catch(() => {});
     },
     getAdmin() {
       let params = {
@@ -369,12 +392,12 @@ export default {
           this.list = this.schoolList.map((item) => {
             return { value: item.id, label: item.name };
           });
-          var _option = []
+          var _option = [];
           for (var i = 0; i < 10; i++) {
             var _a = this.randomNum(0, this.list.length);
-            _option.push(this.list[_a])
+            _option.push(this.list[_a]);
           }
-          this.options = _option
+          this.options = _option;
           this.isloading = false;
         })
         .catch((err) => {

src/components/pages/munAdmin/score.vue

@@ -386,9 +386,9 @@ export default {
       this.getAnliList();
     },
     getAnliList(rc) {
+      this.isLoading = true;
       var typeE = [];
       var typea, typeb, typec, typed;
-      this.tableData = [];
       for (var i = 0; i < this.CourseType[0].length; i++) {
         if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
           typeE.push(this.CourseType[0][i].id);
@@ -436,6 +436,7 @@ export default {
               this.tableData[i].sum = sumScore;
             }
           }
+          this.isLoading = false;
         })
         .catch((err) => {
           console.error(err);
@@ -1010,7 +1011,7 @@ export default {
   font-size: 18px;
 }
 .reTitle > div:nth-child(2) {
-  width: 60%;
+  width: 99%;
   border: 1px solid #dbdbdb;
   font-size: 16px;
   height: 35px;
@@ -1018,6 +1019,10 @@ export default {
   text-indent: 10px;
   border-radius: 5px;
   margin: 10px 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
 }
 .reDetail,
 .reScore {

src/components/pages/munAdmin/user.vue

@@ -56,7 +56,7 @@
               <div>
                 {{
                   scope.row.type == 4
-                    ? "评审员"
+                    ? "市级评审员"
                     : scope.row.type == 1
                     ? "教师"
                     : scope.row.type == 2
@@ -122,7 +122,7 @@
         <el-form-item label="权限" :label-width="formLabelWidth">
           <el-select v-model="sType" placeholder="请选择权限">
             <el-option label="教师" value="1">教师</el-option>
-            <el-option label="评审员" value="4">评审员</el-option>
+            <el-option label="评审员" value="4">市级评审员</el-option>
           </el-select>
         </el-form-item>
         <div style="text-align: center; color: #adb3b7">
@@ -393,22 +393,30 @@ export default {
         });
     },
     deUser(id) {
-      let params = {
-        uid: id,
-      };
-      this.ajax
-        .get(this.$store.state.api + "deleteReviewer", params)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.dialogVisible = false;
-          this.getAdmin();
+      this.$confirm("确定删除该账号吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {
+            uid: id,
+          };
+          this.ajax
+            .get(this.$store.state.api + "deleteReviewer", params)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.dialogVisible = false;
+              this.getAdmin();
+            })
+            .catch((err) => {
+              console.error(err);
+            });
         })
-        .catch((err) => {
-          console.error(err);
-        });
+        .catch(() => {});
     },
     getAnliBox() {
       this.ajax

src/components/pages/proAdmin/anliList.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 省级案例管理 -->
   <div class="pb_content">
     <div class="pb_head">
       <div>
@@ -53,7 +54,7 @@
         </div>
       </div>
     </div>
-    <div class="anliBox" v-if="tableData.length">
+    <div class="anliBox" v-loading="isLoading">
       <div v-for="(a, aIndex) in tableData" :key="aIndex" class="anLi">
         <div class="anliImg">
           <img
@@ -296,6 +297,7 @@ export default {
       anliBox1: [],
       checkboxList: [],
       checkboxIdList: [],
+      isLoading: false,
       isIndeterminate: false,
       checkAll: false,
       dialogVisibleMember: false,
@@ -394,9 +396,9 @@ export default {
       this.getAnliList();
     },
     getAnliList(rc) {
+      this.isLoading = true;
       var typeE = [];
       var typea, typeb, typec, typed;
-      this.tableData = [];
       for (var i = 0; i < this.CourseType[0].length; i++) {
         if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
           typeE.push(this.CourseType[0][i].id);
@@ -434,6 +436,7 @@ export default {
             this.tableData[i].proexc = JSON.parse(this.tableData[i].proexc);
             this.tableData[i].results = JSON.parse(this.tableData[i].results);
           }
+          this.isLoading = false;
         })
         .catch((err) => {
           console.error(err);
@@ -1064,7 +1067,7 @@ export default {
   font-size: 18px;
 }
 .reTitle > div:nth-child(2) {
-  width: 60%;
+  width: 99%;
   border: 1px solid #dbdbdb;
   font-size: 16px;
   height: 35px;
@@ -1072,6 +1075,10 @@ export default {
   text-indent: 10px;
   border-radius: 5px;
   margin: 10px 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
 }
 .reDetail,
 .reScore {

src/components/tools/leftBar.vue

@@ -14,10 +14,10 @@
           </el-menu-item>
           <el-menu-item index="/county" v-if="nav.indexOf('/county') != -1">
             <div class="img" v-if="path == '/county'">
-              <img src="../../assets/icon/user-active.png" alt="" />
+              <img src="../../assets/icon/city-active.png" alt="" />
             </div>
             <div class="img" v-else>
-              <img src="../../assets/icon/user.png" alt="" />
+              <img src="../../assets/icon/city.png" alt="" />
             </div>
             <span>区县管理</span>
           </el-menu-item>
@@ -32,10 +32,10 @@
           </el-menu-item>
           <el-menu-item index="/school" v-if="nav.indexOf('/school') != -1">
             <div class="img" v-if="path == '/school'">
-              <img src="../../assets/icon/works-active.png" alt="" />
+              <img src="../../assets/icon/school-active.png" alt="" />
             </div>
             <div class="img" v-else>
-              <img src="../../assets/icon/works.png" alt="" />
+              <img src="../../assets/icon/school.png" alt="" />
             </div>
             <span>学校管理</span>
           </el-menu-item>
@@ -88,10 +88,10 @@
           </el-menu-item>
           <el-menu-item index="/school1" v-if="nav.indexOf('/school1') != -1">
             <div class="img" v-if="path == '/school1'">
-              <img src="../../assets/icon/works-active.png" alt="" />
+              <img src="../../assets/icon/school-active.png" alt="" />
             </div>
             <div class="img" v-else>
-              <img src="../../assets/icon/works.png" alt="" />
+              <img src="../../assets/icon/school.png" alt="" />
             </div>
             <span>学校管理</span>
           </el-menu-item>

src/main.js

@@ -68,9 +68,9 @@ VueCookies.config('30d')
 router.beforeEach((to, from, next) => {
     if (to.matched.length === 0) {
         from.name ? next({
-          name: from.name
+            name: from.name
         }) : next('/login');
-      }
+    }
     if (to.meta.title) {
         document.title = to.meta.title
     }