Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/components/PathReview.vue

@@ -1,6 +1,6 @@
 <template>
     <div style="background-color: #f1f3f5;width:100%">
-        <!-- 画像审核 -->
+        <!-- 路径审核 -->
         <div class="card">
             <div class="cardleft">
                 <div class="title">
@@ -128,10 +128,14 @@
                         <img src="../../../assets/pathReview/bluexinxi.png" alt="" v-else>
                         <span>路径信息</span>
                     </div>
-                    <div class="topbutton" :class="tab == 2 ? 'blue' : ''" @click="getlist">
+                    <div class="topbutton" :class="tab == 2 ? 'blue' : ''" @click="getlist"
+                        :style="tab == 2 ? 'min-width:150px' : ''">
                         <img src="../../../assets/pathReview/blackrenwu.png" alt="" v-if="tab != 2">
                         <img src="../../../assets/pathReview/bluerenwu.png" alt="" v-else>
                         <span>路径任务</span>
+                        <el-switch v-if="tab == 2" v-model="switchvalue" active-color="#1890ff" inactive-color="#DDE0E9"
+                            @change="changeswitch">
+                        </el-switch>
                     </div>
                 </div>
                 <div v-if="tab == 1">
@@ -167,7 +171,8 @@
                         <el-collapse-item title="子路径" name="2">
                             <div v-for="item in informationlist.childRouteList" :key="item.id">
                                 <div class="zljtitle">
-                                    {{ item.routeName }}
+                                    {{ item.routeName }} <span v-if="!informationlist.conditionSatisfyStatus"
+                                        style="color: red">(不符合条件)</span>
                                 </div>
                                 <el-table :data="item.nodeList" style="width: 100%">
                                     <el-table-column prop="" label="" width="160">
@@ -318,6 +323,7 @@ export default {
     components: { questionopennew, Scriptpreview },
     data() {
         return {
+            switchvalue: false,
             baseUrl: process.env.VUE_APP_BASE_API,
             list: {},
             tab: 1,
@@ -328,7 +334,8 @@ export default {
                 nodeList: [],
                 childRouteList: []
             },
-            routelist: undefined,
+            routelist: [],
+            allroutelist: [],
             phoneNodeContent: {
                 scriptInfoId: null,
                 flowScheme: null,
@@ -342,6 +349,13 @@ export default {
         this.info();
     },
     methods: {
+        changeswitch(e) {
+            if (e) {
+                this.routelist = this.allroutelist.filter(item => item.conditionSatisfyStatus);
+            } else {
+                this.routelist = this.allroutelist
+            }
+        },
         info() {
             this.tab = 1
             const loading = this.$loading({
@@ -368,13 +382,12 @@ export default {
                 })
                 this.informationlist = res.data
                 loading.close();
+            }).catch(() => {
+                loading.close();
             })
-                .catch(() => {
-                    loading.close();
-                })
         },
         getlist() {
-            if (!this.routelist) {
+            if (this.routelist.length == 0) {
                 const loading = this.$loading({
                     lock: true,
                     text: '加载中',
@@ -382,6 +395,7 @@ export default {
                     background: 'rgba(255, 255, 255, 0.7)'
                 });
                 getRouteNodeInfo(this.$route.query.signRecordId).then(res => {
+                    this.allroutelist = res.data
                     this.routelist = res.data
                     this.tab = 2
                     loading.close();
@@ -447,8 +461,8 @@ export default {
 .zljtitle {
     font-size: 14px;
     height: 50px;
+    padding-left: 2px;
     line-height: 50px;
-    color: #92A2AB;
     border-bottom: 1px solid #e6ebf5;
 }
 
@@ -616,7 +630,7 @@ export default {
 
             .topbutton {
                 background-color: #DDE0E9;
-                width: 100px;
+                min-width: 100px;
                 height: 34px;
                 display: flex;
                 align-items: center;