Merge branch '01/19NavMenu' into online

src/App.vue

@@ -68,6 +68,8 @@ body {
 $--color-primary: teal;
 .el-table {
   width: 99.9% !important;
+  border-left: 1px solid #EBEEF5;
+  border-right: 1px solid #EBEEF5;
 }
 .el-tabs__content {
   overflow: auto;
@@ -87,6 +89,16 @@ input[type="number"] {
 }
 .el-dialog {
   margin-bottom: 10vh;
+  .el-dialog__header {
+    background: #363d55;
+    padding: 15px 20px 15px;
+    .el-dialog__title {
+      color: #fff
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+      color: #fff;
+    }
+  }
 }
 .el-tabs__item.is-active {
   color: #14928a !important;

src/layout/components/Sidebar/Link.vue

@@ -8,7 +8,7 @@
 
 <script>
 import { isExternal } from "@/utils/validate";
-
+import { Searchs } from '@/helpers'
 export default {
   props: {
     to: {
@@ -28,7 +28,7 @@ export default {
       }
       return {
         is: "router-link",
-        to: url
+        to: url,
       };
     }
   }

src/layout/components/TagsView.vue

@@ -10,7 +10,7 @@
         :key="index"
         @contextmenu.prevent.native="openMenu(tag, $event)"
       >
-        {{ generateTitle(tag.title) }}
+        <span :title="generateTitle(tag.title)" class="item" @click="changeTag(tag)">{{ generateTitle(tag.title) }}</span>
         <!-- v-if="index == Array.from(visitedViews).length -1" -->
         <span
           class="el-icon-close icon"
@@ -35,7 +35,7 @@
 import ScrollPane from "@/components/ScrollPane";
 import { generateTitle } from "@/utils/i18n";
 import { Searchs } from "@/helpers";
-
+let activeKey = ''
 export default {
   name: "TagsView",
   components: { ScrollPane },
@@ -44,6 +44,8 @@ export default {
       visible: false,
       top: 0,
       left: 0,
+      activeKey: null,
+      activeTag: null,
       selectedTag: {},
     };
   },
@@ -58,6 +60,22 @@ export default {
     $route() {
       this.addViewTags();
       this.moveToCurrentTag();
+      if (!activeKey) {
+        const s = new Searchs()
+        const keys = [this.$route.path]
+        for (const key in s.searchs) {
+          if (Object.hasOwnProperty.call(s.searchs, key)) {
+            const item = s.searchs[key];
+            if (item.bind === this.$route.path) {
+              keys.push(key)
+            }
+          }
+        }
+        for (const item of keys) {
+          s.removeByKey(item)
+        }
+      }
+      activeKey = ''
     },
     visible(value) {
       if (value) {
@@ -90,10 +108,19 @@ export default {
       const searchs = new Searchs();
       const allSearch = searchs.getSearchs();
       const sks = Object.keys(allSearch);
+      let route = this.$route
       for (const item of sks) {
         if (!(keys.includes(item) || keys.includes(allSearch[item].bind))) {
           searchs.removeByKey(item);
         }
+
+        let tempSaveKeyList = item.split('|')
+        // 大于1说明的特殊标识编号
+        if(tempSaveKeyList.length > 1) {
+          if(allSearch[item] && route.path == allSearch[item].bind && route.query[tempSaveKeyList[1]] != tempSaveKeyList[2]) {
+            searchs.removeByKey(item);
+          }
+        }
       }
     },
     async addViewTags() {
@@ -149,6 +176,23 @@ export default {
     closeMenu() {
       this.visible = false;
     },
+    changeTag(tag) {
+      activeKey = this.getSearchsByRealPath(tag)
+    },
+    getSearchsByRealPath(tag) {
+      const searchs = new Searchs()
+      let keyName = ''
+      for (const key in searchs.searchs) {
+        if (Object.hasOwnProperty.call(searchs.searchs, key)) {
+          const item = searchs.searchs[key];
+          if (tag.path === key || item.bind === tag.path) {
+            keyName = item.bind || tag.path
+          }
+        }
+      }
+      // this.activeKey = keyName
+      return keyName
+    },
     async refresh(view) {
       await this.reloads();
     },
@@ -165,6 +209,7 @@ export default {
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
     .tags-view-item {
       min-width: 120px;
+      display: inline-flex;
       .icon {
         font-size: 20px;
         position: relative;
@@ -173,7 +218,7 @@ export default {
         margin-right: 5px;
       }
       border-radius: 5px 5px 0 0;
-      display: inline-block;
+      // display: inline-block;
       position: relative;
       height: 30px;
       line-height: 30px;
@@ -233,6 +278,12 @@ export default {
 //reset element css of el-icon-close
 .tags-view-wrapper {
   .tags-view-item {
+    .item{
+      flex: 1;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      display: inline-block;
+    }
     .el-icon-close {
       width: 16px;
       height: 16px;

src/views/contentManager/contentOperation.vue

@@ -253,7 +253,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog width="375px"
+    <el-dialog width="375px" title="预览"
                :visible.sync="lookVisible">
       <div class="sd-container">
         <h2>{{ dataInfo.title }}</h2>

src/views/main/baseinfo/index.vue

@@ -132,10 +132,10 @@ export default {
     }
   },
   created(){
-     this.reset()
+    this.$set(this.search, 'organId', null)
   },
   mounted () {
-   
+    this.FetchDetail()
     this.$store.dispatch('setBranchs')
   },
   methods: {

src/views/musicInspection/index.vue

@@ -175,7 +175,7 @@
             <look-detail v-if="tableStatus" :detail="planDetail" />
         </el-dialog>
 
-        <el-dialog :visible.sync="gpsVisible" width="1000px" append-to-body>
+        <el-dialog title="GPS定位" :visible.sync="gpsVisible" width="1000px" append-to-body>
             <gpsLoction v-if="gpsVisible"
                   :activeRow='activeRow' />
         </el-dialog>

src/views/resetTeaming/components/resetSound.vue

@@ -110,7 +110,7 @@
         <template slot-scope="scope">
           <!-- item.name && -->
           <div>
-            <el-dialog :visible.sync="scope.row.markVisible"
+            <el-dialog title="添加教辅" :visible.sync="scope.row.markVisible"
                        style="text-align:left;"
                        width="60%">
               <el-button type='text'

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -362,7 +362,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="studentVisible"
+    <el-dialog :visible.sync="studentVisible" title="学生列表"
                width="600">
       <el-table :data="studentList"
                 class="studenTable"

src/views/sporadicManager/sporadicList.vue

@@ -457,10 +457,11 @@
         >
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="qrcodeStatus" center width="300px">
+    <el-dialog :visible.sync="qrcodeStatus" center width="300px" title="缴费链接">
       <div class="right-code">
-        <h2 class="title">缴费链接</h2>
+        <!-- <h2 class="title">缴费链接</h2> -->
         <vue-qr :text="qrCodeUrl" style="width: 100%" :margin="0"></vue-qr>
+        
         <!-- <div id="qrcode"
              class="qrcode code"
              ref="qrCodeUrl"></div> -->

src/views/studentManager/studentList.vue

@@ -537,10 +537,10 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="qrcodeStatus" center width="300px">
+    <el-dialog title="学员激活列表" :visible.sync="qrcodeStatus" width="300px">
       <div class="right-code">
-        <h2 class="title">学员激活列表</h2>
-        <div id="qrcode" class="qrcode code" ref="qrCodeUrl"></div>
+        <!-- <h2 class="title">学员激活列表</h2> -->
+        <div id="qrcode" class="qrcode code" ref="qrCodeUrl" style="display: flex;justify-content: center;"></div>
         <!-- <p class="code-url"
         v-if="codeUrl2">{{ codeUrl2 }}</p>-->
       </div>

src/views/teacherManager/teacherDetail/components/resetComponent.vue

@@ -139,6 +139,7 @@
       </div>
     </el-dialog>
     <el-dialog :visible.sync="show"
+               title="调整"
                width="400px">
       <resetClass :show="show"
                   @closeReset='closeReset'

src/views/teacherManager/teacherOperation/components/accompanySet.vue

@@ -70,6 +70,7 @@
       </el-row>
     </div>
     <el-dialog :visible.sync="timeVisible"
+               title="添加时间段"
                width="600px"
                :before-close="closetimeVisible">
       <el-form :inline="true"

src/views/teamBuild/components/teamSoundMoney.vue

@@ -110,7 +110,7 @@
                          prop="jiaopu">
           <template slot-scope="scope">
             <div>
-              <el-dialog :visible.sync="scope.row.markVisible"
+              <el-dialog title="添加教辅" :visible.sync="scope.row.markVisible"
                          style="text-align:left;"
                          width="60%">
                 <el-button type="text"

src/views/teamDetail/componentCourse/teacherList.vue

@@ -135,7 +135,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog width="1000px"
+    <el-dialog width="1000px" title="GPS定位"
                :visible.sync="gpsVisible"
                append-to-body>
       <gpsLoction v-if="gpsVisible"

src/views/teamDetail/components/salaryList.vue

@@ -114,7 +114,7 @@
         </el-table-column>
       </el-table>
       <el-dialog width="500px"
-                 title=""
+                 title="调整"
                  :visible.sync="innerVisible"
                  append-to-body>
         <!-- 修改代码 -->

src/views/teamDetail/components/studentList.vue

@@ -1511,7 +1511,8 @@ export default {
   },
   computed:{
     saveKey(){
-      return 'teamDetails-'+this.$route.query.id
+      // return 'teamDetails-'+this.$route.query.id
+      return 'teamDetails-studentList|id|' + this.$route.query.id
     }
   }
 };

src/views/teamDetail/components/teacherList.vue

@@ -8,7 +8,7 @@
     <!-- 搜索类型 -->
     <save-form
       :inline="true"
-      save-key="teamDetails-teacherList"
+      :save-key="saveKey"
       class="searchForm"
       :model="searchForm"
       @submit="search"
@@ -99,7 +99,7 @@
         </el-table-column> -->
       </el-table>
       <pagination
-      save-key="teamDetails-teacherList"
+      :save-key="saveKey"
       sync
         :total.sync="rules.total"
         :page.sync="rules.page"
@@ -157,6 +157,11 @@ export default {
     //   }
     // })
   },
+  computed:{
+    saveKey(){
+      return 'teamDetails-teacherList|id|' + this.$route.query.id
+    }
+  },
   methods: {
     search() {
       this.rules.page = 1;

src/views/teamDetail/index.vue

@@ -109,9 +109,9 @@ export default {
       // let teamInfo = this.$route.query;
       this.$nextTick(res=>{
         this.status = this.$route.query.status;
-      this.teamid = this.$route.query.id;
-      this.name = this.$route.query.name;
-      console.log(this.teamid)
+        this.teamid = this.$route.query.id;
+        this.name = this.$route.query.name;
+        // console.log(this.teamid)
       })
 
       // 判断是否带缓存参数

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -296,7 +296,7 @@
     </el-dialog>
 
     <el-dialog title="点名表" width="800px" :visible.sync="rollCall.status">
-      <el-table :data="rollCall.gridData">
+      <el-table :data="rollCall.gridData" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column
           align="center"
           property="userName"