双相bug修改

web/三相/public/i18n/i18n_deguo.js

@@ -473,6 +473,7 @@ const i18n_deguo= {
   "tel":"Telefonnummer:",
   "ztts":"Push-Benachrichtigungen pausieren",
   "zttsts":"Die Änderung erfordert die Auswahl der Option Pause Push",
-  "shuangx":"zweiphasig"
+  "shuangx":"zweiphasig",
+  "dxts":"SMS Push"
 
 }

web/三相/public/i18n/i18n_eguo.js

@@ -474,5 +474,6 @@ const i18n_eguo={
   "tel":"Номер телефона",
   "ztts":"Приостановить толкание",
   "zttsts":"Изменения необходимо отменить",
-  "shuangx":"Двойная фаза"
+  "shuangx":"Двойная фаза",
+  "dxts":"Сообщение push"
 }

web/三相/public/i18n/i18n_faguo.js

@@ -473,8 +473,8 @@ const i18n_faguo={
   "tel":"Numéro de téléphone",
   "ztts":"Suspendre le push",
   "zttsts":"Modification à cocher pause push",
-  "shuangx":"Duplex"
-
+  "shuangx":"Duplex",
+  "dxts":"SMS push"
 
 
 }

web/三相/public/i18n/i18n_putaoya.js

@@ -473,7 +473,8 @@ const i18n_putaoya={
   "tel":"Número de telefone:",
   "ztts":"Pausa o empurramento",
   "zttsts":"A modificação requer a seleção da opção 'Pause Push'",
- "shuangx":"bifásico"
+ "shuangx":"bifásico",
+  "dxts":"Push SMS"
 
 
 

web/三相/public/i18n/i18n_riben.js

@@ -474,7 +474,8 @@ const i18n_riben={
   "ztts":"プッシュの一時停止",
 
   "zttsts":"プッシュの一時停止をチェックする必要がある修正",
-  "shuangx":"にそう"
+  "shuangx":"にそう",
+  "dxts":"メールプッシュ"
 
 
 

web/三相/public/i18n/i18n_xibanya.js

@@ -474,7 +474,8 @@ const i18n_xibanya={
   "ztts":"Suspensión de empuje",
 
   "zttsts":"Modificación debe marcar para suspender el empuje",
-  "shuangx":"Bifásico"
+  "shuangx":"Bifásico",
+  "dxts":"SMS Push"
 
 
 

web/三相/public/i18n/i18n_yidali.js

@@ -473,7 +473,8 @@ const i18n_yidali={
   "tel":"Numero di telefono:",
   "ztts":"Metti in pausa le notifiche push",
   "zttsts":"La modifica richiede la selezione dell'opzione Pausa Push",
-  "shuangx":"bifase"
+  "shuangx":"bifase",
+  "dxts":"Invio SMS"
 
 
 

web/三相/public/i18n/i18n_yingguo.js

@@ -473,5 +473,6 @@ const i18n_yingguo={
   "tel":"phone number",
   "ztts":"Pause push notifications",
   "zttsts":"Modification requires selecting 'Pause Push' option",
-  "shuangx":"two-phase"
+  "shuangx":"two-phase",
+  "dxts":"SMS push"
 }

web/三相/public/i18n/i18n_zh_CN.js

@@ -473,7 +473,8 @@ const i18n_zh_CN = {
   "tel":"电话号码",
   "ztts":"暂停推送",
   "zttsts":"修改需勾选暂停推送",
-  "shuangx":"双相"
+  "shuangx":"双相",
+  "dxts":"短信推送"
 
 
 

web/三相/src/layout/components/Navbar.vue

@@ -325,6 +325,18 @@ export default {
           return false
         }
 
+        //MQTT状态推送
+        if (result.type === 'mqttStatus') {
+          that.$bus.$emit('MQTT_STATUS', result)
+          return false
+        }
+
+        //DS状态推送
+        if (result.type === 'dsStatus') {
+          that.$bus.$emit('DS_STATUS', result)
+          return false
+        }
+
 
 
       }

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

@@ -91,7 +91,7 @@
 
          <el-card  style="min-height: 700px ;border-radius: 15px;margin-left: 10px">
            <el-button type="primary"  style="background-color: #656B8B" icon="el-icon-delete" size="mini" @click="handleDelete">{{$t('sc')}}</el-button>
-           <el-table min-height="700px" @selection-change="handleSelectionChange" :data="dsList" style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
+           <el-table min-height="700px"   ref="multipleTable"  @selection-change="handleSelectionChange" :data="dsList" style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
              <el-table-column type="selection" width="55" align="center" />
              <el-table-column :label="this.$t('sbmc')" prop="productChName" :min-width="getStringWidth($t('sbmc'))" :show-overflow-tooltip="true"/>
              <el-table-column label="通道id" v-if="false" prop="productChId" width="130" />
@@ -102,11 +102,12 @@
                <template slot-scope="scope">
                  <span>{{getDity(scope.row,'setStatus',"1")}}</span>
                </template>
+
              </el-table-column>
              <el-table-column :label="this.$t('cf')"  :min-width="getStringWidth($t('cf'))" prop="triggerStatus" :show-overflow-tooltip="true">
                <template slot-scope="scope">
                  <span v-if="scope.row.triggerStatus=='1'" style="color: green">{{getDity(scope.row,'triggerStatus',"1")}}</span>
-                 <span  v-else>{{getDity(scope.row,'triggerStatus',"1")}}</span>
+                 <span  v-else style="color: red">{{getDity(scope.row,'triggerStatus',"1")}}</span>
                </template>
              </el-table-column>
            </el-table>
@@ -233,14 +234,47 @@
             { required: true, message: this.$i18n.t('sj')+" "+this.$i18n.t('bnwk'), trigger: "blur" }
           ],
         },
+        selectList:[],
       };
     },
+    mounted() {
+      //监听websocket消息
+      this.$bus.$on('DS_STATUS', this.onSocketMessageToDsStatus);
+    },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
       this.queryProductList();
      //this.handleQuery();
+      //  this.dataRefreh();
     },
     methods: {
+      dataRefreh(){
+        // 计时器为空，操作
+        setInterval(() => {
+          this.getChannelDsList();
+
+      }, 3000);
+      },
+      /** 单击选中行数据 */
+      clickRow(row) {
+        this.$refs.multipleTable.toggleRowSelection(row);
+      },
+
+      onSocketMessageToDsStatus(recvMessage) {
+        if (recvMessage.success && recvMessage.data!=null && recvMessage.data.data!='' && recvMessage.data.data!=null) {
+          if(recvMessage.data!=null  ){
+            let data = recvMessage.data.data;
+            for (let i = 0; i < data.length; i++) {
+              for (let j = 0; j < this.dsList.length; j++) {
+                if (data[i].idx == this.dsList[j].idx) {
+                  this.$set(this.dsList[j], "triggerStatus", data[i].triggerStatus);
+                  break;
+                }
+              }
+            }
+          }
+        }
+      },
       getStringWidth(text) {
         //console.log('text', text)
         const font = '14px Arial'
@@ -268,9 +302,13 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
+
         this.ids = selection.map(item => item.idx)
         this.single = selection.length!=1
         this.multiple = !selection.length
+        selection.map(item => {
+          this.selectList.push(item)
+        })
       },
       showText() {
         this.show = true;
@@ -282,7 +320,7 @@
        // console.log(this.queryParams)
         serviceManagement(this.queryParams).then(response => {
           if(response.data!=null){
-          this.dsList= response.data;
+              this.dsList= response.data;
           this.queryParams.type="listRlQuery";
           serviceManagement(this.queryParams).then(response => {
             if(response.data!=null){
@@ -316,7 +354,7 @@
         channelStatusMonitoring(this.queryParams).then(response => {
 
         if(response.data!=null) {
-          if (this.productType == '3') { //三项
+          if (this.productType == '3' || this.productType == '6') { //三项
             const list = [];
             for (var i = 0; i < response.data.length; i++) {
               var aa = response.data[i];

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

@@ -181,12 +181,24 @@
         }
       };
     },
+    mounted() {
+      //监听websocket消息
+      this.$bus.$on('MQTT_STATUS', this.onSocketMessageToMqttStatus);
+    },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
       this.handleQuery();
       this.queryChannelStatus2(); // 查询状态
     },
     methods: {
+      onSocketMessageToMqttStatus(recvMessage) {
+        if (recvMessage.success && recvMessage.data!=null && recvMessage.data.data!='' && recvMessage.data.data!=null) {
+          if(recvMessage.data!=null  ){
+            this.channelList = recvMessage.data.data;
+            this.total= recvMessage.data.data.length;
+          }
+        }
+      },
       beforeAvatarUpload(file) {
         if(file==null){
           this.$modal.msgSuccess(this.$t('zxcg'));

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

@@ -54,9 +54,7 @@
                         <el-form-item
                           :prop="'dateRange.' + row.idx + '.receiveAccount'"
                           class="form-item"
-                          :rules="[
-                  { required: true, message: $t('qsr'), trigger: 'change' },
-                ]"
+
                         >
                           <!-- :min="info.appointmentMin" -->
                           <el-input v-model="row.receiveAccount" style="width: 100%" controls-position="right"  ></el-input>
@@ -229,6 +227,13 @@
               params.server=null;
               params.port=null;
             }
+            if(params.receiveAccountList.length==1){
+              this.form.dateRange.forEach((item, index) => {
+               if(item.receiveAccount==""){
+                params.receiveAccountList=null;
+               }
+            })
+            }
             var aa=this
             this.$modal.confirm(this.$t('qdybcm')).then(function() {
               serviceManagement(params).then(response => {

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

@@ -60,7 +60,7 @@
                   type="text"
                   @click="handleUpdate(scope.row)"
                 >{{$t('pz')}}</el-button>
-                <el-dropdown  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'" 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>
@@ -71,12 +71,15 @@
                   v-if="scope.row.productChStatus == '0' && scope.row.dyType == '1'"
                   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'"
                   size="mini"
                   type="text"
+                  :disabled="scope.row.sfyxcz=='1'"
+
                   @click="handleCommand('channelclose',scope.row)"
                 >{{$t('gb')}}</el-button>
               </template>
@@ -622,8 +625,8 @@
           if(!regex.test(this.form1.voltageUpperValue)){
             this.form1.voltageUpperValue=null
             return;
-          }else if(this.form1.voltageUpperValue>99999){
-            this.form1.voltageUpperValue=99999
+          }else if(this.form1.voltageUpperValue>999999){
+            this.form1.voltageUpperValue=999999
           }
           let voltageUpperValue=this.form1.voltageUpperValue; // 上限
           let voltageDownValue=this.form1.voltageDownValue; // 下限
@@ -635,8 +638,8 @@
           if(!regex.test(this.form1.voltageDownValue)){
             this.form1.voltageDownValue=null
             return;
-          }else if(this.form1.voltageDownValue>99999){
-            this.form1.voltageDownValue=99999
+          }else if(this.form1.voltageDownValue>999999){
+            this.form1.voltageDownValue=999999
 
           }
           let voltageUpperValue=this.form1.voltageUpperValue;
@@ -649,8 +652,8 @@
           if(!regex.test(this.sensorStatusForm.thresholdDownValue)){
             this.sensorStatusForm.thresholdDownValue=null
             return;
-          }else if(this.sensorStatusForm.thresholdDownValue>99999){
-            this.sensorStatusForm.thresholdDownValue=99999
+          }else if(this.sensorStatusForm.thresholdDownValue>999999){
+            this.sensorStatusForm.thresholdDownValue=999999
           }
           var thresholdDownValue=this.sensorStatusForm.thresholdDownValue; //小
           var thresholdUpperValue=this.sensorStatusForm.thresholdUpperValue; //大
@@ -662,8 +665,8 @@
           if(!regex.test(this.sensorStatusForm.thresholdUpperValue)){
             this.sensorStatusForm.thresholdUpperValue=null
             return;
-          }else if(this.sensorStatusForm.thresholdUpperValue>99999){
-            this.sensorStatusForm.thresholdUpperValue=99999
+          }else if(this.sensorStatusForm.thresholdUpperValue>999999){
+            this.sensorStatusForm.thresholdUpperValue=999999
           }
           var thresholdDownValue=this.sensorStatusForm.thresholdDownValue; //小
           var thresholdUpperValue=this.sensorStatusForm.thresholdUpperValue; //大
@@ -675,8 +678,8 @@
           if(!regex.test(this.form1.currentUpperValue)){
             this.form1.currentUpperValue=null
             return;
-          }else if(this.form1.currentUpperValue>99999){
-            this.form1.currentUpperValue=99999
+          }else if(this.form1.currentUpperValue>999999){
+            this.form1.currentUpperValue=999999
             return;
           }
 
@@ -684,16 +687,16 @@
           if(!regex.test(this.form1.powerUpperValue)){
             this.form1.powerUpperValue=null
             return;
-          }else if(this.form1.powerUpperValue>99999){
-            this.form1.powerUpperValue=99999
+          }else if(this.form1.powerUpperValue>999999){
+            this.form1.powerUpperValue=999999
             return;
           }
         }else if(type=='hdlsxz'){ // 耗电量
           if(!regex.test(this.form1.alarmContentUpperValue)){
             this.form1.alarmContentUpperValue=null
             return;
-          }else if(this.form1.alarmContentUpperValue>99999){
-            this.form1.alarmContentUpperValue=99999
+          }else if(this.form1.alarmContentUpperValue>999999){
+            this.form1.alarmContentUpperValue=999999
             return;
           }
 
@@ -707,8 +710,8 @@
           if(!regex.test(this.form.voltageUpperValue)){
             this.form.voltageUpperValue=null
             return;
-          }else if(this.form.voltageUpperValue>99999){
-            this.form.voltageUpperValue=99999
+          }else if(this.form.voltageUpperValue>999999){
+            this.form.voltageUpperValue=999999
           }
          let voltageUpperValue=this.form.voltageUpperValue; // 上限
           let voltageDownValue=this.form.voltageDownValue; // 下限
@@ -720,8 +723,8 @@
           if(!regex.test(this.form.voltageDownValue)){
             this.form.voltageDownValue=null
             return;
-          }else if(this.form.voltageDownValue>99999){
-            this.form.voltageDownValue=99999
+          }else if(this.form.voltageDownValue>999999){
+            this.form.voltageDownValue=999999
 
           }
           let voltageUpperValue=this.form.voltageUpperValue;
@@ -734,8 +737,8 @@
           if(!regex.test(this.sensorStatusForm.thresholdDownValue)){
             this.sensorStatusForm.thresholdDownValue=null
             return;
-          }else if(this.sensorStatusForm.thresholdDownValue>99999){
-            this.sensorStatusForm.thresholdDownValue=99999
+          }else if(this.sensorStatusForm.thresholdDownValue>999999){
+            this.sensorStatusForm.thresholdDownValue=999999
           }
           var thresholdDownValue=this.sensorStatusForm.thresholdDownValue; //小
           var thresholdUpperValue=this.sensorStatusForm.thresholdUpperValue; //大
@@ -747,8 +750,8 @@
           if(!regex.test(this.sensorStatusForm.thresholdUpperValue)){
             this.sensorStatusForm.thresholdUpperValue=null
             return;
-          }else if(this.sensorStatusForm.thresholdUpperValue>99999){
-            this.sensorStatusForm.thresholdUpperValue=99999
+          }else if(this.sensorStatusForm.thresholdUpperValue>999999){
+            this.sensorStatusForm.thresholdUpperValue=999999
           }
           var thresholdDownValue=this.sensorStatusForm.thresholdDownValue; //小
           var thresholdUpperValue=this.sensorStatusForm.thresholdUpperValue; //大
@@ -760,8 +763,8 @@
           if(!regex.test(this.form.currentUpperValue)){
             this.form.currentUpperValue=null
             return;
-          }else if(this.form.currentUpperValue>99999){
-            this.form.currentUpperValue=99999
+          }else if(this.form.currentUpperValue>999999){
+            this.form.currentUpperValue=999999
             return;
           }
 
@@ -769,16 +772,16 @@
           if(!regex.test(this.form.powerUpperValue)){
             this.form.powerUpperValue=null
             return;
-          }else if(this.form.powerUpperValue>99999){
-            this.form.powerUpperValue=99999
+          }else if(this.form.powerUpperValue>999999){
+            this.form.powerUpperValue=999999
             return;
           }
         }else if(type=='hdlsxz'){ // 耗电量
           if(!regex.test(this.form.alarmContentUpperValue)){
             this.form.alarmContentUpperValue=null
             return;
-          }else if(this.form.alarmContentUpperValue>99999){
-            this.form.alarmContentUpperValue=99999
+          }else if(this.form.alarmContentUpperValue>999999){
+            this.form.alarmContentUpperValue=999999
             return;
           }
 

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

@@ -62,60 +62,64 @@
       <el-table-column :label="this.$t('glys')"  v-if="this.productType!='1'" key="14"  :min-width="getStringWidth(this.$t('glys'))" align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
       <el-table-column  v-if="this.productParams.jkfs==='2'"  key="115"  :label="this.$t('kqys')+'(S)'" :min-width="getStringWidth(this.$t('kqys')+'(S)')"    prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
       <el-table-column   v-if="this.productParams.jkfs==='2'"  key="116" :label="this.$t('gbys')+'(S)'"  :min-width="getStringWidth(this.$t('gbys')+'(S)')"    align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
-      <el-table-column fixed="right"  :label="this.$t('lxzt')" key="17" v-if="this.productParams.lxkz=='1'"   :min-width="getStringWidth(this.$t('lxzt'))"  align="center" prop="productChZeroStatus" >
+      <el-table-column  fixed="right" :label="this.$t('zt')"  key="17" v-if="this.productParams.jkfs==='2'"   width="100" align="center" prop="productChStatus" >
         <template slot-scope="scope">
-          <span v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
-          <span v-else-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
-          <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
+          <span v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
+          <span v-else-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
+          <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
           <!--<span v-else style="color: green">{{getDity1y1(scope.row,'productChStatus', scope.$index)}}</span>-->
         </template>
       </el-table-column>
-      <el-table-column  fixed="right"  :label="this.$t('lxcz')" key="18" v-if="this.productParams.lxkz=='1'" align="center" :min-width="getStringWidth(this.$t('lxcz'))"  class-name="small-padding fixed-width">
-        <template slot-scope="scope" >
+      <el-table-column  fixed="right" :label="this.$t('cz')" key="18" v-if="this.productParams.jkfs==='2'"   align="center" :min-width="getStringWidth(this.$t('cz'))"  class-name="small-padding fixed-width">
+        <template slot-scope="scope"  >
           <el-button
-            v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'"
+            v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'"
             size="mini"
             type="text"
+            :disabled="scope.row.sfyxcz=='1'"
             icon="el-icon-refresh"
-            @click="handleCommand2('channelopen',scope.row)"
+            @click="handleCommand('channelopen',scope.row)"
           >{{$t('dk')}}</el-button>
           <el-button
-            v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
+            v-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'"
             size="mini"
+            :disabled="scope.row.sfyxcz=='1'"
             type="text"
             icon="el-icon-refresh"
-            @click="handleCommand2('channelclose',scope.row)"
+            @click="handleCommand('channelclose',scope.row)"
           >{{$t('gb')}}</el-button>
 
         </template>
       </el-table-column>
-      <el-table-column  fixed="right" :label="this.$t('zt')"  key="19" v-if="this.productParams.jkfs==='2'"   width="100" align="center" prop="productChStatus" >
+      <el-table-column fixed="right"  :label="this.$t('lxzt')" key="19" v-if="this.productParams.lxkz=='1'"   :min-width="getStringWidth(this.$t('lxzt'))"  align="center" prop="productChZeroStatus" >
         <template slot-scope="scope">
-          <span v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
-          <span v-else-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
-          <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
+          <span v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
+          <span v-else-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
+          <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
           <!--<span v-else style="color: green">{{getDity1y1(scope.row,'productChStatus', scope.$index)}}</span>-->
         </template>
       </el-table-column>
-      <el-table-column  fixed="right" :label="this.$t('cz')" key="20" v-if="this.productParams.jkfs==='2'"   align="center" :min-width="getStringWidth(this.$t('cz'))"  class-name="small-padding fixed-width">
-        <template slot-scope="scope" >
+      <el-table-column  fixed="right"  :label="this.$t('lxcz')" key="20" v-if="this.productParams.lxkz=='1'" align="center" :min-width="getStringWidth(this.$t('lxcz'))"  class-name="small-padding fixed-width">
+        <template slot-scope="scope"  >
           <el-button
-            v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'"
+            v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'"
             size="mini"
+
             type="text"
             icon="el-icon-refresh"
-            @click="handleCommand('channelopen',scope.row)"
+            @click="handleCommand2('channelopen',scope.row)"
           >{{$t('dk')}}</el-button>
           <el-button
-            v-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'"
+            v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
             size="mini"
             type="text"
             icon="el-icon-refresh"
-            @click="handleCommand('channelclose',scope.row)"
+            @click="handleCommand2('channelclose',scope.row)"
           >{{$t('gb')}}</el-button>
 
         </template>
       </el-table-column>
+
       <el-table-column  fixed="right" :label="this.$t('sclx')"  key="21" :min-width="getStringWidth(this.$t('sclx'))"      align="center" prop="outputType"  :show-overflow-tooltip="true"  >
         <template slot-scope="scope">
           <span @click="onclickOutType(scope.row, scope.$index)" v-if="scope.row.outputType=='1'" style="color: red;cursor: pointer">{{getDity(scope.row,'outputTypes')}}</span>
@@ -184,6 +188,7 @@
               v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'"
               size="mini"
               type="text"
+              :disabled="scope.row.sfyxcz=='1'"
               icon="el-icon-refresh"
               @click="handleCommand('channelopen',scope.row)"
             >{{$t('dk')}}</el-button>
@@ -191,6 +196,7 @@
               v-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'"
               size="mini"
               type="text"
+              :disabled="scope.row.sfyxcz=='1'"
               icon="el-icon-refresh"
               @click="handleCommand('channelclose',scope.row)"
             >{{$t('gb')}}</el-button>
@@ -289,14 +295,14 @@
               v-if="scope.row.productChStatus == '0'"
               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'"
               size="mini"
               type="text"
-
+              :disabled="scope.row.sfyxcz=='1'"
               @click="handleCommand('channelclose',scope.row)"
             >{{$t('gb')}}</el-button>
 
@@ -374,60 +380,63 @@
         <el-table-column :label="this.$t('glys')"  v-if="this.productType!='1'" key="14"  :min-width="getStringWidth(this.$t('glys'))" align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
         <el-table-column  v-if="this.productParams.jkfs==='2'"  key="115"  :label="this.$t('kqys')+'(S)'" :min-width="getStringWidth(this.$t('kqys')+'(S)')"    prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
         <el-table-column   v-if="this.productParams.jkfs==='2'"  key="116" :label="this.$t('gbys')+'(S)'"  :min-width="getStringWidth(this.$t('gbys')+'(S)')"    align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
-        <el-table-column fixed="right"  :label="this.$t('lxzt')" key="17" v-if="this.productParams.lxkz=='1'"   :min-width="getStringWidth(this.$t('lxzt'))"  align="center" prop="productChZeroStatus" >
+        <el-table-column  fixed="right" :label="this.$t('zt')"  key="17" v-if="this.productParams.jkfs==='2'"   width="100" align="center" prop="productChStatus" >
           <template slot-scope="scope">
-            <span v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
-            <span v-else-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
-            <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
+            <span v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
+            <span v-else-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
+            <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
             <!--<span v-else style="color: green">{{getDity1y1(scope.row,'productChStatus', scope.$index)}}</span>-->
           </template>
         </el-table-column>
-        <el-table-column  fixed="right"  :label="this.$t('lxcz')" key="18" v-if="this.productParams.lxkz=='1'" align="center" :min-width="getStringWidth(this.$t('lxcz'))"  class-name="small-padding fixed-width">
+        <el-table-column  fixed="right" :label="this.$t('cz')" key="18" v-if="this.productParams.jkfs==='2'"   align="center" :min-width="getStringWidth(this.$t('cz'))"  class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
-              v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'"
+              v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'"
               size="mini"
               type="text"
+              :disabled="scope.row.sfyxcz=='1'"
               icon="el-icon-refresh"
-              @click="handleCommand2('channelopen',scope.row)"
+              @click="handleCommand('channelopen',scope.row)"
             >{{$t('dk')}}</el-button>
             <el-button
-              v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
+              v-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'"
               size="mini"
               type="text"
+              :disabled="scope.row.sfyxcz=='1'"
               icon="el-icon-refresh"
-              @click="handleCommand2('channelclose',scope.row)"
+              @click="handleCommand('channelclose',scope.row)"
             >{{$t('gb')}}</el-button>
 
           </template>
         </el-table-column>
-        <el-table-column  fixed="right" :label="this.$t('zt')"  key="19" v-if="this.productParams.jkfs==='2'"   width="100" align="center" prop="productChStatus" >
+        <el-table-column fixed="right"  :label="this.$t('lxzt')" key="19" v-if="this.productParams.lxkz=='1'"   :min-width="getStringWidth(this.$t('lxzt'))"  align="center" prop="productChZeroStatus" >
           <template slot-scope="scope">
-            <span v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
-            <span v-else-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
-            <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChStatus', scope.$index)}}</span>
+            <span v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'" style="color: red">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
+            <span v-else-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'" style="color: green">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
+            <span v-else style="color: #c747b1">{{getDity1(scope.row,'productChZeroStatus', scope.$index)}}</span>
             <!--<span v-else style="color: green">{{getDity1y1(scope.row,'productChStatus', scope.$index)}}</span>-->
           </template>
         </el-table-column>
-        <el-table-column  fixed="right" :label="this.$t('cz')" key="20" v-if="this.productParams.jkfs==='2'"   align="center" :min-width="getStringWidth(this.$t('cz'))"  class-name="small-padding fixed-width">
+        <el-table-column  fixed="right"  :label="this.$t('lxcz')" key="20" v-if="this.productParams.lxkz=='1'" align="center" :min-width="getStringWidth(this.$t('lxcz'))"  class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
-              v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'"
+              v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'"
               size="mini"
               type="text"
               icon="el-icon-refresh"
-              @click="handleCommand('channelopen',scope.row)"
+              @click="handleCommand2('channelopen',scope.row)"
             >{{$t('dk')}}</el-button>
             <el-button
-              v-if="getDity2(scope.row,'productChStatus', scope.$index)=='1'"
+              v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
               size="mini"
               type="text"
               icon="el-icon-refresh"
-              @click="handleCommand('channelclose',scope.row)"
+              @click="handleCommand2('channelclose',scope.row)"
             >{{$t('gb')}}</el-button>
 
           </template>
         </el-table-column>
+
         <el-table-column  fixed="right" :label="this.$t('sclx')"  key="21" :min-width="getStringWidth(this.$t('sclx'))"      align="center" prop="outputType"  :show-overflow-tooltip="true"  >
           <template slot-scope="scope">
             <span @click="onclickOutType(scope.row, scope.$index)" v-if="scope.row.outputType=='1' || scope.row.outputType=='3'" style="color: red;cursor: pointer">{{getDity(scope.row,'outputTypes')}}</span>
@@ -597,6 +606,7 @@
         // 输出状态
         outputStatus:[{"id":"1","name":"sc"},{"id":"2","name":"bsc"}],
 
+
         productType:"",
         disabled2:false,
         disabled3:false,
@@ -1130,7 +1140,7 @@
         params.productId=row.productId;
         switch (command) {
           case "channelopen":
-            params.type="open";
+            params.Zerotype="open";
             this.$modal.confirm(this.$t('qrykqm')).then(function() {
               channelStatusMonitoring(params);
             }).then(() => {
@@ -1140,7 +1150,7 @@
 
         break;
       case "channelclose":
-        params.type="close";
+        params.Zerotype="close";
 
         this.$modal.confirm(this.$t('qrygbm')).then(function() {
           channelStatusMonitoring(params);

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

@@ -342,7 +342,7 @@
         param.productId=this.queryParams.productId;
         channelStatusMonitoring(param).then(response => {
           if(response.data!=null){
-            if(this.productType=='3'){ //三项
+            if(this.productType=='3' || this.productType=='6' ){ //三项
               let list=[];
               for(var i=0;i< response.data.length;i++){
                 var aa=response.data[i];

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

@@ -45,15 +45,15 @@
                 <el-form-item :label="this.$t('IPadress')"  >
                   <el-input :readonly="true" v-model="form3.IPadress"    />
                 </el-form-item>
-                <el-form-item   class="aaa"   :label="this.$t('ztts')"  >
-                  <template #label>
-                    <span>{{$t('ztts')}}   </span>
-                    <el-tooltip class="item" effect="dark" :content="$t('zttsts')" placement="top">
-                      <i class="el-icon-question"></i>
-                    </el-tooltip>
-                  </template>
-                  <input type="checkbox" v-model="isChecked"   />
-                </el-form-item>
+                <!--<el-form-item   class="aaa"   :label="this.$t('ztts')"  >-->
+                  <!--<template #label>-->
+                    <!--<span>{{$t('ztts')}}   </span>-->
+                    <!--<el-tooltip class="item" effect="dark" :content="$t('zttsts')" placement="top">-->
+                      <!--<i class="el-icon-question"></i>-->
+                    <!--</el-tooltip>-->
+                  <!--</template>-->
+                  <!--<input type="checkbox" v-model="isChecked"   />-->
+                <!--</el-form-item>-->
               </el-form>
               <div slot="footer" style="float: right;" class="dialog-footer">
                 <el-button type="primary" @click="submitForm3">{{$t('sz')}}</el-button>
@@ -246,11 +246,11 @@
       //wifi状态
       onSocketMessageToWifiStatus(recvMessage) {
         if (recvMessage.success && recvMessage.data!=null && recvMessage.data.data!='' && recvMessage.data.data!=null) {
-          if(recvMessage.data!=null  && !this.isChecked){
-            this.form3.IPadress=recvMessage.data.data.IPadress;
+          if(recvMessage.data!=null  ){
+            //this.form3.IPadress=recvMessage.data.data.IPadress;
             this.form3.ljzt=recvMessage.data.data.ljzt;
-            this.form3.password=recvMessage.data.data.password;
-            this.form3.ssid=recvMessage.data.data.ssid;
+            // this.form3.password=recvMessage.data.data.password;
+            // this.form3.ssid=recvMessage.data.data.ssid;
           }
           //  this.queryTotalStatus();
         }