zhangjie 5 lat temu
rodzic
commit
b6ccd62aeb

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_DOMAIN=http://localhost:8111
+VUE_APP_DOMAIN=
 VUE_APP_TIMEOUT=600000
 VUE_APP_PAGE_SIZE=10
 VUE_APP_AUTH_TIMEOUT=7200000

BIN
src/assets/images/icon-close-act.png


+ 26 - 12
src/assets/styles/element-ui-costom.scss

@@ -61,6 +61,26 @@
     color: #999;
   }
 }
+.el-popup-close {
+  height: 20px;
+  width: 20px;
+  background-image: url(../images/icon-close.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  &::before {
+    content: "";
+  }
+  &:hover {
+    background-image: url(../images/icon-close-act.png);
+  }
+}
+.el-dialog__headerbtn {
+  top: 14px;
+  right: 14px;
+  .el-dialog__close {
+    @extend .el-popup-close;
+  }
+}
 // form
 .el-form {
   &-item {
@@ -348,18 +368,12 @@
   &__title {
     display: none;
   }
-  .el-message-box__close.el-icon-close {
-    height: 18px;
-    width: 18px;
-    &::before {
-      display: block;
-      width: 100%;
-      height: 100%;
-      content: "";
-      background-image: url(../images/icon-close.png);
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-    }
+  &__headerbtn {
+    top: 10px;
+    right: 10px;
+  }
+  &__close.el-icon-close {
+    @extend .el-popup-close;
   }
   &__content {
     text-align: center;

+ 5 - 4
src/modules/exam-center/views/ExamRomeStudentDetail.vue

@@ -108,10 +108,11 @@
         <el-table-column prop="examSite" label="考点名称"></el-table-column>
         <el-table-column prop="examName" label="考试名称"></el-table-column>
         <el-table-column prop="examRoom" label="考场名称"></el-table-column>
-        <el-table-column label="科目名称(ID)" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.courseName }}({{ scope.row.courseCode }})
-          </template>
+        <el-table-column
+          prop="courseNameCode"
+          label="科目名称(ID)"
+          min-width="100"
+        >
         </el-table-column>
         <el-table-column prop="examNumber" label="考号"></el-table-column>
         <el-table-column prop="name" label="姓名"></el-table-column>

+ 2 - 0
src/plugins/axios.js

@@ -47,6 +47,8 @@ const errorDataCallback = error => {
   if (error.code === "106") {
     message = "身份验证失效,请重新登录";
     MessageBox.confirm(message, "重新登陆?", {
+      cancelButtonClass: "el-button--primary",
+      confirmButtonClass: "el-button--default-act",
       type: "error",
       callback: action => {
         if (action !== "confirm") return;

+ 0 - 1
src/views/Home.vue

@@ -129,7 +129,6 @@ export default {
     async getMenus() {
       const data = await sysMenu();
       this.navs = this.menusToTree(data.records);
-      console.log(this.$route.name);
 
       if (this.$route.name === "Home") {
         this.$router.replace({