三相安德森ip合并

web/三相/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-
+import { equipmentMintenance } from '@/api/pdu/pduServer'
 const user = {
   state: {
     token: getToken(),
@@ -11,7 +11,8 @@ const user = {
     avatar: '',
     roles: [],
     permissions: [],
-    postIds:[]
+    postIds:[],
+    productParams:{}
   },
 
   mutations: {
@@ -40,6 +41,9 @@ const user = {
     },
 SET_POSTIDS: (state, postIds) => {
   state.postIds = postIds
+},
+SET_PRODUCTPARAMS: (state, productParams) => {
+  state.productParams = productParams
 }
   },
 
@@ -79,6 +83,17 @@ SET_POSTIDS: (state, postIds) => {
           commit('SET_AVATAR', avatar)
           commit('SET_LOGOName', user.nickName)
           commit('SET_POSTIDS', user.postIds)
+          const params={};
+          params.token= user.token;
+          params.type=  "listSbRestartQuery";
+          equipmentMintenance(params).then(response => {
+            if(response.data!=null){
+            commit('SET_PRODUCTPARAMS',response.data[0])
+
+          }
+        }).catch(error => {
+            reject(error)
+      })
           resolve(res)
         }).catch(error => {
           reject(error)
@@ -100,6 +115,20 @@ SET_POSTIDS: (state, postIds) => {
         })
       })
     },
+    // 获取设备配置信息
+    getEquipmentMintenance({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params={};
+      params.type= "listSbRestartQuery";
+      equipmentMintenance(params).then(response => {
+        if(response.data!=null){
+        commit('SET_PRODUCTPARAMS',response.data[0])
+      }
+    }).catch(error => {
+        reject(error)
+      })
+    })
+    },
 
     // 前端 登出
     FedLogOut({ commit }) {

web/三相/src/utils/i18n/i18n-en-US.json

@@ -445,7 +445,17 @@
   "kzbgj":"Control board firmware",
   "qxzgj":"Please select firmware",
   "qxzkzb":"Please select the control board that needs to be upgraded",
-  "qrsjts":"Are you sure you want to upgrade？"
+  "qrsjts":"Are you sure you want to upgrade？",
+  "lxzt":"Zero status",
+  "hxcz":"Frontline operation",
+  "lxcz":"Zero operation",
+  "MACadress":"MAC address",
+  "IPadress":"IP address",
+  "sjcg":"Upgrade successful",
+  "sjsb":"Upgrade failed",
+  "shewm":"After sales QR code",
+  "sbewm":"Device QR code",
+  "cpbh":"Product Code"
 
 
 }

web/三相/src/utils/i18n/i18n-ru-RU.json

@@ -446,6 +446,16 @@
   "kzbgj":"прошивка панели управления",
   "qxzgj":"Выберите прошивку",
   "qxzkzb":"Выберите контрольную панель для обновления",
-  "qrsjts":"Вы уверены, что хотите повышения？"
+  "qrsjts":"Вы уверены, что хотите повышения？",
+  "lxzt":"Состояние нулевой линии",
+  "hxcz":"Операция FireWire",
+  "lxcz":"Операция с нулевой линией",
+  "MACadress":"MAC Адрес",
+  "IPadress":"IP - адрес",
+  "sjcg":"Обновление успешно",
+  "sjsb":"Ошибка обновления",
+  "shewm":"Двухмерный код после продажи",
+  "sbewm":"QR - код устройства",
+  "cpbh":"Номер продукта"
 
 }

web/三相/src/utils/i18n/i18n-zh-CN.json

@@ -445,8 +445,17 @@
   "kzbgj":"控制板固件",
   "qxzgj":"请选择固件",
   "qxzkzb":"请选择需要升级的控制板",
-  "qrsjts":"确认要升级吗？"
-
+  "qrsjts":"确认要升级吗？",
+  "lxzt":"零线状态",
+  "hxcz":"火线操作",
+  "lxcz":"零线操作",
+  "MACadress":"MAC地址",
+  "IPadress":"IP地址",
+  "sjcg":"升级成功",
+  "sjsb":"升级失败",
+  "shewm":"售后二维码",
+  "sbewm":"设备二维码",
+  "cpbh":"产品编号"
 
 
 

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

@@ -199,20 +199,22 @@
               params.snmpVersion="";
               params.trapMode="";
             }
-
-            if(this.form.yhm!=undefined && (this.form.yhm.length>32 || this.form.yhm.length<8) ){
-              alert(this.$t("snmpbcxz1"));
-              return;
-            }
-            if(this.form.rzmm!=undefined && (this.form.rzmm.length>32 || this.form.rzmm.length<8) ){
-              alert(this.$t("snmpbcxz2"));
-                  return;
-            }
-            if(this.form.jmmm!=undefined && (this.form.jmmm.length>32 || this.form.jmmm.length<8) ){
-              alert(this.$t("snmpbcxz3"));
-                  return;
+            if(this.form.snmpVersion=="SNMP V3"){
+              if(this.form.snmpVersion=="SNMP V3" && this.form.yhm!=undefined && (this.form.yhm.length>32 || this.form.yhm.length<8) ){
+                this.$modal.alertWarning(this.$t("snmpbcxz1"));
+                return;
+              }
+              if(this.form.snmpVersion=="SNMP V3" &&  this.form.rzmm!=undefined && (this.form.rzmm.length>32 || this.form.rzmm.length<8) ){
+                this.$modal.alertWarning(this.$t("snmpbcxz2"));
+                return;
+              }
+              if(this.form.snmpVersion=="SNMP V3" && this.form.jmmm!=undefined && (this.form.jmmm.length>32 || this.form.jmmm.length<8) ){
+                this.$modal.alertWarning(this.$t("snmpbcxz3"));
+                return;
+              }
             }
 
+
             this.$modal.confirm(this.$t('qdybcm')).then(function() {
               serviceManagement(params).then(() => {
                 aa.$modal.msgSuccess(aa.$t('zxcg'));

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

@@ -166,7 +166,6 @@
     this.loginForm.type='userLogin';
   },
   methods: {
-
       // 获取系统配置
     systemConfiguration(){
       setTimeout(() => {

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

@@ -17,8 +17,8 @@
 
       </el-form-item>
       <el-form-item  style="position: absolute;right: 0%;margin-right: 5%;">
-        <el-button type="primary"  size="mini" @click="handleZtCommand('open', queryParams.productId)">{{$t('zk')}}</el-button>
-        <el-button type="primary"  style=";background-color: #656B8B" size="mini" @click="handleZtCommand('close', queryParams.productId)">{{$t('zg')}}</el-button>
+        <el-button type="primary" v-if="this.productParams.jkfs=='2'" size="mini" @click="handleZtCommand('open', queryParams.productId)">{{$t('zk')}}</el-button>
+        <el-button type="primary" v-if="this.productParams.jkfs=='2'" style=";background-color: #656B8B" size="mini" @click="handleZtCommand('close', queryParams.productId)">{{$t('zg')}}</el-button>
         <!--<el-dropdown style="margin-left:10px;"  size="mini" @command="(command) => handleZtCommand(command, this.queryParams.productId)" >-->
           <!--<el-button type='primary' size="mini"  style="margin-left: 10px;margin-top: 10px;width: 80px;background-color: #656B8B">{{$t('shib')}}{{$t('cz')}}<i class="el-icon-caret-bottom" /></el-button>-->
           <!--<el-dropdown-menu slot="dropdown">-->
@@ -37,6 +37,8 @@
       <el-table-column label="设备id" v-if="false" prop="productId"   />
       <el-table-column fixed  :label="this.$t('tdmc')" :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
       <el-table-column fixed  :label="this.$t('tdh')" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
+      <el-table-column  align="center" v-if="this.productParams.dwkjk=='1'"  :label="this.$t('MACadress')" :min-width="getStringWidth(this.$t('MACadress'))+50"  prop="MACadress" :show-overflow-tooltip="true"   />
+      <el-table-column align="center"  v-if="this.productParams.dwkjk=='1'"  :label="this.$t('IPadress')" :min-width="getStringWidth(this.$t('IPadress'))+50"  prop="IPadress" :show-overflow-tooltip="true"   />
 
       <el-table-column :label="this.$t('sxxx')" :min-width="getStringWidth(this.$t('sxxx'))"  prop="productPhOrder" :show-overflow-tooltip="true"   >
         <template slot-scope="scope">
@@ -58,9 +60,36 @@
       <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'" :min-width="getStringWidth(this.$t('pl'))"  align="center" prop="productChPowerFreq"  :show-overflow-tooltip="true"/>
       <el-table-column :label="this.$t('hdl')+'(kWh)'" :min-width="getStringWidth(this.$t('hdl')+'(kWh)')" align="center" prop="productChConsumption" :show-overflow-tooltip="true" />
       <el-table-column :label="this.$t('glys')"  v-if="this.productType!='1'"  :min-width="getStringWidth(this.$t('glys'))" align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
-      <el-table-column :label="this.$t('kqys')+'(S)'" :min-width="getStringWidth(this.$t('kqys')+'(S)')"  sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
-      <el-table-column :label="this.$t('gbys')+'(S)'"  :min-width="getStringWidth(this.$t('gbys')+'(S)')"   sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
-      <el-table-column  fixed="right" :label="this.$t('zt')" width="100" align="center" prop="productChStatus" >
+      <el-table-column  v-if="this.productParams.jkfs=='2'"    :label="this.$t('kqys')+'(S)'" :min-width="getStringWidth(this.$t('kqys')+'(S)')"  sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
+      <el-table-column   v-if="this.productParams.jkfs=='2'"   :label="this.$t('gbys')+'(S)'"  :min-width="getStringWidth(this.$t('gbys')+'(S)')"   sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
+      <el-table-column fixed="right"  :label="this.$t('lxzt')" 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,'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('lxcz')" 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,'productChZeroStatus', scope.$index)=='0'"
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="handleCommand2('channelopen',scope.row)"
+          >{{$t('dk')}}</el-button>
+          <el-button
+            v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="handleCommand2('channelclose',scope.row)"
+          >{{$t('gb')}}</el-button>
+
+        </template>
+      </el-table-column>
+      <el-table-column  fixed="right" :label="this.$t('zt')" v-if="this.productParams.jkfs=='2'"   width="100" align="center" prop="productChStatus" >
         <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>
@@ -68,7 +97,7 @@
           <!--<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')" align="center" :min-width="getStringWidth(this.$t('cz'))"  class-name="small-padding fixed-width">
+      <el-table-column  fixed="right" :label="this.$t('cz')" 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,'productChStatus', scope.$index)=='0'"
@@ -94,7 +123,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column fixed="right" :label="this.$t('pz')" align="center" width="100" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" :label="this.$t('pz')" v-if="this.productParams.jkfs=='2'"    align="center" width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
           <el-button
             size="mini"
@@ -115,6 +144,8 @@
         <el-table-column label="设备id" v-if="false" prop="productId"   />
         <el-table-column fixed  :label="this.$t('tdmc')" :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
         <el-table-column fixed  :label="this.$t('tdh')" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
+        <el-table-column  align="center" v-if="this.productParams.dwkjk=='1'"  :label="this.$t('MACadress')" :min-width="getStringWidth(this.$t('MACadress'))+50"  prop="MACadress" :show-overflow-tooltip="true"   />
+        <el-table-column align="center"  v-if="this.productParams.dwkjk=='1'"  :label="this.$t('IPadress')" :min-width="getStringWidth(this.$t('IPadress'))+50"  prop="IPadress" :show-overflow-tooltip="true"   />
 
         <el-table-column :label="this.$t('sxxx')" :min-width="getStringWidth(this.$t('sxxx'))"  prop="productPhOrder" :show-overflow-tooltip="true"   >
           <template slot-scope="scope">
@@ -137,9 +168,9 @@
         <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'" :min-width="getStringWidth(this.$t('pl'))"  align="center" prop="productChPowerFreq"  :show-overflow-tooltip="true"/>
         <el-table-column :label="this.$t('hdl')+'(kWh)'" :min-width="getStringWidth(this.$t('hdl')+'(kWh)')" align="center" prop="productChConsumption" :show-overflow-tooltip="true" />
         <el-table-column :label="this.$t('glys')"  v-if="this.productType!='1'"  :min-width="getStringWidth(this.$t('glys'))" align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
-        <el-table-column :label="this.$t('kqys')+'(S)'" :min-width="getStringWidth(this.$t('kqys')+'(S)')"  sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
-        <el-table-column :label="this.$t('gbys')+'(S)'"  :min-width="getStringWidth(this.$t('gbys')+'(S)')"   sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
-        <el-table-column  fixed="right" :label="this.$t('zt')" width="100" align="center" prop="productChStatus" >
+        <el-table-column :label="this.$t('kqys')+'(S)'" v-if="this.productParams.jkfs=='2'"   :min-width="getStringWidth(this.$t('kqys')+'(S)')"  sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
+        <el-table-column :label="this.$t('gbys')+'(S)'" v-if="this.productParams.jkfs=='2'"    :min-width="getStringWidth(this.$t('gbys')+'(S)')"   sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
+        <el-table-column  fixed="right" :label="this.$t('zt')" v-if="this.productParams.jkfs=='2'"   width="100" align="center" prop="productChStatus" >
           <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>
@@ -147,7 +178,7 @@
             <!--<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')" align="center" :min-width="getStringWidth(this.$t('cz'))"  class-name="small-padding fixed-width">
+        <el-table-column  fixed="right" :label="this.$t('cz')" 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,'productChStatus', scope.$index)=='0'"
@@ -166,6 +197,33 @@
 
           </template>
         </el-table-column>
+        <el-table-column fixed="right"  :label="this.$t('lxzt')" 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,'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('lxcz')" 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,'productChZeroStatus', scope.$index)=='0'"
+              size="mini"
+              type="text"
+              icon="el-icon-refresh"
+              @click="handleCommand2('channelopen',scope.row)"
+            >{{$t('dk')}}</el-button>
+            <el-button
+              v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
+              size="mini"
+              type="text"
+              icon="el-icon-refresh"
+              @click="handleCommand2('channelclose',scope.row)"
+            >{{$t('gb')}}</el-button>
+
+          </template>
+        </el-table-column>
         <el-table-column  fixed="right" :label="this.$t('sclx')"   :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>
@@ -173,7 +231,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column fixed="right" :label="this.$t('pz')" align="center" width="100" class-name="small-padding fixed-width">
+        <el-table-column fixed="right" :label="this.$t('pz')" v-if="this.productParams.jkfs=='2'"    align="center" width="100" class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
               size="mini"
@@ -195,6 +253,8 @@
         <el-table-column label="设备id" v-if="false" prop="productId"   />
         <el-table-column fixed  :label="this.$t('tdmc')"  :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
         <el-table-column fixed  :label="this.$t('tdh')" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
+        <el-table-column  align="center" v-if="this.productParams.dwkjk=='1'"  :label="this.$t('MACadress')" :min-width="getStringWidth(this.$t('MACadress'))+50"  prop="MACadress" :show-overflow-tooltip="true"   />
+        <el-table-column align="center"  v-if="this.productParams.dwkjk=='1'"  :label="this.$t('IPadress')" :min-width="getStringWidth(this.$t('IPadress'))+50"  prop="IPadress" :show-overflow-tooltip="true"   />
         <el-table-column :label="this.$t('sxxx')" v-if="this.productType=='3'" prop="productPhOrder" :show-overflow-tooltip="true"   >
           <template slot-scope="scope">
             <span >{{getDity(scope.row,'productPhOrders')}}</span>
@@ -213,9 +273,9 @@
         <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'"   :min-width="getStringWidth(this.$t('pl'))"   align="center" prop="productChPowerFreq"  :show-overflow-tooltip="true"/>
         <el-table-column :label="this.$t('hdl')+'(kWh)'"  :min-width="getStringWidth(this.$t('hdl')+'(kWh)')"  align="center" prop="productChConsumption" :show-overflow-tooltip="true" />
         <el-table-column :label="this.$t('glys')"  v-if="this.productType!='1'"  :min-width="getStringWidth(this.$t('glys'))"  align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
-        <el-table-column :label="this.$t('kqys')+'(S)'"   :min-width="getStringWidth(this.$t('kqys')+'(S)')"   sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
-        <el-table-column :label="this.$t('gbys')+'(S)'"   :min-width="getStringWidth(this.$t('gbys')+'(S)')"    sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
-        <el-table-column  fixed="right" :label="this.$t('zt')" align="center" prop="productChStatus" >
+        <el-table-column :label="this.$t('kqys')+'(S)'"  v-if="this.productParams.jkfs=='2'"    :min-width="getStringWidth(this.$t('kqys')+'(S)')"   sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
+        <el-table-column :label="this.$t('gbys')+'(S)'"  v-if="this.productParams.jkfs=='2'"   :min-width="getStringWidth(this.$t('gbys')+'(S)')"    sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
+        <el-table-column  fixed="right" :label="this.$t('zt')" v-if="this.productParams.jkfs=='2'"   align="center" prop="productChStatus" >
           <template slot-scope="scope">
             <span v-if="scope.row.productChStatus=='0'" style="color: red">{{getDity(scope.row,'productChStatus')}}</span>
             <span v-else-if="scope.row.productChStatus=='1'" style="color: green">{{getDity(scope.row,'productChStatus')}}</span>
@@ -223,7 +283,7 @@
             <!--<span v-else style="color: green">{{getDity(scope.row,'productChStatus')}}</span>-->
           </template>
         </el-table-column>
-        <el-table-column  fixed="right" :label="this.$t('cz')" align="center" width="100" class-name="small-padding fixed-width">
+        <el-table-column  fixed="right" :label="this.$t('cz')" v-if="this.productParams.jkfs=='2'"   align="center" width="100" class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
               v-if="scope.row.productChStatus == '0'"
@@ -242,7 +302,34 @@
 
           </template>
         </el-table-column>
-        <el-table-column fixed="right" :label="this.$t('pz')" align="center" width="100" class-name="small-padding fixed-width">
+        <el-table-column fixed="right"  :label="this.$t('lxzt')" 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,'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('lxcz')" 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,'productChZeroStatus', scope.$index)=='0'"
+              size="mini"
+              type="text"
+              icon="el-icon-refresh"
+              @click="handleCommand2('channelopen',scope.row)"
+            >{{$t('dk')}}</el-button>
+            <el-button
+              v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='1'"
+              size="mini"
+              type="text"
+              icon="el-icon-refresh"
+              @click="handleCommand2('channelclose',scope.row)"
+            >{{$t('gb')}}</el-button>
+
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" :label="this.$t('pz')" v-if="this.productParams.jkfs=='2'"    align="center" width="100" class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
               size="mini"
@@ -385,18 +472,20 @@
         outputTypes:[{"id":"1","name":"sx"},{"id":"2","name":"dx"}],
         // 输出状态
         outputStatus:[{"id":"1","name":"sc"},{"id":"2","name":"bsc"}],
+
         productType:"",
         disabled2:false,
-        disabled3:false
+        disabled3:false,
+        productParams:{}
       };
     },
     mounted() {
       //监听websocket消息
-
       this.$bus.$on('CHANNEL_STATUS_MONITORING', this.onSocketMessageToChannel);
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      this.productParams= this.$store.state.user.productParams;
      // this.dataRefreh();
       this.queryProductList();
     },
@@ -459,20 +548,46 @@
         this.outOpen=true;
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 2 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13 || columnIndex === 14 || columnIndex === 15 || columnIndex === 16 || columnIndex === 17 || columnIndex === 18  || columnIndex === 19 ) {
-
-          if (rowIndex % 3 === 0) {
-            return {
-              rowspan: 3,
-              colspan: 1
-            };
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            };
+        // 三项判断默认全部三项列都显示
+        //监控方式:1-总检测	2-分监分控	3-分监不控
+        var jkfs=this.productParams.jkfs;
+        //电网口监测0-不启用	1-启用
+        var dwkjk=this.productParams.dwkjk;
+        //零线控制0-不启用	1-启用
+        var lxkz=this.productParams.lxkz;
+        if(dwkjk=="1"){
+          if (columnIndex != 5 && columnIndex != 6  && columnIndex != 7 && columnIndex != 8 && columnIndex != 9  ) {
+
+            if (rowIndex % 3 === 0) {
+              return {
+                rowspan: 3,
+                colspan: 1
+              };
+            } else {
+              return {
+                rowspan: 0,
+                colspan: 0
+              };
+            }
+          }
+        }else{
+          if (columnIndex != 3 && columnIndex != 4  && columnIndex != 5 && columnIndex != 6 && columnIndex != 7  ) {
+
+            if (rowIndex % 3 === 0) {
+              return {
+                rowspan: 3,
+                colspan: 1
+              };
+            } else {
+              return {
+                rowspan: 0,
+                colspan: 0
+              };
+            }
           }
         }
+
+
       },
 
       // 设备列表
@@ -550,7 +665,19 @@
           }
           formTrain=this.productChStatuss
           id=productChStatus
-        }else if(type=='alarmStatus'){
+        }else if(type=='productChZeroStatus'){
+          var productChZeroStatus='';
+          for(var i=index;i<=index+2;i++){
+            const obj=this.channelList[i];
+            if(obj.outputStatus=='1'){
+              productChZeroStatus=obj.productChZeroStatus;
+              break;
+            }
+          }
+          formTrain=this.productChStatuss
+          id=productChZeroStatus
+        }
+        else if(type=='alarmStatus'){
           formTrain=this.alarmStatuss
           id=row.alarmStatus
         }else if(type=='connectionStatus'){
@@ -593,6 +720,17 @@
           }
           formTrain=this.productChStatuss
           id=productChStatus
+        }else if(type=='productChZeroStatus'){
+          var productChZeroStatus='';
+          for(var i=index;i<=index+2;i++){
+            const obj=this.channelList[i];
+            if(obj.outputStatus=='1'){
+              productChZeroStatus=obj.productChZeroStatus;
+              break;
+            }
+          }
+          formTrain=this.productChStatuss
+          id=productChZeroStatus
         }
         return id;
       },

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

@@ -12,8 +12,8 @@
       </el-form-item>
 
       <el-form-item class="register_btn">
-              <el-button type='primary' size="mini"  @click="handleCommand('open', queryParams.productId)">{{$t('zk')}}</el-button>
-              <el-button type='primary' size="mini"  style="background-color: #656B8B;    margin-right: 50px;" @click="handleCommand('close', queryParams.productId)">{{$t('zg')}}</el-button>
+              <el-button type='primary'  v-if="this.productParams.jkfs=='2'" size="mini"  @click="handleCommand('open', queryParams.productId)">{{$t('zk')}}</el-button>
+              <el-button type='primary'  v-if="this.productParams.jkfs=='2'" size="mini"  style="background-color: #656B8B;    margin-right: 50px;" @click="handleCommand('close', queryParams.productId)">{{$t('zg')}}</el-button>
       </el-form-item>
 
     </el-form>
@@ -22,8 +22,8 @@
         <el-card style="border-radius: 15px;height: 50%">
           <div slot="header" style="display: flex;height: 52px">
             <span class="sensorSpamClass" :title="productData.productName"  style="width: 300px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productNumber}}</a><br>{{productData.productName}}</span>
-            <span    class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/pinl.png"></img>  <span    style="text-align: center;    margin-left: 10px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px;">{{productData.productPowerFreq}}</a><br>{{$t('pl')}}</span></span>
-            <span   class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/hdl.png"></img>  <span     style="text-align: center;overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productConsumption}}</a><br>{{$t('zhdl')}}(kWh)</span></span>
+            <span   v-if="this.productType!='1'"   class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/pinl.png"></img>  <span    style="text-align: center;    margin-left: 10px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px;">{{productData.productPowerFreq}}</a><br>{{$t('pl')}}</span></span>
+            <span     class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/hdl.png"></img>  <span     style="text-align: center;overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productConsumption}}</a><br>{{$t('zhdl')}}(kWh)</span></span>
             <span    class="sensorSpamClass" style=" white-space: nowrap;">
               <el-button type='primary'  v-if="this.productType=='4' || this.productType=='3'" size="mini" :class="{spana:isSpana}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px" @click="queryTotalOrderStatus('L1')">{{$t('sxax')}}</el-button>
               <el-button type='primary'   v-if="this.productType=='4' || this.productType=='3'"  size="mini" :class="{spanb:isSpanb}" style="border-radius: 10px;margin-left: 10px;margin-top: 10px;width: 80px;" @click="queryTotalOrderStatus('L2')">{{$t('sxbx')}}</el-button>
@@ -137,6 +137,7 @@
         isSpana:false,
         isSpanb:true,
         isSpanc:true,
+        productParams:{}
       };
     },
     mounted() {
@@ -147,6 +148,9 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      this.productParams= this.$store.state.user.productParams;
+      console.log("--->")
+      console.log(this.productParams)
      //this.dataRefreh();
 
     },
@@ -686,7 +690,7 @@
               seriesData.data=item.ydata;
               seriesData.color='#09BC3C';
               series.push(seriesData);
-            }else if('2'== item.id){
+            }else if('2'== item.id && this.productType!='1'){
               const legend={};
               legend.name=this.$t('wggl');
               legend.icon='circle';
@@ -699,7 +703,7 @@
               seriesData.color='#0D32FE';
               seriesData.data=item.ydata;
               series.push(seriesData);
-            }else if('3'== item.id){
+            }else if('3'== item.id && this.productType!='1'){
               const legend={};
               legend.name=this.$t('szgl');
               legend.icon='circle';

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

@@ -22,11 +22,7 @@
       <el-table-column align="center" :label="this.$t('sbmc')" prop="productName"  />
       <el-table-column align="center" label="产品ID" v-if="false" prop="productId"  />
       <el-table-column align="center" :label="this.$t('sbbh')" prop="productNumber"  />
-      <el-table-column align="center" :label="this.$t('sblx')" prop="productType" :show-overflow-tooltip="true"   >
-        <template slot-scope="scope">
-          <span >{{getDity(scope.row,'productType')}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column align="center" :label="this.$t('sblx')" prop="productTypeName" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('gjbbh')" prop="productVersion" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('gjrq')" prop="firmwareDate" :show-overflow-tooltip="true"   />
       <el-table-column :label="this.$t('cz')" align="center"  class-name="small-padding fixed-width">

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

@@ -21,8 +21,8 @@
       <el-table-column align="center" :label="this.$t('sbmc')" prop="productName"  />
       <el-table-column align="center" label="产品ID" v-if="false" prop="productId"  />
       <el-table-column align="center" :label="this.$t('sbbh')" prop="productNumber"  />
-      <el-table-column align="center" :label="this.$t('sbyzm')" prop="productCode" width="180" :show-overflow-tooltip="true"   />
-      <el-table-column align="center" :label="this.$t('sbxh')" prop="productModel" :show-overflow-tooltip="true"   />
+      <el-table-column align="center" :label="this.$t('cpbh')" prop="productCode" width="180" :show-overflow-tooltip="true"   />
+      <el-table-column align="center" :label="this.$t('sblx')" prop="productModel" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('gjbb')" prop="productVersion" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('xtsj')" prop="systemTime" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('yxsj')" prop="runTime" :show-overflow-tooltip="true"   />
@@ -34,9 +34,13 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >{{$t('xg')}}</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="lookEwm(scope.row)"
+          >{{$t('ckewm')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -63,7 +67,14 @@
         <el-button @click="cancel">{{$t('qx')}}</el-button>
       </div>
     </el-dialog>
-
+    <el-dialog :title="title1" :visible.sync="open1" width="500px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
+      <div style="overflow: auto;text-align: center;" >
+        <img :src="ewmImageData">
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel1">{{$t('gb')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -85,6 +96,10 @@
         title: "",
         // 是否显示弹出层
         open: false,
+        // 弹出层标题
+        title1: "",
+        // 是否显示弹出层
+        open1: false,
         sortnoOpen: false,
         // 通道配置表单参数
         form: {},
@@ -106,6 +121,7 @@
           { prop: 'status', isShow: true, label: '状态', width: '', minWidth: '100', align: 'center' },
         ],
         productList:[],
+        ewmImageData: require("../../../assets/images/sbh.png"),
         upload: {
           // 是否显示弹出层（用户导入）
           open: false,
@@ -241,12 +257,22 @@
         });
 
       },
+// 查看二维码
+      lookEwm(row) {
+         this.open1 = true;
+         this.title1=this.$t("sbewm");
+      },
 
       // 取消按钮
       cancel() {
         this.open = false;
         //  this.reset();
       },
+      // 取消按钮
+      cancel1() {
+        this.open1 = false;
+        //  this.reset();
+      },
       /** 强退按钮操作 */
       handleForceLogout(row) {
         this.$modal.confirm(this.$t('sfqztc') + row.userName + this.$t('yhm')).then(function() {

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

@@ -35,11 +35,7 @@
       <el-table-column align="center" :label="this.$t('sbmc')" prop="productName"  />
       <el-table-column align="center" label="产品ID" v-if="false" prop="productId"  />
       <el-table-column align="center" :label="this.$t('sbbh')" prop="productNumber"  />
-      <el-table-column align="center" :label="this.$t('sblx')" prop="productType" :show-overflow-tooltip="true"   >
-        <template slot-scope="scope">
-          <span >{{getDity(scope.row,'productType')}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column align="center" :label="this.$t('sblx')" prop="productTypeName" :show-overflow-tooltip="true"   />
       <el-table-column align="center"  :label="this.$t('sbzt')" prop="productStatus" :show-overflow-tooltip="true"   />
       <el-table-column :label="this.$t('cz')" align="center"  class-name="small-padding fixed-width">
         <template slot-scope="scope" >

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

@@ -23,11 +23,11 @@
       <el-table-column align="center" :label="this.$t('tdsl')" prop="productChNumber" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('gjbbh')" prop="productVersion" :show-overflow-tooltip="true"   />
 
-      <el-table-column align="center" :label="this.$t('sjrq')" prop="upgradeDate" :show-overflow-tooltip="true"   />
+      <el-table-column align="center" :label="this.$t('gjrq')" prop="upgradeDate" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('dqzt')" prop="status" :show-overflow-tooltip="true"   >
         <template slot-scope="scope">
-          <span v-if="scope.row.status=='0'" style="color: red">{{getDity(scope.row,'status')}}</span>
-          <span v-else-if="scope.row.status=='1'" style="color: green">{{getDity(scope.row,'status')}}</span>
+          <span v-if="scope.row.status=='0' || scope.row.status=='4' " style="color: red">{{getDity(scope.row,'status')}}</span>
+          <span v-else-if="scope.row.status=='1'  || scope.row.status=='3' " style="color: green">{{getDity(scope.row,'status')}}</span>
           <span v-else style="color: #FFD966">{{getDity(scope.row,'status')}}</span>
 
         </template>
@@ -143,7 +143,7 @@
           url:  window.location.origin+"/pdu/controlBoardUpgradeUpload" // todo
         },
         productChTypes:[{"id":"1","name":"sblx1"},{"id":"2","name":"sblx2"},{"id":"3","name":"sblx3"},{"id":"4","name":"sblx4"},{"id":"5","name":"sblx5"}],
-        statuss:[{"id":"0","name":"lix"},{"id":"1","name":"zx"},{"id":"2","name":"sjz"}],
+        statuss:[{"id":"0","name":"lix"},{"id":"1","name":"zx"},{"id":"2","name":"sjz"},{"id":"3","name":"sjcg"},{"id":"4","name":"sjsb"}],
         hisData:[],
         activeNames:[],
         productId:"",

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

@@ -28,11 +28,7 @@
       <el-table-column align="center" :label="this.$t('sbmc')" prop="productName"  />
       <el-table-column label="产品ID" v-if="false" prop="productId"  />
       <el-table-column align="center" :label="this.$t('sbbh')" prop="productNumber"  />
-      <el-table-column align="center" :label="this.$t('sblx')" prop="productType" :show-overflow-tooltip="true"   >
-        <template slot-scope="scope">
-          <span >{{getDity(scope.row,'productType')}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column align="center" :label="this.$t('sblx')" prop="productTypeName" :show-overflow-tooltip="true"   />
       <el-table-column align="center" :label="this.$t('sbzt')" prop="productStatus" :show-overflow-tooltip="true"   />
       <el-table-column :label="this.$t('cz')" align="center"  class-name="small-padding fixed-width">
         <template slot-scope="scope" >

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

@@ -99,8 +99,9 @@
       </div>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
-      <div style="overflow: auto">
-        <img :src="imageData" alt="Base64 Image">
+      <div style="overflow: auto;text-align: center;" >
+        <img v-if="this.imgValidate=='1'" :src="imageData" alt="Base64 Image">
+        <img v-else :src="ewmImageData">
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">{{$t('gb')}}</el-button>
@@ -159,7 +160,10 @@
           // 上传的地址
           url: window.location.origin+"/pdu/equipmentMintenanceUpload"
         },
-        imageData: null
+        imageData: null,
+        ewmImageData: require("../../../assets/images/shdh.png"),
+        imgValidate:""
+
       };
     },
     created() {
@@ -193,11 +197,15 @@
       handleAllCommand(command, row) {
         switch (command) {
           case "viewLogo":
+            this.imgValidate="1";
             this.open = true;
+            this.title = "logo";
             this.fetchImage(row.logo);
         break;
       case "viewQr":
+        this.imgValidate="";
         this.open = true;
+        this.title = this.$t("shewm");
         this.fetchImage(row.qrCode);
         break;
       default:

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

@@ -27,7 +27,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="8" class="card-box">
+      <el-col :span="8" class="card-box" v-if="this.productParams.ip4sz=='1'">
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
@@ -77,7 +77,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="8" class="card-box">
+      <el-col :span="8" class="card-box" v-if="this.productParams.ip6sz=='1'">
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
           </div>
@@ -159,6 +159,7 @@
         sensorStatusList:[],
         showClass: true,
         showClass2: true,
+        productParams:{},
         rules1: {
           ssid: [
             { required: true, message:  "SSID "+this.$i18n.t('bnwk'), trigger: "blur" }
@@ -185,6 +186,7 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      this.productParams= this.$store.state.user.productParams;
       this.queryIp3();
       setTimeout(()=>{
         this.queryIp();
@@ -252,34 +254,40 @@
       },
       //IPV4查询
       queryIp(){
-        const params={};
-        params.token=this.usertoken;
-        params.type="listWIFIIPV4Query";
-        communicationManagement(params).then(response => {
-          if(response.data!=null){
-          if( response.data.mode=='1'){
-            this.showClass = false;
-          }
-          this.form=response.data;
+        if(this.productParams.ip4sz=='1'){
+          const params={};
+          params.token=this.usertoken;
+          params.type="listWIFIIPV4Query";
+          communicationManagement(params).then(response => {
+            if(response.data!=null){
+            if( response.data.mode=='1'){
+              this.showClass = false;
+            }
+            this.form=response.data;
           }
 
         });
+        }
+
       },
       //IPV6查询
       queryIp2(){
-        const params={};
-        params.token=this.usertoken;
-        params.type="listWIFIIPV6Query";
-        communicationManagement(params).then(response => {
-          if(response.data!=null){
-          if( response.data.mode=='1'){
-            this.showClass2 = false;
-          }
-          this.form2=response.data;
+        if(this.productParams.ip6sz=='1'){
+          const params={};
+          params.token=this.usertoken;
+          params.type="listWIFIIPV6Query";
+          communicationManagement(params).then(response => {
+            if(response.data!=null){
+            if( response.data.mode=='1'){
+              this.showClass2 = false;
+            }
+            this.form2=response.data;
           }
 
 
         });
+        }
+
       },
 
       queryIp3(){

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-col :span="12" class="card-box">
+      <el-col :span="12" class="card-box" v-if="this.productParams.ip4sz=='1'" >
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
@@ -51,7 +51,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="12" class="card-box">
+      <el-col :span="12" class="card-box" v-if="this.productParams.ip6sz=='1'" >
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
           </div>
@@ -132,6 +132,7 @@
         sensorStatusList:[],
         showClass: true,
         showClass2: true,
+        productParams:{},
         // 表单校验
         rules1: {
           mode: [
@@ -153,6 +154,7 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      this.productParams= this.$store.state.user.productParams;
       this.queryIp();
       setTimeout(()=>{
         this.queryIp2();
@@ -217,32 +219,38 @@
       },
       //IPV4查询
       queryIp(){
-        const params={};
-        params.token=this.usertoken;
-        params.type="listWkIPV4Query";
-        communicationManagement(params).then(response => {
-          if(response.data!=null){
-          if( response.data.mode=='1'){
-            this.showClass = false;
-          }
-          this.form=response.data;
+        if(this.productParams.ip4sz=='1'){
+          const params={};
+          params.token=this.usertoken;
+          params.type="listWkIPV4Query";
+          communicationManagement(params).then(response => {
+            if(response.data!=null){
+            if( response.data.mode=='1'){
+              this.showClass = false;
+            }
+            this.form=response.data;
           }
 
-      });
+        });
+        }
+
       },
       //IPV6查询
       queryIp2(){
-        const params={};
-        params.token=this.usertoken;
-        params.type="listWkIPV6Query";
-        communicationManagement(params).then(response => {
-          if(response.data!=null){
-          if( response.data.mode=='1'){
-            this.showClass2 = false;
+        if(this.productParams.ip6sz=='1'){
+          const params={};
+          params.token=this.usertoken;
+          params.type="listWkIPV6Query";
+          communicationManagement(params).then(response => {
+            if(response.data!=null){
+            if( response.data.mode=='1'){
+              this.showClass2 = false;
+            }
+            this.form2=response.data;
           }
-          this.form2=response.data;
-          }
-      });
+        });
+        }
+
       },
       /** 提交按钮 */
       submitForm: function() {

web/三相/vue.config.js

@@ -76,10 +76,13 @@ module.exports = {
     // set svg-sprite-loader
     config.module
       .rule('images')
+      .test(/\.(png|jpe?g|gif|webp)(\?.*)?$/)
       .use('url-loader')
       .loader('url-loader')
-      .options({
-        limit: 1000,
+      .tap(options => {
+        options.fallback.options.name = 'img/[name].[ext]?';
+        options.limit = 1024; //图片大小限制
+        return options
       })
     config.module
       .rule('svg')