init

package.json

@@ -27,7 +27,7 @@
     "vue-echarts": "^6.0.0-rc.6",
     "vue-full-calendar": "^2.8.1-0",
     "vue-fullcalendar": "^1.0.9",
-    "vue-router": "^3.0.1",
+    "vue-router": "^3.0.7",
     "vuex": "^3.6.2"
   },
   "devDependencies": {

src/layout/permission.js

@@ -4,15 +4,19 @@ import { Message, MessageBox } from 'element-ui'
 import cookie from '@/utils/cookie'
 import NProgress from 'nprogress';//加载进度条
 import 'nprogress/nprogress.css';//加载进度条
+// const TenantId = '867735392558919680'
 NProgress.configure({
     showSpinner: false
 });
 NProgress.inc(0.2);
 router.beforeEach((to, from, next) => {
     //保险起见 路由跳转时检查token是否存在
-    if(router.history.pending.query.TenantId !== undefined){
-        sessionStorage.TenantId = router.history.pending.query.TenantId
-    }
+    // if (router.history.pending.query.TenantId !== undefined) {
+    //     sessionStorage.TenantId = router.history.pending.query.TenantId
+    // }
+    // if(sessionStorage.TenantId == 'undefined'){
+    //     sessionStorage.removeItem("TenantId");
+    // }
     const getToken = cookie.getCookie('token')
     // 加载进度条start
     NProgress.start();
@@ -25,7 +29,7 @@ router.beforeEach((to, from, next) => {
                 store.dispatch('GetUserInfo').then(() => {
                     store.dispatch('GenerateRoutes').then(res => {
                         router.addRoutes(res)
-                        next({ ...to, replace: true })
+                        next({ ...to,replace: true })
                     })
                 }).catch(err => {
                     store.dispatch('outLogin').then(() => {
@@ -40,13 +44,24 @@ router.beforeEach((to, from, next) => {
                 } else {
                     store.state.navActive = to.path//导航栏状态
                     store.commit('uploadTabberLists', to)
-                    next()
+                    if(!to.query.TenantId){
+                            to.query.TenantId = sessionStorage.TenantId
+                        next(to)
+                    }else{
+                        next()
+                    }
                 }
             }
         }
     } else {
         if (to.path === '/login') {
-            next()
+            // if(!to.query.TenantId){
+            //     sessionStorage.TenantId = TenantId;
+            //     to.query.TenantId = TenantId
+            //     next(to)
+            // }else{
+                next()
+            // }
             // 加载进度条end
         } else {
             localStorage.clear()

src/router/index.js

@@ -12,6 +12,10 @@ Router.prototype.push = function push(location,onResolve,onReject) {
   }
   return routerPush.call(this, location).catch(error => error)
 }
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location) {
+ return originalPush.call(this, location).catch(err => err)
+}
 
 export const constantRouterMap = [
   {

src/utils/methodsTool.js

@@ -1,4 +1,4 @@
-const BASE_IMG_URL = 'https://file-dev.xyyxt.net'
+const BASE_IMG_URL = 'https://file.xyyxt.net'
 export default {
 	isLogin() {
 		if (uni.getStorageSync('union_id')) {

src/utils/request.js

@@ -6,9 +6,7 @@ import cookie from '@/utils/cookie'
 
 // axios 配置
 axios.defaults.timeout = 5000; //设置连接超时时间
-axios.defaults.baseURL = "http://192.168.1.222/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
-// axios.defaults.baseURL = "http://192.168.1.46:9099/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
-
+axios.defaults.baseURL = "https://cloud.xyyxt.net/"; //这是调用数据接口，项目上线的时候修改这个地方就可以了
 // 也可以这样书写
 const service = axios
 // 如:http://localhost:3000/user/loginUser            使用aixos的时候直接写   /user/loginUser   就可以了
@@ -29,8 +27,11 @@ service.interceptors.request.use(
                 config.headers.AuthorizationToken = 'Bearer ' + token; //存在的话 就携带 token
             }
         }
-        if(sessionStorage.TenantId){
+        if (sessionStorage.TenantId && sessionStorage.TenantId !== 'undefined') {
             config.headers.TenantId = sessionStorage.TenantId; //存在的话 就携带 token
+        } else if (router.history.pending !== null && router.history.pending.query.TenantId) {
+            config.headers.TenantId = router.history.pending.query.TenantId
+            sessionStorage.TenantId = router.history.pending.query.TenantId;
         }
         return config;   //  然后把配置返回
     },
@@ -52,7 +53,15 @@ service.interceptors.response.use(
                             path: `/login?TenantId=${sessionStorage.TenantId}`
                         })
                     }, 1000)
-                } else{
+                } else if (response.data.code === 503) {
+                    Message.error(response.data.msg)
+                    delCookie('token')
+                    setTimeout(() => {
+                        router.replace({
+                            path: `/login`,
+                        })
+                    }, 10)
+                }else{
                     Message.error(response.data.msg)
                     return response.data
                 }

src/view/courseQuestionBank/courseManagement/index.vue

@@ -28,8 +28,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -110,11 +110,11 @@
             <el-col :span="24">
               <header>排序：</header>
               <el-input-number
-              :disabled="statusPop === 2"
+                :disabled="statusPop === 2"
                 v-model="poppleData.sort"
                 controls-position="right"
                 :min="0"
-                 placeholder="请输入排序"
+                placeholder="请输入排序"
               ></el-input-number>
             </el-col>
           </el-col>
@@ -124,7 +124,10 @@
               <div class="imgBox">
                 <label class="imgLabel" for="inputs">
                   <div class="msPhoto" v-if="poppleData.coverUrl">
-                    <img :src="$methodsTools.splitImgHost(poppleData.coverUrl)" alt="图片加载失败" />
+                    <img
+                      :src="$methodsTools.splitImgHost(poppleData.coverUrl)"
+                      alt="图片加载失败"
+                    />
                   </div>
                   <div class="imgbbx" v-else>
                     <p style="margin-top: 49px">
@@ -282,6 +285,7 @@
               append-to-body
               :show-close="false"
               :fullscreen="fullscreenChild"
+              :close-on-click-modal="false"
             >
               <div slot="title" class="hearders">
                 <div class="leftTitle">
@@ -754,7 +758,7 @@ export default {
         duration: 0,
         introduction: this.poppleData.introduction,
         price: this.poppleData.price,
-        sort:this.poppleData.sort,
+        sort: this.poppleData.sort,
         status: this.poppleData.status,
         teacherIds: this.poppleData.teacherIds.join(","),
       };
@@ -781,7 +785,7 @@ export default {
       this.$api
         .editCourse(data)
         .then((res) => {
-          console.log(data)
+          console.log(data);
           this.$message.success("修改成功!");
           this.dialogBox = false;
           this.search();
@@ -892,7 +896,7 @@ export default {
     },
     //获取大章
     getTables(index) {
-      var self = this
+      var self = this;
       var data = {
         courseId: this.poppleData.courseId,
         status: "0,1",
@@ -909,7 +913,7 @@ export default {
         });
         nullBox.sort(this.sortBy("sort", true));
         self.tableDatas = nullBox;
-        self.totalChild = res.total
+        self.totalChild = res.total;
       });
     },
     //删除
@@ -993,30 +997,13 @@ export default {
     },
     //窗口关闭
     closeBefore() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogBox = false;
-          this.fullscreen = false;
-          this.poppleData = {};
-        })
-        .catch(() => {});
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.poppleData = {};
     },
     closeBeforeChild() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.innerVisible = false;
+      this.innerVisible = false;
           this.fullscreenChild = false;
-          // this.poppleData = {};
-        })
-        .catch(() => {});
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/courseQuestionBank/examQuestionConfiguration/index.vue

@@ -29,7 +29,7 @@
       :visible.sync="dialogVisible"
       width="560px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -411,15 +411,7 @@ export default {
       }
     },
     close() {
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
+     this.dialogVisible = false;
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/courseQuestionBank/famousTeacherManagement/index.vue

@@ -25,8 +25,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">{{ statusPop === 1 ? "添加" : "修改" }}</div>
@@ -65,7 +65,10 @@
             <div class="imgBox">
               <label class="imgLabel" for="inputs">
                 <div class="msPhoto" v-if="poppleData.avatar">
-                  <img :src="$methodsTools.splitImgHost(poppleData.avatar)" alt="图片加载失败" />
+                  <img
+                    :src="$methodsTools.splitImgHost(poppleData.avatar)"
+                    alt="图片加载失败"
+                  />
                 </div>
                 <div class="imgbbx" v-else>
                   <p style="margin-top: 49px">点击添加或将文件拖拽到这里上传</p>
@@ -180,24 +183,24 @@ export default {
   methods: {
     getImgFile() {
       var self = this;
-      var file = this.$refs.file.files[0];
+      var file = self.$refs.file.files[0];
       if (file === undefined) {
-        self.$set(self.poppleData, "avatar", '');
+        self.$set(self.poppleData, "avatar", "");
         return;
       }
       if (file.size > 2 * 1024 * 1024) {
-        this.$message.error("图片不得大于2MB");
+        self.$message.error("图片不得大于2MB");
         return;
       }
-      var type = this.$refs.file.value.toLowerCase().split(".").splice(-1);
+      var type = self.$refs.file.value.toLowerCase().split(".").splice(-1);
       if (
         type[0] != "jpg" &&
         type[0] != "png" &&
         type[0] != "jpeg" &&
         type[0] != "bmp"
       ) {
-        this.$message.error("上传格式需为：.jpg/.png/.jpeg/bmp");
-        this.$refs.file.value = "";
+        self.$message.error("上传格式需为：.jpg/.png/.jpeg/bmp");
+        self.$refs.file.value = "";
         return;
       }
       var reader = new FileReader();
@@ -207,61 +210,62 @@ export default {
       };
     },
     async submitTabel() {
-      if (!this.poppleData.teacherName) {
-        this.$message.error("请输入名师姓名");
+      var self = this;
+      if (!self.poppleData.teacherName) {
+        self.$message.error("请输入名师姓名");
         return;
       }
-      if (!this.poppleData.introduce) {
-        this.$message.error("请输入简介");
+      if (!self.poppleData.introduce) {
+        self.$message.error("请输入简介");
         return;
       }
-      if (this.poppleData.status !== 0 && this.poppleData.status !== 1) {
-        this.$message.error("请选择是否启用");
+      if (self.poppleData.status !== 0 && self.poppleData.status !== 1) {
+        self.$message.error("请选择是否启用");
         return;
       }
-      if (this.poppleData.avatar.length === 0) {
-        this.$message.error("请上传头像");
+      if (self.poppleData.avatar.length === 0) {
+        self.$message.error("请上传头像");
         return;
       }
-      if (this.statusPop === 0) {
-        var objNew = JSON.parse(this.beif);
-        if (this.poppleData.avatar !== objNew.avatar) {
-          const awtimg = await this.imgUpload(0);
+      if (self.statusPop === 0) {
+        if (self.poppleData.avatar !== self.beif.avatar) {
+          const awtimg = await self.imgUpload(0);
         }
-      }else{
-        const awtimg = await this.imgUpload(0);
+      } else {
+        const awtimg = await self.imgUpload(0);
       }
       var data = {
-        teacherName: this.poppleData.teacherName,
-        status: this.poppleData.status,
-        introduce: this.poppleData.introduce,
-        avatar: this.poppleData.avatar,
+        teacherName: self.poppleData.teacherName,
+        status: self.poppleData.status,
+        introduce: self.poppleData.introduce,
+        avatar: self.poppleData.avatar,
       };
-      if (this.statusPop === 1) {
-        this.$api.addCourseTeacher(data).then((sult) => {
-          this.$message.success("添加成功!");
-          this.dialogBox = false;
-          this.search();
+      if (self.statusPop === 1) {
+        self.$api.addCourseTeacher(data).then((sult) => {
+          self.$message.success("添加成功!");
+          self.dialogBox = false;
+          self.search();
         });
       } else {
-        data.teacherId = this.poppleData.teacherId;
-        this.$api.editCourseTeacher(data).then((sult) => {
-          this.$message.success("修改成功!");
-          this.dialogBox = false;
-          this.search();
+        data.teacherId = self.poppleData.teacherId;
+        self.$api.editCourseTeacher(data).then((sult) => {
+          self.$message.success("修改成功!");
+          self.dialogBox = false;
+          self.search();
         });
       }
     },
     imgUpload(int) {
+      var self = this;
       return new Promise((resolve, reject) => {
-        this.$upload
-          .upload(this.$refs.file.files[0],int)
+        self.$upload
+          .upload(self.$refs.file.files[0], int)
           .then((res) => {
-            this.$set(this.poppleData, "avatar", res);
+            self.$set(self.poppleData, "avatar", res);
             resolve();
           })
           .catch((err) => {
-            this.$message.error("图片上传错误");
+            self.$message.error("图片上传错误");
           });
       });
     },
@@ -275,10 +279,16 @@ export default {
     },
     // 修改
     modify(options) {
-      this.beif = JSON.stringify(options);
-      this.poppleData = JSON.parse(this.beif);
-      this.statusPop = 0;
-      this.dialogBox = true;
+      var self = this;
+      this.$api.obtainCourseTeacher(options.teacherId).then((res) => {
+        console.log(res)
+        if (res.code === 200) {
+          self.beif = JSON.parse(JSON.stringify(res.data));
+          self.poppleData = res.data;
+          self.statusPop = 0;
+          self.dialogBox = true;
+        }
+      });
     },
     //删除
     del(options) {
@@ -309,6 +319,7 @@ export default {
         .catch(() => {});
     },
     search(v) {
+      var self = this;
       if (v === undefined) {
         v = {
           status: "0,1",
@@ -323,20 +334,20 @@ export default {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
       };
-      this.loading = true;
-      this.$api
+      self.loading = true;
+      self.$api
         .inquireCourseTeacher(data)
         .then((res) => {
           res.rows.forEach((item, index) => {
             item.srcList = [item.avatar];
           });
-          this.tableData = res.rows;
-          this.total = res.total;
-          this.navText.index = res.total;
-          this.loading = false;
+          self.tableData = res.rows;
+          self.total = res.total;
+          self.navText.index = res.total;
+          self.loading = false;
         })
         .catch((err) => {
-          this.loading = false;
+          self.loading = false;
         });
     },
     init() {
@@ -344,17 +355,9 @@ export default {
     },
     //窗口关闭
     closeBefore() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogBox = false;
+      this.dialogBox = false;
           this.fullscreen = false;
           this.poppleData = {};
-        })
-        .catch(() => {});
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/courseQuestionBank/keyTestSites/index.vue

@@ -28,8 +28,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -130,7 +130,10 @@
               <div class="imgBox">
                 <label class="imgLabel" for="inputs">
                   <div class="msPhoto" v-if="poppleData.coverUrl">
-                    <img :src="$methodsTools.splitImgHost(poppleData.coverUrl)" alt="图片加载失败" />
+                    <img
+                      :src="$methodsTools.splitImgHost(poppleData.coverUrl)"
+                      alt="图片加载失败"
+                    />
                   </div>
                   <div class="imgbbx" v-else>
                     <p style="margin-top: 49px">
@@ -156,7 +159,11 @@
             <el-col :span="24">
               <header>重点考点文件：</header>
               <div class="imgBox">
-                <label class="imgLabel" for="inputsFile" style="margin-bottom:5px;">
+                <label
+                  class="imgLabel"
+                  for="inputsFile"
+                  style="margin-bottom: 5px"
+                >
                   <div class="msPhoto" v-if="poppleData.fileUrls">
                     <img
                       style="width: 150px; height: 150px"
@@ -180,7 +187,19 @@
                     @change="getImgFilePDF"
                   />
                 </label>
-                <p style="color: #999999" v-if="statusPop === 2 && poppleData.fileUrls"><el-button type="success" size="mini"><a style="color:#fff;" :href="poppleData.fileUrls" target="_blank">预览PDF</a></el-button></p>
+                <p
+                  style="color: #999999"
+                  v-if="statusPop === 2 && poppleData.fileUrls"
+                >
+                  <el-button type="success" size="mini"
+                    ><a
+                      style="color: #fff"
+                      :href="poppleData.fileUrls"
+                      target="_blank"
+                      >预览PDF</a
+                    ></el-button
+                  >
+                </p>
               </div>
             </el-col>
           </el-col>
@@ -225,7 +244,7 @@ export default {
   components: { searchBox, tableList, pagination, Editor },
   data() {
     return {
-      uploadStatus: 2,//富文本组件传值
+      uploadStatus: 2, //富文本组件传值
       loading: false, //当前表单加载是否加载动画
       navText: {
         title: "重点考点合计",
@@ -586,7 +605,7 @@ export default {
       var self = this;
       return new Promise((resolve, reject) => {
         this.$upload
-          .upload(this.$refs.file.files[0],int)
+          .upload(this.$refs.file.files[0], int)
           .then((res) => {
             self.poppleData.coverUrl = res;
             resolve();
@@ -600,7 +619,7 @@ export default {
       var self = this;
       return new Promise((resolve, reject) => {
         this.$upload
-          .upload(this.$refs.filePdf.files[0],int)
+          .upload(this.$refs.filePdf.files[0], int)
           .then((res) => {
             self.poppleData.fileUrls = res;
             resolve();
@@ -718,17 +737,9 @@ export default {
     },
     //窗口关闭
     closeBefore() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogBox = false;
-          this.fullscreen = false;
-          this.poppleData = {};
-        })
-        .catch(() => {});
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.poppleData = {};
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/courseQuestionBank/professionalManagement/index.vue

@@ -34,8 +34,8 @@
       width="720px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">{{ statusPop === 1 ? "添加" : "修改" }}</div>
@@ -128,13 +128,13 @@ export default {
           status: false,
           title: "未定义",
         },
-        firstColLeft:true
+        firstColLeft: true,
       },
       formList: [
         {
           label: "分类名称",
           prop: "categoryName",
-          placeholder: "输入分类名称"
+          placeholder: "输入分类名称",
         },
         {
           label: "启用状态",
@@ -216,7 +216,7 @@ export default {
           categoryName: "主类型",
         });
         this.optionsCascader = this.arrayChangeType(setObj);
-        console.log(this.optionsCascader ,66)
+        console.log(this.optionsCascader, 66);
       });
     },
     // 表单列添加下级
@@ -244,17 +244,9 @@ export default {
     },
     //窗口关闭
     closeBefore() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogBox = false;
-          this.fullscreen = false;
-          this.poppleData = {};
-        })
-        .catch(() => {});
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.poppleData = {};
     },
     submitTable() {
       console.log(this.poppleData);
@@ -283,13 +275,13 @@ export default {
       //     }
       //   }
       // }
-      if (this.statusPop === 1 ||this.statusPop === 2 ) {
+      if (this.statusPop === 1 || this.statusPop === 2) {
         this.poppleData.pid = this.poppleData.categoryId;
         delete this.poppleData.categoryId;
         this.$api
           .addProfessionClassification(this.poppleData)
           .then((res) => {
-            if(res.code === 200){
+            if (res.code === 200) {
               this.$message.success("添加成功");
               this.tableData = [];
               this.search();
@@ -304,7 +296,7 @@ export default {
         this.$api
           .modifyProfessionClassification(this.poppleData)
           .then((res) => {
-            if(res.code === 200){
+            if (res.code === 200) {
               this.$message.success("修改成功");
               this.tableData = [];
               this.search();
@@ -419,7 +411,7 @@ export default {
           self.navText.index = res.total;
           self.total = res.total;
           self.loading = false;
-         self.getCascader();
+          self.getCascader();
         })
         .catch((err) => {
           this.loading = false;

src/view/courseQuestionBank/questionBank/index.vue

@@ -31,7 +31,7 @@
       append-to-body
       :show-close="false"
       :fullscreen="fullscreenChildPaperTopic"
-      :before-close="closeBefore"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -852,19 +852,7 @@ export default {
     },
     //关闭前操作
     closeBefore() {
-      if (this.statusPop === 2) {
-        this.innerVisiblePaperTopic = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.innerVisiblePaperTopic = false;
-          })
-          .catch(() => {});
-      }
+      this.innerVisiblePaperTopic = false;
     },
     actionListCheckchi(fatherIndex, childrenIndex) {
       this.dingForm.jsonStr[fatherIndex].answer.forEach((item, index) => {

src/view/courseQuestionBank/questionBankManagement/index.vue

@@ -28,8 +28,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -121,11 +121,11 @@
             <el-col :span="24">
               <header>排序：</header>
               <el-input-number
-              :disabled="statusPop === 2"
+                :disabled="statusPop === 2"
                 v-model="poppleData.sort"
                 controls-position="right"
                 :min="0"
-                 placeholder="请输入排序"
+                placeholder="请输入排序"
               ></el-input-number>
             </el-col>
           </el-col>
@@ -274,6 +274,7 @@
                 append-to-body
                 :show-close="false"
                 :fullscreen="fullscreenChild"
+                :close-on-click-modal="false"
               >
                 <div slot="title" class="hearders">
                   <div class="leftTitle">
@@ -391,6 +392,7 @@
                 append-to-body
                 :show-close="false"
                 :fullscreen="fullscreenChildPaper"
+                :close-on-click-modal="false"
               >
                 <div slot="title" class="hearders">
                   <div class="leftTitle">
@@ -1328,54 +1330,22 @@ export default {
     },
     //窗口关闭
     closeBefore() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogBox = false;
-          this.fullscreen = false;
-          this.poppleData = {};
-        })
-        .catch(() => {});
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.poppleData = {};
     },
     closeBeforeChild() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.innerVisible = false;
-          this.fullscreenChild = false;
-          // this.poppleData = {};
-        })
-        .catch(() => {});
+      this.innerVisible = false;
+      this.fullscreenChild = false;
+      // this.poppleData = {};
     },
     closeBeforeChildPaper() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.innerVisiblePaper = false;
+      this.innerVisiblePaper = false;
           this.fullscreenChildPaper = false;
-        })
-        .catch(() => {});
     },
     closeBeforeChildPaperTopic() {
-      this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.innerVisiblePaperTopic = false;
+      this.innerVisiblePaperTopic = false;
           this.innerVisiblePaperTopic = false;
-        })
-        .catch(() => {});
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/eventManagement/activeConfiguration/index.vue

@@ -56,8 +56,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -240,7 +240,9 @@
                 <div class="msPhoto" v-if="formLabelAlign.activityContentUrl">
                   <img
                     :src="
-                      $methodsTools.splitImgHost(formLabelAlign.activityContentUrl)
+                      $methodsTools.splitImgHost(
+                        formLabelAlign.activityContentUrl
+                      )
                     "
                     alt="图片加载失败"
                   />
@@ -522,7 +524,7 @@ export default {
         self.$set(self.formLabelAlign, "activityLogo", ev.target.result);
       };
     },
-    getImgFileImg(){
+    getImgFileImg() {
       var self = this;
       var file = this.$refs.fileimg.files[0];
       if (file === undefined) {
@@ -562,7 +564,9 @@ export default {
         activityName: v.activityName,
         status: v.status,
         activityType: v.activityType,
-        startTime: v.startTimeList ? (v.startTimeList[0] / 1000).toFixed(0) : "",
+        startTime: v.startTimeList
+          ? (v.startTimeList[0] / 1000).toFixed(0)
+          : "",
         endTime: v.startTimeList ? (v.startTimeList[1] / 1000).toFixed(0) : "",
         pageSize: this.pageSize,
         pageNum: this.currentPage,
@@ -593,22 +597,9 @@ export default {
       this.dialogBox = true;
     },
     closeBefore() {
-      if (this.statusPop === 2) {
-        this.dialogBox = false;
-        this.fullscreen = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.dialogBox = false;
-            this.fullscreen = false;
-            this.formLabelAlign = {};
-          })
-          .catch(() => {});
-      }
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.formLabelAlign = {};
     },
     async rulesTableSumbit() {
       if (!this.formLabelAlign.activityName) {
@@ -669,7 +660,9 @@ export default {
         if (this.formLabelAlign.activityLogo !== objNew.activityLogo) {
           const awtimg01 = await this.imgUpload(0);
         }
-        if (this.formLabelAlign.activityContentUrl !== objNew.activityContentUrl) {
+        if (
+          this.formLabelAlign.activityContentUrl !== objNew.activityContentUrl
+        ) {
           const awtimg02 = await this.imgUploadimg(0);
         }
       } else {
@@ -684,7 +677,7 @@ export default {
         endTime: Number(this.releaseTime[1]) / 1000,
         description: this.formLabelAlign.description,
         activityLogo: this.formLabelAlign.activityLogo,
-        activityContentUrl:this.formLabelAlign.activityContentUrl
+        activityContentUrl: this.formLabelAlign.activityContentUrl,
       };
       if (this.formLabelAlign.activityType !== 2) {
         if (

src/view/eventManagement/advertising/index.vue

@@ -50,8 +50,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -424,22 +424,9 @@ export default {
       this.dialogBox = true;
     },
     closeBefore() {
-      if (this.statusPop === 2) {
-        this.dialogBox = false;
-        this.fullscreen = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.dialogBox = false;
-            this.fullscreen = false;
-            this.formLabelAlign = {};
-          })
-          .catch(() => {});
-      }
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.formLabelAlign = {};
     },
     async rulesTableSumbit() {
       if (!this.formLabelAlign.advName) {
@@ -457,10 +444,7 @@ export default {
         this.$message.error("请选择发布方式");
         return;
       }
-      if (
-        this.formLabelAlign.type !== 1 &&
-        this.formLabelAlign.type !== 2
-      ) {
+      if (this.formLabelAlign.type !== 1 && this.formLabelAlign.type !== 2) {
         this.$message.error("请选择广告类型");
         return;
       }

src/view/eventManagement/hierarchicalManagement/index.vue

@@ -28,8 +28,8 @@
       width="1040px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -315,22 +315,9 @@ export default {
       this.search();
     },
     closeBefore() {
-      if (this.statusPop === 2) {
-        this.dialogBox = false;
-        this.fullscreen = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.dialogBox = false;
-            this.fullscreen = false;
-            this.formLabelAlign = {};
-          })
-          .catch(() => {});
-      }
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.formLabelAlign = {};
     },
     rulesTableSumbit() {
       if (
@@ -372,25 +359,27 @@ export default {
         needIntegralStart: this.formLabelAlign.needIntegralStart,
         remarks: this.formLabelAlign.remarks,
       };
-      if(this.statusPop === 1){
-        data.activityGradePrivilegeAddBos = this.formLabelAlign.activityGradePrivilegesVo
-        this.$api.addsystemgrade(data).then(res => {
-          if(res.code === 200){
-            this.$message.success('新增成功')
-            this.search()
-            this.dialogBox = false
+      if (this.statusPop === 1) {
+        data.activityGradePrivilegeAddBos =
+          this.formLabelAlign.activityGradePrivilegesVo;
+        this.$api.addsystemgrade(data).then((res) => {
+          if (res.code === 200) {
+            this.$message.success("新增成功");
+            this.search();
+            this.dialogBox = false;
           }
-        })
-      }else{
-        data.activityGradePrivilegeEditBos = this.formLabelAlign.activityGradePrivilegesVo
-        data.id = this.formLabelAlign.id
-        this.$api.editsystemgrade(data).then(res => {
-          if(res.code === 200){
-            this.$message.success('修改成功')
-            this.search()
-            this.dialogBox = false
+        });
+      } else {
+        data.activityGradePrivilegeEditBos =
+          this.formLabelAlign.activityGradePrivilegesVo;
+        data.id = this.formLabelAlign.id;
+        this.$api.editsystemgrade(data).then((res) => {
+          if (res.code === 200) {
+            this.$message.success("修改成功");
+            this.search();
+            this.dialogBox = false;
           }
-        })
+        });
       }
     },
     addClick(v, int) {

src/view/eventManagement/taskManagement/index.vue

@@ -37,8 +37,8 @@
       width="520px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -358,22 +358,9 @@ export default {
       this.dialogBox = true;
     },
     closeBefore() {
-      if (this.statusPop === 2) {
-        this.dialogBox = false;
-        this.fullscreen = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.dialogBox = false;
-            this.fullscreen = false;
-            this.formLabelAlign = {};
-          })
-          .catch(() => {});
-      }
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.formLabelAlign = {};
     },
     async rulesTableSumbit() {
       if (

src/view/examManagement/examArrangement/index.vue

@@ -58,8 +58,8 @@
       width="580px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -78,7 +78,7 @@
         <el-form label-position="right" label-width="80px" :model="poppleData">
           <el-form-item label="考试类型">
             <el-cascader
-             :disabled="statusPop === 2" 
+              :disabled="statusPop === 2"
               v-model="poppleData.examTypeId"
               :options="optionsTion"
               size="small"
@@ -91,11 +91,14 @@
             ></el-cascader>
           </el-form-item>
           <el-form-item label="考试期次">
-            <el-input :disabled="statusPop === 2"  v-model="poppleData.examPeriod"></el-input>
+            <el-input
+              :disabled="statusPop === 2"
+              v-model="poppleData.examPeriod"
+            ></el-input>
           </el-form-item>
           <el-form-item label="报名时间">
             <el-date-picker
-             :disabled="statusPop === 2" 
+              :disabled="statusPop === 2"
               v-model="poppleData.bmTime1"
               type="datetimerange"
               range-separator="至"
@@ -110,7 +113,7 @@
           <el-form-item label="考试时间">
             <div v-for="(items, indexs) in poppleData.arays" :key="indexs">
               <el-date-picker
-               :disabled="statusPop === 2" 
+                :disabled="statusPop === 2"
                 v-model="poppleData.arays[indexs]"
                 type="datetimerange"
                 range-separator="至"
@@ -122,36 +125,50 @@
               >
               </el-date-picker>
               <i
-              v-if="statusPop !== 2" 
+                v-if="statusPop !== 2"
                 style="color: red; font-size: 20px"
                 class="el-icon-remove"
                 @click="delListsTimes(indexs)"
               ></i>
             </div>
             <i
-             v-if="statusPop !== 2" 
+              v-if="statusPop !== 2"
               style="color: rgb(45, 195, 32); font-size: 20px"
               class="el-icon-circle-plus"
               @click="addListsTimes"
             ></i>
           </el-form-item>
           <el-form-item label="考试地点">
-            <el-input :disabled="statusPop === 2"  v-model="poppleData.examAdress"></el-input>
+            <el-input
+              :disabled="statusPop === 2"
+              v-model="poppleData.examAdress"
+            ></el-input>
           </el-form-item>
           <el-form-item label="报名网址">
-            <el-input :disabled="statusPop === 2"  v-model="poppleData.examUrl"></el-input>
+            <el-input
+              :disabled="statusPop === 2"
+              v-model="poppleData.examUrl"
+            ></el-input>
           </el-form-item>
           <el-form-item label="备注">
-            <el-input :disabled="statusPop === 2"  type="textarea" v-model="poppleData.remarks"></el-input>
+            <el-input
+              :disabled="statusPop === 2"
+              type="textarea"
+              v-model="poppleData.remarks"
+            ></el-input>
           </el-form-item>
           <el-form-item label="发布方式">
             <el-radio-group v-model="poppleData.releaseNum">
-              <el-radio :disabled="statusPop === 2" :label="0">手动发布</el-radio>
-              <el-radio :disabled="statusPop === 2"  :label="1">定时发布</el-radio>
+              <el-radio :disabled="statusPop === 2" :label="0"
+                >手动发布</el-radio
+              >
+              <el-radio :disabled="statusPop === 2" :label="1"
+                >定时发布</el-radio
+              >
             </el-radio-group>
             <el-date-picker
-            v-if="poppleData.releaseNum === 1"
-             :disabled="statusPop === 2" 
+              v-if="poppleData.releaseNum === 1"
+              :disabled="statusPop === 2"
               v-model="poppleData.releaseTime"
               type="datetime"
               placeholder="选择日期时间"
@@ -362,7 +379,7 @@ export default {
             res.data.signStartTime * 1000,
             res.data.signEndTime * 1000,
           ];
-          res.data.releaseTime = Number(res.data.releaseTime) * 1000
+          res.data.releaseTime = Number(res.data.releaseTime) * 1000;
           res.data.examArrangementTimeVo.forEach((item, index) => {
             arays.push([item.startTime * 1000, item.endTime * 1000]);
           });
@@ -414,10 +431,10 @@ export default {
         this.$message.error("请选择发布方式");
         return;
       }
-      if(this.poppleData.releaseNum === 1){
-        if(!this.poppleData.releaseTime){
+      if (this.poppleData.releaseNum === 1) {
+        if (!this.poppleData.releaseTime) {
           this.$message.error("请选择定时发布时间");
-        return;
+          return;
         }
       }
       var objs = [];
@@ -446,8 +463,10 @@ export default {
         signEndTime: (this.poppleData.bmTime1[1] / 1000).toFixed(0),
         status: this.poppleData.status || 4,
       };
-      if(this.poppleData.releaseNum === 1){
-        data.releaseTime = (Number(this.poppleData.releaseTime) / 1000).toFixed(0)
+      if (this.poppleData.releaseNum === 1) {
+        data.releaseTime = (Number(this.poppleData.releaseTime) / 1000).toFixed(
+          0
+        );
       }
       if (this.statusPop === 1) {
         data.examArrangementTimeAddBo = objs;
@@ -542,22 +561,9 @@ export default {
       return result;
     },
     closeBefore() {
-      if (this.statusPop === 2) {
-        this.dialogBox = false;
-        this.fullscreen = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.dialogBox = false;
-            this.fullscreen = false;
-            this.poppleData = {};
-          })
-          .catch(() => {});
-      }
+      this.dialogBox = false;
+      this.fullscreen = false;
+      this.poppleData = {};
     },
     sortBy(attr, rev) {
       //第二个参数没有传递 默认升序排列

src/view/examManagement/examGuide/index.vue

@@ -50,8 +50,8 @@
       width="920px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="closeBefore"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -258,22 +258,9 @@ export default {
       console.log(v);
     },
     closeBefore() {
-      if (this.statusPop === 2) {
         this.dialogBox = false;
         this.fullscreen = false;
-      } else {
-        this.$confirm("此操作将关闭窗口, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.dialogBox = false;
-            this.fullscreen = false;
-            this.poppleData = {};
-          })
-          .catch(() => {});
-      }
+        this.poppleData = {};
     },
     totalScores() {},
     search(v) {

src/view/homePage/home.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="home">
-    <div
+    <!-- <div
       style="
         display: flex;
         flex-direction: column;
@@ -13,8 +13,17 @@
       style="height: 500px; width: 500px"
       ref="myChart"
     ></div>
-    <p style="font-size: 28px;">后台项目进度</p></div>
-
+    <p style="font-size: 28px;">后台项目进度</p></div> -->
+<div class="post">
+        <div class="bg1"></div>
+        <div class="bg2"></div>
+        <div class="bg3"></div>
+        <div class="bg4"></div>
+        <div class="bg5"></div>
+    </div>
+    <div style="text-align: center;">
+        <button id="actives">融合</button>
+    </div>
     
   </div>
 </template>
@@ -25,74 +34,198 @@ export default {
     return {};
   },
   mounted() {
-    this.drawLine();
+    var ast = document.getElementById('actives')
+        ast.addEventListener('click', function () {
+            var lis = ['bg1', 'bg2', 'bg4', 'bg5']
+            var lisClass = ['anmins1', 'anmins2', 'anmins4', 'anmins5']
+            for (let i = 0; i < lis.length; i++) {
+                document.getElementsByClassName(lis[i])[0].classList.add(lisClass[i])
+                setTimeout(()=>{
+                    document.getElementsByClassName(lis[i])[0].classList.add('ans')
+                },900)
+            }
+        })
+    // this.drawLine();
   },
   methods: {
     drawLine() {
-        var self = this
-        // 基于准备好的dom，初始化echarts实例
-        let myChart = this.$echarts.init(this.$refs.myChart);
-        // 绘制图表
-        myChart.setOption({
-          series: [
-            {
-              type: "gauge",
-              progress: {
-                show: true,
-                width: 14,
-              },
-              axisLine: {
-                lineStyle: {
-                  width: 14,
-                },
-              },
-              axisTick: {
-                show: false,
-              },
-              splitLine: {
-                length: 15,
-                lineStyle: {
-                  width: 2,
-                  color: "#999",
-                },
-              },
-              axisLabel: {
-                distance: 25,
-                color: "#999",
-                fontSize: 20,
-              },
-              anchor: {
-                show: true,
-                showAbove: true,
-                size: 21,
-                itemStyle: {
-                  borderWidth: 10,
-                },
-              },
-              title: {
-                show: false,
-              },
-              detail: {
-                valueAnimation: true,
-                fontSize: 50,
-                offsetCenter: [0, "70%"],
-              },
-              data: [
-                {
-                  value: 70,
-                },
-              ],
-            },
-          ],
-      });
+    //     var self = this
+    //     // 基于准备好的dom，初始化echarts实例
+    //     let myChart = this.$echarts.init(this.$refs.myChart);
+    //     // 绘制图表
+    //     myChart.setOption({
+    //       series: [
+    //         {
+    //           type: "gauge",
+    //           progress: {
+    //             show: true,
+    //             width: 14,
+    //           },
+    //           axisLine: {
+    //             lineStyle: {
+    //               width: 14,
+    //             },
+    //           },
+    //           axisTick: {
+    //             show: false,
+    //           },
+    //           splitLine: {
+    //             length: 15,
+    //             lineStyle: {
+    //               width: 2,
+    //               color: "#999",
+    //             },
+    //           },
+    //           axisLabel: {
+    //             distance: 25,
+    //             color: "#999",
+    //             fontSize: 20,
+    //           },
+    //           anchor: {
+    //             show: true,
+    //             showAbove: true,
+    //             size: 21,
+    //             itemStyle: {
+    //               borderWidth: 10,
+    //             },
+    //           },
+    //           title: {
+    //             show: false,
+    //           },
+    //           detail: {
+    //             valueAnimation: true,
+    //             fontSize: 50,
+    //             offsetCenter: [0, "70%"],
+    //           },
+    //           data: [
+    //             {
+    //               value: 70,
+    //             },
+    //           ],
+    //         },
+    //       ],
+    //   });
     },
   },
 };
 </script>
 
 <style lang="less" scoped>
-#home {
-  display: flex;
-  flex-wrap: wrap;
-}
+// #home {
+//   display: flex;
+//   flex-wrap: wrap;
+// }
+
+.post{
+            margin: 40px auto;
+            width: 600px;
+            height: 600px;
+            position: relative;
+        }
+        .bg1 {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 200px;
+            height: 200px;
+            background: linear-gradient(238deg,
+                    rgb(130, 255, 0) 0%,
+                    rgb(0, 84, 166) 100%);
+            mix-blend-mode: overlay;
+            transition: all 1s;
+        }
+
+        .bg2 {
+            position: absolute;
+            top: 0;
+            left: 400px;
+            width: 200px;
+            height: 200px;
+            background: linear-gradient(238deg, rgb(33, 200, 69) 0%, rgb(0, 0, 100) 100%);
+            mix-blend-mode: multiply;
+            transition: all 1s;
+        }
+
+        .bg3 {
+            position: absolute;
+            top: 200px;
+            left: 200px;
+            width: 200px;
+            height: 200px;
+            background: linear-gradient(238deg, rgb(200, 255, 255) 48%, rgb(3, 0, 151) 100%);
+            mix-blend-mode: difference;
+            transition: all 1s;
+        }
+
+        .bg4 {
+            position: absolute;
+            top: 400px;
+            left: 0;
+            width: 200px;
+            height: 200px;
+            background: radial-gradient(100% 85% at 0% 100%,
+                    rgb(0, 0, 0) 0%,
+                    rgb(0, 131, 255) 50%,
+                    rgb(255, 0, 0) 100%);
+            mix-blend-mode: difference;
+            transition: all 1s;
+        }
+
+        .bg5 {
+            position: absolute;
+            top: 400px;
+            left: 400px;
+            width: 200px;
+            height: 200px;
+            mix-blend-mode: overlay;
+            background: radial-gradient(100% 225% at 0% 100%,
+                    rgb(255, 0, 0) 0%,
+                    rgb(66, 255, 0) 100%);
+            transition: all 1s;
+        }
+        .ans{
+            animation: name1 5s infinite linear;
+            box-shadow: 1px 1px 12px 3px rgba(0,0,100,.5);
+        }
+        @keyframes name1 {
+            0%{
+                filter: hue-rotate(0deg);
+            }
+            100%{
+                filter: hue-rotate(360deg);
+            }
+        }
+        .anmins1 {
+            transform: translateX(200px) translateY(200px);
+        }
+
+        .anmins2 {
+            transform: translateX(-200px) translateY(200px);
+        }
+
+        .anmins4 {
+            transform: translateX(200px) translateY(-200px);
+        }
+
+        .anmins5 {
+            transform: translateX(-200px) translateY(-200px);
+        }
+        #actives{
+            padding: 0px 20px;
+            line-height: 40px;
+            text-align: center;
+            font-size: 20px;
+            border-radius: 8px;
+            color: #eee;
+            background: linear-gradient(238deg, rgb(102, 175, 172) 0%, rgb(0, 0, 100) 100%);
+            height: 40px;
+            border: none;
+            cursor: pointer;
+            transition: all 0.4s;
+        }
+        #actives:hover{
+            box-shadow: 1px 1px 12px 3px rgba(0,0,100,.5);
+            color: antiquewhite;
+            transform: scale(1.05);
+        }
 </style>

src/view/jobSearchManagement/companyManagement/index.vue

@@ -12,7 +12,11 @@
         <el-button type="success" @click="customizeFunc" size="medium"
           >下载模板</el-button
         >
-        <label for="mobles" class="el-button el-button--warning" style="margin-right:10px;padding:10px 20px;">导入</label
+        <label
+          for="mobles"
+          class="el-button el-button--warning"
+          style="margin-right: 10px; padding: 10px 20px"
+          >导入</label
         ><input
           style="display: none"
           type="file"
@@ -41,7 +45,7 @@
       :visible.sync="dialogVisible"
       width="710px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -693,16 +697,8 @@ export default {
         this.dialogVisible = false;
         return;
       }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$refs["listData"].resetFields();
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
+      this.$refs["listData"].resetFields();
+      this.dialogVisible = false;
     },
     getImgFile() {
       var self = this;
@@ -783,14 +779,14 @@ export default {
       link.remove();
     },
     importMoble(e) {
-      var self = this
+      var self = this;
       var file = e.target.files[0];
       let formData = new FormData();
       formData.append("file", file);
       this.$api.companyConimportExcel(formData).then((res) => {
-        if(res.code === 200){
-          self.$message.success("导入成功")
-          self.search()
+        if (res.code === 200) {
+          self.$message.success("导入成功");
+          self.search();
         }
       });
     },

src/view/jobSearchManagement/jobTemplate/index.vue

@@ -29,7 +29,7 @@
       :visible.sync="dialogVisible"
       width="600px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -624,16 +624,8 @@ export default {
         this.dialogVisible = false;
         return;
       }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$refs["listData"].resetFields();
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
+      this.$refs["listData"].resetFields();
+      this.dialogVisible = false;
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/jobSearchManagement/recruitmentManagement/index.vue

@@ -47,7 +47,7 @@
       :visible.sync="dialogVisible"
       width="600px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -90,13 +90,13 @@
               v-model="listData[items.prop]"
             ></el-input> -->
             <editor
-                v-else-if="items.scope === 'textarea'"
-                :disabled="statusPop === 2"
-                v-model="listData[items.prop]"
-                :min-height="100"
-                :max-height="300"
-                :uploadStatus="uploadStatus"
-              />
+              v-else-if="items.scope === 'textarea'"
+              :disabled="statusPop === 2"
+              v-model="listData[items.prop]"
+              :min-height="100"
+              :max-height="300"
+              :uploadStatus="uploadStatus"
+            />
             <el-select
               :placeholder="items.placeholder"
               :disabled="statusPop === 2"
@@ -319,7 +319,7 @@ import tableList from "@/components/tableList";
 import Editor from "@/components/Editor";
 import pagination from "@/components/pagination";
 export default {
-  components: { searchBox, tableList, pagination, VDistpicker ,Editor},
+  components: { searchBox, tableList, pagination, VDistpicker, Editor },
   data() {
     return {
       uploadStatus: 2, //富文本组件传值
@@ -1148,16 +1148,8 @@ export default {
         this.dialogVisible = false;
         return;
       }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$refs["listData"].resetFields();
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
+      this.$refs["listData"].resetFields();
+      this.dialogVisible = false;
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/systemSettings/department/index.vue

@@ -30,7 +30,7 @@
       :visible.sync="dialogVisible"
       width="480px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -107,7 +107,7 @@ export default {
       loading: false, //当前表单加载是否加载动画
       rowKey: "deptId",
       navText: {
-        title: "总数据",
+        title: "部门管理",
         index: 0,
         ch: "条",
         num: false,
@@ -168,7 +168,7 @@ export default {
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
-      pageSize: 10, //每页多少条数据
+      pageSize: 999, //每页多少条数据
       currentPage: 1, //当前页码
       // 弹窗字段
       listitem: [
@@ -377,15 +377,7 @@ export default {
       }
     },
     close() {
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
           this.dialogVisible = false;
-        })
-        .catch(() => {});
     },
     normalizer(node) {
       if (node.children && !node.children.length) {

src/view/systemSettings/dict/index.vue

@@ -29,7 +29,7 @@
       :visible.sync="dialogVisible"
       width="560px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -322,19 +322,7 @@ export default {
       }
     },
     close() {
-      if (this.statusPop === 2) {
         this.dialogVisible = false;
-        return;
-      }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/systemSettings/dictData/index.vue

@@ -29,7 +29,7 @@
       :visible.sync="dialogVisible"
       width="560px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -345,21 +345,8 @@ export default {
       }
     },
     close() {
-      if (this.statusPop === 2) {
-        this.dialogVisible = false;
-        this.$refs["listData"].resetFields();
-        return;
-      }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogVisible = false;
-          this.$refs["listData"].resetFields();
-        })
-        .catch(() => {});
+      this.dialogVisible = false;
+      this.$refs["listData"].resetFields();
     },
     handleSizeChange(v) {
       this.pageSize = v;

src/view/systemSettings/jobManagement/index.vue

@@ -29,7 +29,7 @@
       :visible.sync="dialogVisible"
       width="560px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -346,19 +346,7 @@ export default {
       }
     },
     close() {
-      if (this.statusPop === 2) {
-        this.dialogVisible = false;
-        return;
-      }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
+      this.dialogVisible = false;
     },
     sortBy(attr, rev) {
       //第二个参数没有传递 默认升序排列

src/view/systemSettings/personalCenter/index.vue

@@ -22,12 +22,12 @@
       :visible.sync="dialogVisible"
       width="560px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">修改</div>
         <div class="rightBoxs">
-          <img src="@/assets/images/Close@2x.png" alt="" />
+          <img src="@/assets/images/Close@2x.png" alt="" @click="close"/>
         </div>
       </div>
       <div>
@@ -104,16 +104,8 @@ export default {
       this.dialogVisible = true;
     },
     close() {
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
           this.dialogVisible = false;
           this.init();
-        })
-        .catch(() => {});
     },
     submit() {
       var testPhone = /^1[3-9](\d){9}$/;

src/view/systemSettings/roleInfoManagement/index.vue

@@ -29,7 +29,7 @@
       :visible.sync="dialogVisible"
       width="460px"
       :show-close="false"
-      :before-close="close"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -138,7 +138,7 @@ export default {
     return {
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "当前岗位",
+        title: "角色管理",
         index: 0,
         ch: "种",
         num: false,
@@ -407,20 +407,8 @@ export default {
       }
     },
     close() {
-      if (this.statusPop === 2) {
-        this.dialogVisible = false;
-        return;
-      }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.initData();
-          this.dialogVisible = false;
-        })
-        .catch(() => {});
+      this.initData();
+      this.dialogVisible = false;
     },
     initData() {
       this.menuExpand = false;

src/view/systemSettings/usermanagement/index.vue

@@ -56,7 +56,7 @@
           :visible.sync="dialogVisible"
           width="560px"
           :show-close="false"
-          :before-close="close"
+          :close-on-click-modal="false"
         >
           <div slot="title" class="hearders">
             <div class="leftTitle">
@@ -567,21 +567,8 @@ export default {
     },
     // 关闭窗口
     close() {
-      if (this.statusPop === 2) {
-        this.dialogVisible = false;
-        this.resetForm();
-        return;
-      }
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.dialogVisible = false;
-          this.resetForm();
-        })
-        .catch(() => {});
+      this.dialogVisible = false;
+      this.resetForm();
     },
     //重置表单验证
     resetForm() {

src/view/userManagement/personalManagement/index.vue

@@ -31,8 +31,8 @@
       width="780px"
       :show-close="false"
       :destroy-on-close="true"
-      :before-close="close"
       :fullscreen="fullscreen"
+      :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
         <div class="leftTitle">
@@ -787,17 +787,9 @@ export default {
       this.activeIndex = 0;
     },
     close() {
-      this.$confirm("是否关闭该窗口", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.poppleData1 = {}
+      this.poppleData1 = {}
           this.dialogBox = false;
           this.activeIndex = 0;
-        })
-        .catch(() => {});
     },
     handleSizeChange(v) {
       this.pageSize = v;