web/三相/src/views/index.vue

@@ -632,7 +632,7 @@
       },
       zxtStatics(reData,yName){
         if(reData!=null){
-          if(this.productType=='3' || this.productType=='4'){
+          if(this.productType=='3' || this.productType=='4' || this.productType=='6'){
             const typeDataList=reData.typeData;
             const  series=[];
             const  legendData=[];

web/三相/src/views/jgbh/fzsz/index.vue

@@ -46,7 +46,7 @@
                 <span style="color: red">{{ scope.row.alarmContentUpperValue}}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="this.$t('zt')" prop="productChStatus" :min-width="100"  :show-overflow-tooltip="true" >
+            <el-table-column v-if="this.productParams.jkfs!='1' && this.productParams.jkfs!='3' " :label="this.$t('zt')" prop="productChStatus" :min-width="100"  :show-overflow-tooltip="true" >
               <template slot-scope="scope">
                 <span v-if="scope.row.productChStatus=='0'" style="color: red">{{getDity(scope.row,'productChStatus')}}</span>
                 <span v-else style="color: green">{{getDity(scope.row,'productChStatus')}}</span>
@@ -60,7 +60,7 @@
                   type="text"
                   @click="handleUpdate(scope.row)"
                 >{{$t('pz')}}</el-button>
-                <el-dropdown   :disabled="scope.row.sfyxcz=='1'"  v-if="scope.row.dyType == '0'" style="margin-left:10px" size="mini" @command="(command) => handleAllCommand(command, scope.row)" >
+                <el-dropdown   :disabled="scope.row.sfyxcz=='1'"  v-if="scope.row.dyType == '0' && productParams.jkfs!='1' && productParams.jkfs!='3'" style="margin-left:10px" size="mini" @command="(command) => handleAllCommand(command, scope.row)" >
                   <el-button icon="el-icon-d-arrow-right" size="mini" type="text" style="margin-left: 10px">{{$t('gd')}}</el-button>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item  command="channelopen" style="margin-left: 10px">{{$t('dk')}}</el-dropdown-item>
@@ -68,14 +68,14 @@
                   </el-dropdown-menu>
                 </el-dropdown>
                 <el-button
-                  v-if="scope.row.productChStatus == '0' && scope.row.dyType == '1'"
+                  v-if="scope.row.productChStatus == '0' && scope.row.dyType == '1' && productParams.jkfs!='1' && productParams.jkfs!='3'"
                   size="mini"
                   type="text"
                   :disabled="scope.row.sfyxcz=='1'"
                   @click="handleCommand('channelopen',scope.row)"
                 >{{$t('dk')}}</el-button>
                 <el-button
-                  v-if="scope.row.productChStatus == '1' && scope.row.dyType == '1'"
+                  v-if="scope.row.productChStatus == '1' && scope.row.dyType == '1' && productParams.jkfs!='1' && productParams.jkfs!='3'"
                   size="mini"
                   type="text"
                   :disabled="scope.row.sfyxcz=='1'"
@@ -453,7 +453,8 @@
         dialogwidth:'710px',
         channelList:[],
         disabled1:false,
-        disabled2:false
+        disabled2:false,
+        productParams:{}
       };
     },
     mounted() {
@@ -469,6 +470,12 @@
       this.cookieslanguage = Cookies.get("flowinnIotLanguage");
       if(this.cookieslanguage =='zh-CN'){
         this.dialogwidth='600px';
+      };
+      this.productParams= this.$store.state.user.productParams;
+      //监控方式:1-总检测	2-分监分控	3-分监不控
+      var jkfs=this.productParams.jkfs;
+      if(jkfs=='1' || jkfs=='3'){
+        this.dzs=[{"id":"2","name":"jbj"}]
       }
     },
 

web/三相/src/views/power/channelstatus/index.vue

@@ -654,9 +654,11 @@
 
       },
       onclickOutType(row,index){
+        console.log(row)
         this.outForm =JSON.parse(JSON.stringify(row));
         this.outTitle = this.$t('pz');
         var productPhOrders3=[];
+        this.productPhOrders2=this.productPhOrders;
         if(this.productType=='6'){
           for(var i=index;i<=index+1;i++){
             const obj=this.channelList[i];
@@ -706,7 +708,9 @@
           this.outForm.productPhOrder=productPhOrder;
         }
 
-
+        if(this.productType=='4'  ){
+          this.disabled3=true;
+        }
 
 
         this.outOpen=true;

web/三相/src/views/txgl/fourgsz/index.vue

@@ -35,6 +35,13 @@
                 <el-form-item    :label="this.$t('tel')" prop="tel">
                   <el-input :readonly="true" v-model="form3.tel"   />
                 </el-form-item>
+                <el-form-item     :label="'IPv4'+this.$t('dz')" prop="ipFourAddress">
+                  <el-input :readonly="true" v-model="form3.ipFourAddress"   />
+                </el-form-item>
+                <el-form-item   :label="'IPv6 '+this.$t('dz')" prop="ipSixAddress">
+                  <el-input  :readonly="true" v-model="form3.ipSixAddress"   />
+                </el-form-item>
+
                 <!--<el-form-item  class="aaa"   :label="this.$t('ztts')"  >-->
                   <!--<template #label>-->
                     <!--<span>{{$t('ztts')}}   </span>-->
@@ -182,6 +189,8 @@
             this.form3.ljzt=recvMessage.data.data.ljzt;
            this.form3.xhqd=recvMessage.data.data.xhqd;
             this.form3.yys=recvMessage.data.data.yys;
+            this.form3.ipFourAddress=recvMessage.data.data.ipFourAddress;
+            this.form3.ipSixAddress=recvMessage.data.data.ipSixAddress;
             this.form3.tel=recvMessage.data.data.tel;
           }
           //  this.queryTotalStatus();
@@ -385,6 +394,8 @@
             params.token=this.usertoken;
             params.type="fourgPZSave";
             params.czmode=this.form3.czmode;
+            params.ipFourAddress=this.form3.ipFourAddress;
+            params.ipSixAddress=this.form3.ipSixAddress;
             if(params.receiveAccountList.length==1){
               this.form3.dateRange.forEach((item, index) => {
                 if(item.receiveAccount==""){