Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/layout/components/TagsView/index.vue

@@ -70,6 +70,7 @@ export default {
   mounted() {
     this.initTags()
     this.addTags()
+     console.log()
   },
   methods: {
     isActive(route) {
@@ -153,10 +154,11 @@ export default {
     },
     refreshSelectedTag(view) {
       this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
+        // const { fullPath } = view
         this.$nextTick(() => {
           this.$router.replace({
-            path: '/redirect' + fullPath
+            // path: '/redirect' + fullPath
+            path: '/index'
           })
         })
       })

src/views/combatduty/basedutyinfo/index.vue

@@ -19,7 +19,7 @@
           ></el-date-picker>
       </el-form-item>
       <el-form-item label="值班首长" prop="chiefDutyName">
-        <el-select v-model="queryParams.chiefDutyId" filterable clearable placeholder="请选择值班首长">
+        <el-select v-model="queryParams.chiefDutyName"  filterable clearable placeholder="请选择值班首长">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
       </el-form-item>
@@ -354,9 +354,9 @@
              v-if="qdflg==1"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="值班首长" prop="chiefDutyId">
-          <el-select v-model="form.chiefDutyId" filterable clearable placeholder="请选择值班首长">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        <el-form-item label="值班首长" prop="chiefDutyName">
+          <el-select v-model="form.chiefDutyName" @change="chiefDutyNamefun" filterable clearable placeholder="请选择值班首长">
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
@@ -365,9 +365,9 @@
         <el-form-item label="值班首长电话" prop="chiefDutyPhone">
           <el-input v-model="form.chiefDutyPhone" placeholder="请输入值班首长电话" />
         </el-form-item>
-        <el-form-item label="作战值班员" prop="combatDutyId">
-          <el-select v-model="form.combatDutyId" filterable clearable placeholder="请选择作战值班员">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        <el-form-item label="作战值班员" prop="combatDutyName">
+          <el-select v-model="form.combatDutyId" @change="combatDutyNamefun" filterable clearable placeholder="请选择作战值班员">
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="作战值班员Id" prop="combatDutyId">
@@ -774,7 +774,31 @@ export default {
     //值班分类
     caoZuoTypefun(){
        this.getList();
+    },
+    //首长电话
+    chiefDutyNamefun(val){
+        this.form.chiefDutyId=val.id;
+        this.form.chiefDutyName=val.name;
+        this.form.chiefDutyPhone=val.phone;
+    },
+    //作战值班电话
+    combatDutyNamefun(val){
+        this.form.combatDutyId=val.id;
+        this.form.combatDutyName=val.name;
+        this.form.combatDutyPhone=val.phone;
     }
+    //首长电话
+    // chiefDutyNamefun(val){
+    //     this.form.chiefDutyId=val.id;
+    //     this.form.chiefDutyName=val.name;
+    //     this.form.chiefDutyPhone=val.phone;
+    // }
+    // //首长电话
+    // chiefDutyNamefun(val){
+    //     this.form.chiefDutyId=val.id;
+    //     this.form.chiefDutyName=val.name;
+    //     this.form.chiefDutyPhone=val.phone;
+    // }
   }
 };
 </script>

src/views/pt.vue

@@ -116,8 +116,8 @@
               </div>
             </li>
             <li>
-              <div class="demo active"  v-on:click="gongju" data-url="/diary?ref=addtabs">
-                <img src="../images/星星@2x.png" alt="" />
+              <div class="demo active" v-on:click="gongju" data-url="/diary?ref=addtabs">
+                <img src="../images/xt.png" alt />
                 <br />
                 <a href="#" class="a">系统工具</a>
               </div>
@@ -319,7 +319,12 @@ export default {
       this.$router
         .push({ path: "/index", query: { name: "/system" } })
         .catch(() => {});
-    }
+    },
+    gongju() {
+      this.$router
+        .push({ path: "/index", query: { name: "/tool" } })
+        .catch(() => {});
+    },
   }
 };
 </script>