Browse Source

Merge branch 'Inspection' into online

wolyshaw 4 years ago
parent
commit
f59ca8e276

+ 1 - 1
src/layout/components/TagsView.vue

@@ -106,7 +106,7 @@ export default {
       this.syncTagViewAndSaveForm();
     },
     moveToCurrentTag() {
-      const tags = this.$refs["tag"];
+      const tags = this.$refs["tag"] || [];
       this.$nextTick(() => {
         for (const tag of tags) {
           if (tag.path === this.$route.path) {

+ 1 - 1
src/views/main/baseinfo/management.vue

@@ -9,7 +9,7 @@
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent"/>
+          <count-to :endVal="item.percent" :decimals="2"/>
         </span>
       </statistic-item>
     </statistic>

+ 1 - 1
src/views/main/baseinfo/operate.vue

@@ -9,7 +9,7 @@
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent" :decimals="2"/>
+          <count-to :endVal="item.percent"/>
         </span>
       </statistic-item>
     </statistic>

+ 1 - 1
src/views/musicInspection/index.vue

@@ -155,7 +155,7 @@
                             <el-button type="text" @click="onExport(scope.row)">下载</el-button>
                         </auth>
                         <auth auths="inspectionItemPlan/updateMemo" v-if="scope.row.conclusionStatus == 1 || scope.row.status == 0">
-                            <el-button type="text" @click="handleClick(scope.row)">处理方式</el-button>
+                            <el-button type="text" @click="handleClick(scope.row)">立即处理</el-button>
                         </auth>
                     </template>
                 </el-table-column>

+ 5 - 4
src/views/resetTeaming/index.vue

@@ -110,9 +110,10 @@ export default {
     // sessionStorage.setItem('resetCode', 1)
   },
   mounted () {
-    let obj = {}
-    obj.name = this.activeIndex
-    this.handleClick(obj)
+    // let obj = {}
+    // obj.name = this.activeIndex
+    // console.log(this.activeIndex)
+    // this.handleClick(obj)
     this.__init()
   },
   // activated () {
@@ -142,7 +143,7 @@ export default {
       this.musicGroupInfo = baseInfo.musicGroup
     },
     handleClick (val) {
-      this.activeIndex = val.name
+      // this.activeIndex = val.name
       this.$refs.tab.tab(val)
     },
     permission (str) {