Merge branch '03/12permission' into test

dist/static/css/chunk-0e6419c2.f12d1121.css

@@ -0,0 +1 @@
+.btnList[data-v-78b2539f]{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:start;-ms-flex-pack:start;justify-content:flex-start}.code-url[data-v-78b2539f]{margin-top:10px}

dist/static/css/chunk-7386f3b0.bd68b159.css

@@ -0,0 +1 @@
+.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-a10777a0] .el-input__inner,.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

src/layout/components/AppMain.vue

@@ -45,16 +45,16 @@ export default {
   /*50 = navbar  */
   /* height: calc(100vh - 80px); */
   /* height: 100vh; */
-  padding-top: 80px;
+  padding-top: 90px;
   /* min-width: 1440px; */
   position: relative;
   /* overflow: auto; */
   box-sizing: border-box;
-  margin-left: 10px;
+  margin-left: 20px;
   margin-top: 20px;
 }
 .fixed-header + .app-main {
-  padding-top: 85px;
+  padding-top: 105px;
 }
 </style>
 

src/layout/components/Navbar.vue

@@ -41,7 +41,7 @@
         <!-- <div class="active"></div> -->
       </div>
       <div class="left-menu">
-        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 69px;">
+        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 89px;">
           <div class="popover-container">
             <el-tag
               class="navbar_tag"
@@ -51,7 +51,7 @@
               >{{ item }}</el-tag
             >
           </div>
-          <span slot="reference" style="display: flex;align-items: center;justify-content: center;height: 69px;">
+          <span slot="reference" style="display: flex;align-items: center;justify-content: center;height: 89px;">
             <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
             <!-- <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i> -->
             <img src="@/assets/images/base/base-home.svg" style="width: 23px;">
@@ -303,8 +303,8 @@ export default {
 
 .indexlayout-top-menu{
   padding-left: 57px;
-  height: 70px;
-  line-height: 68px;
+  height: 90px;
+  line-height: 88px;
   flex: 1;
   display: flex;
   overflow: hidden;
@@ -312,10 +312,10 @@ export default {
   .indexlayout-top-menu-li{
     display: inline-block;
     padding: 0 5px;
-    height: 70px;
+    height: 90px;
     text-decoration: none;
     color: #f2f2f2;
-    font-size: 18px;
+    font-size: 16px;
     transition: all .3s ease;
     span {
       // display: block;
@@ -332,7 +332,7 @@ export default {
     }
   }
   .breadcrumb{
-    line-height: 70px;
+    line-height: 90px;
     margin-left: 10px;
     .el-breadcrumb__item{
       display: inline-block;
@@ -348,19 +348,19 @@ export default {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  height: 70px;
+  height: 90px;
   overflow: hidden;
   position: relative;
   background: #363D55;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;
-    line-height: 70px;
+    line-height: 90px;
     margin: 0 0 0 30px;
     display: inline-block;
   }
   .hamburger-container {
-    line-height: 70px;
+    line-height: 90px;
     height: 100%;
     float: left;
     cursor: pointer;
@@ -376,7 +376,7 @@ export default {
     float: left;
   }
   .left-menu {
-    line-height: 70px;
+    line-height: 90px;
     padding-right: 22px;
     font-size: 16px;
     color: #fff;
@@ -389,7 +389,7 @@ export default {
     min-width: 154px;
     float: right;
     height: 100%;
-    line-height: 70px;
+    line-height: 90px;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
@@ -438,7 +438,7 @@ export default {
     }
 
     .avatar-container {
-      height: 70px;
+      height: 90px;
       margin-right: 42px;
       cursor: pointer;
 

src/layout/components/Sidebar/index.vue

@@ -135,11 +135,13 @@ export default {
 }
 
 /deep/.el-submenu__title, /deep/.el-menu-item {
-  font-size: 16px;
+  font-size: 14px;
 }
 
 /deep/.el-menu-item.is-active {
+    font-weight: bold;
     background-color: #EEF4F4 !important;
+    color: #14928a !important;
     position: relative;
     &::after{
       position: absolute;
@@ -152,7 +154,17 @@ export default {
       height: 100%;
     }
 }
+/deep/.el-submenu .el-menu-item.is-active {
+  color: #14928a !important;
+}
 /deep/.el-menu .menu-wrapper .el-menu-item {
   color: #666666;
 }
+/deep/.el-menu-item, /deep/.el-submenu__title {
+  height: 60px !important;
+  line-height: 60px !important;
+}
+/deep/.el-submenu .el-menu-item {
+  color: #666666 !important;
+}
 </style>

src/layout/index.vue

@@ -9,7 +9,7 @@
     </div>
     <sidebar class="sidebar-container" @childStatus="childStatus" v-show="onlyStatus" />
     <div class="main-container" :class="[ onlyStatus ? null : 'noContainer' ]">
-      <div :class="{'fixed-header':fixedHeader, 'noTagView': !onlyStatus}" style="top: 70px;" >
+      <div :class="{'fixed-header':fixedHeader, 'noTagView': !onlyStatus}" style="top: 90px;" >
         <!-- <navbar /> -->
         <tags-view></tags-view>
       </div>
@@ -72,7 +72,7 @@ export default {
 @import "~@/styles/variables.scss";
 
 #app .sidebar-container {
-  top: 70px;
+  top: 90px;
   background-color: #fff;
 
 }

src/styles/sidebar.scss

@@ -44,7 +44,7 @@
 
     &.has-logo {
       .el-scrollbar {
-        height: calc(100% - 80px);
+        height: calc(100% - 90px);
       }
     }
 

src/utils/validate.js

@@ -59,7 +59,7 @@ export function vaildTeachingUrl() {
   let url = window.location.href
   let returnUrl = ''
   if (/dev/.test(url)) { // dev 环境
-    returnUrl = 'http://mandev.dayaedu.com/'
+    returnUrl = 'http://mandev.dayaedu.com'
   } else if (/test/.test(url)) { // dev 环境
     returnUrl = 'http://mantest.dayaedu.com'
   } else if (/online/.test(url)) { //线上

src/views/businessManager/orderManager/businessStatement.vue

@@ -382,7 +382,7 @@ export default {
     },
     lookDetail(row) {
       this.$router.push({
-        path: "/orderManager/businessStatementDetail",
+        path: "/businessStatementDetail",
         query: {
           organId: row.organId,
           organName: row.organName,

src/views/businessManager/orderManager/businessStatementDetail.vue

@@ -346,7 +346,7 @@ export default {
       // searchForm: this.searchForm,
       // pageInfo: this.pageInfo
        this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/orderManager/businessStatement' })
+      this.$router.push({ path: '/businessStatement' })
     }
   }
 }

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      财务管理
+      财务列表
     </h2>
     <div class="m-core">
       <div

src/views/businessManager/orderManager/financeManager.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      财务管理
+      财务列表
     </h2>
     <div class="m-core">
       <div

src/views/evaluateManager/networkList.vue

@@ -138,8 +138,7 @@
           v-if="tableData.length > 0"
           v-permission="'export/courseReviews'"
           @click="netWorkExport"
-          >导出</el-button
-        >
+          >导出</el-button>
       </el-form-item>
     </save-form>
     <div class="tableWrap">

src/views/main/constant.js

@@ -68,7 +68,7 @@ export const errorType = {
   MUSIC_PATROL_ITEM: {
     name: '乐团巡查事项异常',
     isError: false,
-    url: '/teacherManager/musicInspection',
+    url: '/musicInspection',
     permission: '/musicInspection',
     always: true,
     query: {
@@ -106,7 +106,7 @@ export const errorType = {
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: {
     name: '申请退团学员数',
     isError: true,
-    url: '/studentManager/WithdrawalApplication',
+    url: '/journal/WithdrawalApplication',
     permission: '/WithdrawalApplication',
     always: true,
     query: {
@@ -205,7 +205,7 @@ export const errorType = {
   INSPECTION_ITEM_PLAN: {
     name: '乐团巡查任务未提交',
     isError: true,
-    url: '/teacherManager/musicInspection',
+    url: '/musicInspection',
     permission: '/musicInspection',
     always: true,
     query: {

src/views/reaplceMusicPlayer/index.vue

@@ -22,11 +22,12 @@
       </div>
       <save-form
         :inline="true"
+        ref='searchForm'
         :model="searchForm"
         @submit="search"
         @reset="onReSet"
       >
-        <el-form-item>
+        <el-form-item prop="search">
           <el-input
             v-model.trim="searchForm.search"
             clearable
@@ -91,12 +92,12 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="replaceNum"
+            prop="activeNum"
             label="调查人数"
           ></el-table-column>
           <el-table-column
             align="center"
-            prop="activeNum"
+            prop="replaceNum"
             label="置换人数"
           ></el-table-column>
           <el-table-column align="center" prop="replaceScale" label="置换率">
@@ -171,9 +172,13 @@
         >
       </div>
     </el-dialog>
-    <el-dialog :title="qrcodeName" :visible.sync="qrcodeStatus" width="300px">
+
+      <qr-code v-model="qrcodeStatus"
+             :title="qrcodeName"
+             :codeUrl="codeUrl" />
+
+    <!-- <el-dialog :title="qrcodeName" :visible.sync="qrcodeStatus" width="300px">
       <div class="left-code">
-        <!-- <h2>学员报名连接</h2> -->
         <div id="qrcode" class="qrcode code" ref="qrCodeUrl"></div>
         <p class="code-url" v-if="codeUrl">
           <copy-text>
@@ -181,7 +186,7 @@
           </copy-text>
         </p>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -195,9 +200,9 @@ import addUrl from "./modals/addUrl";
 import detail from "./modals/detail";
 import load from "@/utils/loading";
 import { getReplacementList, openPayReplacement } from "./api";
-import QRCode from "qrcodejs2";
+import QrCode from "@/components/QrCode/index";
 export default {
-  components: { pagination, addUrl, detail },
+  components: { pagination, addUrl, detail, QrCode, },
   data() {
     return {
       searchForm: {
@@ -255,7 +260,10 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {},
+    onReSet() {
+      this.$refs.searchForm.resetFields()
+      this.search()
+    },
     makeUrl() {
       this.makeUrlVisible = true;
     },
@@ -279,32 +287,32 @@ export default {
       if (this.qrcodes) {
         this.qrcodes = false;
 
-        setTimeout(() => {
-          document.getElementById("qrcode").innerHTML = "";
-          this.qrcode = new QRCode("qrcode", {
-            width: 260,
-            height: 260,
-            colorDark: "#000000",
-            colorLight: "#ffffff",
-            correctLevel: QRCode.CorrectLevel.H,
-          });
+        // setTimeout(() => {
+        //   document.getElementById("qrcode").innerHTML = "";
+        //   this.qrcode = new QRCode("qrcode", {
+        //     width: 260,
+        //     height: 260,
+        //     colorDark: "#000000",
+        //     colorLight: "#ffffff",
+        //     correctLevel: QRCode.CorrectLevel.H,
+        //   });
           let str;
           if (name == "调查链接") {
-            str = vaildStudentUrl();
+            let returnUrl = vaildStudentUrl()+`/#/questionnaire?o=${row.organId}&c=${row.cooperationOrganId}`;
+            // console.log(returnUrl)
+            let tempUrl = vaildStudentUrl()+`/#/transfer?returnUrl=${encodeURIComponent(returnUrl)}`
+            str = tempUrl
           } else if (name == "统计链接") {
-            str = vaildTeachingUrl();
+            str = vaildTeachingUrl()+`/#/questionStatistics?o=${row.organId}&c=${row.cooperationOrganId}`;
           }
-          console.log(str);
           // vaildTeachingUrl
-          this.qrcode.makeCode(
-            str +
-              `/#/questionnaireInfo?o=${row.organId}&c=${row.cooperationOrganId}`
-          );
-          this.codeUrl =
-            str +
-            `/#/questionnaireInfo?o=${row.organId}&c=${row.cooperationOrganId}`;
+          // this.qrcode.makeCode(
+          //   str +
+          //     `/#/questionnaireInfo?o=${row.organId}&c=${row.cooperationOrganId}`
+          // );
+          this.codeUrl =str;
           this.qrcodes = true;
-        }, 500);
+        // }, 100);
       }
     },
     openPay(row) {

src/views/setSilder/addSilder.vue

@@ -3,7 +3,7 @@
     <!-- <h2><div class="squrt"></div>侧边栏管理
     </h2> -->
     <div class="m-core slider-container">
-      <div style="position: fixed; z-index: 100; top: 100px;left: 245px;right: 30px">
+      <div style="position: fixed; z-index: 100; top: 155px;left: 245px;right: 30px">
         <el-input placeholder="请输入关键词" v-model="keyword" clearable>
           <el-button
             v-permission="'menu/add'"

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // 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 = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -55,7 +55,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -66,7 +66,7 @@ module.exports = {
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
+        target: target,
         // target: 'http://47.114.176.40:8000',
         changeOrigin: true,
         pathRewrite: {