Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/page/wel.vue

@@ -342,30 +342,35 @@
         <div style="margin-bottom:10px;" v-if="role!=2">
           <span style="font-weight:bold;font-size: 18px;">待处理</span>
           <div class="page-container">
-             <div class="pagechen" v-if="role==0">
+
+             <div class="pagechen" @click="jumpto('1')" v-if="role==0">
               <div class="pageboxtitle1">30天到期的代理商</div>
               <div class="pageboxtitle3">
                 {{sysTop.matuityOfAgent||0}}
               </div>
             </div>
-            <div class="pagechen">
+
+            <div class="pagechen"  @click="jumpto('2')">
               <div class="pageboxtitle1">30天到期的楼盘</div>
               <div class="pageboxtitle3">
                 {{sysTop.matuityOfHouse||0}}
               </div>
             </div>
-            <div class="pagechen">
+
+            <div class="pagechen"  @click="jumpto('3')">
               <div class="pageboxtitle1">离线设备</div>
               <div class="pageboxtitle3">
                 {{sysTop.offlineEquipmentQUantity||0}}
               </div>
             </div>
-           <div class="pagechen">
+
+           <div class="pagechen"  @click="jumpto('4')">
               <div class="pageboxtitle1">低电量设备</div>
               <div class="pageboxtitle3">
                 {{sysTop.lowElectricityEquipmentQuantity||0}}
               </div>
             </div>
+
            <!-- <div class="pagechen">
               <div class="pageboxtitle1">维修更换设备</div>
               <div class="pageboxtitle3">
@@ -969,6 +974,29 @@ export default {
 
   },
   methods: {
+    jumpto(ind){
+        if(ind==1){
+          this.$router.push({
+            path: "/Customer/AgentManagement",
+            query: { residueTime: 30 },
+          });
+        }else if(ind==2){
+           this.$router.push({
+            path: "/building/index",
+            query: { residueTime: 30 },
+          });
+        }else if(ind==3){
+           this.$router.push({
+            path: "/Equipment/state",
+            query: { flag: 1 },
+          });
+        }else{
+           this.$router.push({
+            path: "/Equipment/state",
+            query: { flag: 2 },
+          });
+        }
+    },
        //切换楼盘
     houseChange() {
         this.TimetoAhoose=0;

src/views/Customer/AgentManagement.vue

@@ -641,6 +641,7 @@ export default {
     this.cus_ag_open = this.permissions["cus_ag_open"];
   },
   mounted() {
+    console.log(this.$route.query.residueTime,'跳转代餐')
     this.getAgentList()
   },
   methods: {

src/views/Equipment/state.vue

@@ -711,6 +711,14 @@ export default {
     this.equ_state_Voice = this.permissions["equ_state_Voice"];
   },
   mounted() {
+   if(this.$route.query.flag){
+    if(this.$route.query.flag==1){
+      this.searchForm.onLine='0'
+    }else{
+      this.searchForm.onLine='1'
+    }
+   }
+    // asd
     this.getTableList();
     // 获取列表
     this.zkhousePage();

src/views/Statistics/TrendAnalysis.vue

@@ -208,7 +208,7 @@
              <template slot-scope="scope">
                <span v-if="scope.row.heji>0"> <i class="el-icon-top" style="color: red;"></i>{{scope.row.heji}}%</span>
                <span v-if="scope.row.heji==0">{{scope.row.heji}}%</span>
-               <span v-if="scope.row.heji<0"> <i class="el-icon-bottom" style="color: 25CEBA;"></i>{{scope.row.heji}}%</span>
+               <span v-if="scope.row.heji<0"> <i class="el-icon-bottom" style="color: #25CEBA;"></i>{{scope.row.heji}}%</span>
              </template>
           </el-table-column>
         </el-table>

src/views/building/index.vue

@@ -797,6 +797,7 @@ export default {
     this.cus_build_index_open = this.permissions["cus_build_index_open"];
   },
   mounted() {
+    console.log(this.$route.query.residueTime,'跳转代餐')
     this.orgType = localStorage.getItem("orgType");
     // 获取公司列表数据
     this.getOrgList();