重新打包

dist/static/css/chunk-22000157.06ddf423.css → dist/static/css/chunk-7da979e6.d5077bae.css

@@ -1 +1 @@
-.dialog-footer[data-v-39c75a6e]{margin-top:20px;display:block;text-align:right}.alert[data-v-39c75a6e]{margin-bottom:10px}.dialog-footer[data-v-d926220a]{margin-top:20px;display:block;text-align:right}.alert[data-v-d926220a]{margin-bottom:10px}.dialog-footer[data-v-8018d522]{margin-top:20px;display:block;text-align:right}.alert[data-v-8018d522]{margin-bottom:10px}.dialog-footer[data-v-09b44c52]{margin-top:20px;display:block;text-align:right}.alert[data-v-09b44c52]{margin-bottom:10px}
+.dialog-footer[data-v-39c75a6e]{margin-top:20px;display:block;text-align:right}.alert[data-v-39c75a6e]{margin-bottom:10px}.dialog-footer[data-v-43863eea]{margin-top:20px;display:block;text-align:right}.alert[data-v-43863eea]{margin-bottom:10px}.dialog-footer[data-v-8018d522]{margin-top:20px;display:block;text-align:right}.alert[data-v-8018d522]{margin-bottom:10px}.dialog-footer[data-v-09b44c52]{margin-top:20px;display:block;text-align:right}.alert[data-v-09b44c52]{margin-bottom:10px}

dist/static/css/chunk-63e8e558.19e3ac43.css → dist/static/css/chunk-c38de4c8.44c33e30.css

@@ -1 +1 @@
-[data-v-5279f58a] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}
+[data-v-ed5a5b42] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}

src/components/remote-search/index.vue

@@ -31,12 +31,8 @@
 <script>
 const placeholder = {
   setTeachers: "请选择老师",
-<<<<<<< HEAD
-  setEducations: "请选乐团主管"
-=======
   setEducations: "请选乐团主管",
   setEmploys:"请选择操作人"
->>>>>>> origin/03/08IndexAtten
 };
 import { throttle, slice, uniqBy } from "lodash";
 import selects from "@/store/modules/selects";

src/router/notKeepAliveList.js

@@ -97,10 +97,7 @@ export default [
   '/business/auditFailed',
   '/business/resetTeaming', // 进行中修改
   '/business/teacherOperationUpdate',
-<<<<<<< HEAD
-  '/business/ArrearageStudents'
-=======
+  '/business/ArrearageStudents',
   '/operateManager/serverDetail', // 服务指标明细
->>>>>>> origin/03/08IndexAtten
   // '/business/feeAudit',
 ]

vue.config.js

@@ -17,21 +17,12 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-<<<<<<< HEAD
-let target = 'http://47.114.176.40:8000' //test环境
-// let target = 'http://192.168.3.139:8000' // 箭河
-// let target = 'http://192.168.3.38:8000' //邹璇
-// let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://47.114.176.40:8000' // 测试服
-// let target = 'http://dev.dayaedu.com/' // 乔
-=======
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
 // let target = 'http://dev.dayaedu.com' // 测试服
 let target = 'http://47.114.176.40:8000' //开发环境
 // let target = 'http://192.168.3.134' // 乔
->>>>>>> origin/03/08IndexAtten
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**