ソースを参照

控制板升级修改

wenb 1 年間 前
親
コミット
a1659ff8a6
共有3 個のファイルを変更した、15753 個の追加 と 83 個の削除を含む
  1. 15611 0
      web/三相/package-lock.json
  2. 132 73
      web/三相/src/views/power/channelstatus/index.vue
  3. 10 10
      web/三相/src/views/sbwh/kzbsj/index.vue

File diff suppressed because it is too large
+ 15611 - 0
web/三相/package-lock.json


+ 132 - 73
web/三相/src/views/power/channelstatus/index.vue

@@ -32,15 +32,15 @@
     <el-card v-if="this.productType==='3'"  style="min-height: 700px ; border-radius: 15px">
     <el-table min-height="700px" v-loading="loading"  max-height="700px"  :data="channelList" :span-method="objectSpanMethod" style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
       <!--<el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column fixed  :label="this.$t('sbmc')" :min-width="getStringWidth(this.$t('sbmc'))"  prop="productName"  />
+      <el-table-column fixed  :label="this.$t('sbmc')" :key="1" :min-width="getStringWidth(this.$t('sbmc'))"  prop="productName"  />
       <el-table-column :label="this.$t('sbbh')" v-if="false" prop="productNumber"   />
       <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 fixed  :label="this.$t('tdmc')" :key="2" :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
+      <el-table-column fixed  :label="this.$t('tdh')" :key="3" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
+      <el-table-column  align="center" v-if="this.productParams.dwkjk=='1'" :key="4" :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'" :key="5" :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"   >
+      <el-table-column :label="this.$t('sxxx')" :min-width="getStringWidth(this.$t('sxxx'))" :key="6" prop="productPhOrder" :show-overflow-tooltip="true"   >
         <template slot-scope="scope">
           <span v-if="scope.row.outputStatus=='1'" style="color: green">{{getDity(scope.row,'productPhOrders')}}</span>
           <span v-else style="color: red">{{getDity(scope.row,'productPhOrders')}}</span>
@@ -48,21 +48,21 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="this.$t('sxxdy')+'(V)'" :min-width="getStringWidth(this.$t('sxxdy')+'(V)')" prop="productPhOrderDy" :show-overflow-tooltip="true"   />
-      <el-table-column :label="this.$t('sxxdl')+'(A)'" :min-width="getStringWidth(this.$t('sxxdl')+'(A)')" prop="productPhOrderDl" :show-overflow-tooltip="true"   />
-      <el-table-column :label="this.$t('sxxgl')+'(W)'" :min-width="getStringWidth(this.$t('sxxgl')+'(W)')" prop="productPhOrderGl" :show-overflow-tooltip="true"   />
-      <el-table-column :label="this.$t('sxxhdl')+'(kWh)'" :min-width="getStringWidth(this.$t('sxxhdl')+'(kWh)')" prop="productPhOrderHdl" :show-overflow-tooltip="true"   />
+      <el-table-column :label="this.$t('sxxdy')+'(V)'" :key="7" :min-width="getStringWidth(this.$t('sxxdy')+'(V)')" prop="productPhOrderDy" :show-overflow-tooltip="true"   />
+      <el-table-column :label="this.$t('sxxdl')+'(A)'" :key="8" :min-width="getStringWidth(this.$t('sxxdl')+'(A)')" prop="productPhOrderDl" :show-overflow-tooltip="true"   />
+      <el-table-column :label="this.$t('sxxgl')+'(W)'" :key="9" :min-width="getStringWidth(this.$t('sxxgl')+'(W)')" prop="productPhOrderGl" :show-overflow-tooltip="true"   />
+      <el-table-column :label="this.$t('sxxhdl')+'(kWh)'" :key="10" :min-width="getStringWidth(this.$t('sxxhdl')+'(kWh)')" prop="productPhOrderHdl" :show-overflow-tooltip="true"   />
 
 
       <!--<el-table-column :label="this.$t('dy')+'(V)'"  width="120"  prop="productChVoltage" :show-overflow-tooltip="true"   />-->
       <!--<el-table-column :label="this.$t('dl')+'(A)'" width="120" prop="productChCurrent" :show-overflow-tooltip="true"  />-->
-      <el-table-column :label="this.$t('gl')+'(W)'" :min-width="getStringWidth(this.$t('gl')+'(W)')" prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
-      <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  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" >
+      <el-table-column :label="this.$t('gl')+'(W)'" :min-width="getStringWidth(this.$t('gl')+'(W)')" :key="11" prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
+      <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'" :key="12" :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)')" :key="13" align="center" prop="productChConsumption" :show-overflow-tooltip="true" />
+      <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="15"  :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'"  :key="16" :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')" :key="17" 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>
@@ -70,7 +70,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('lxcz')" 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('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-button
             v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'"
@@ -89,7 +89,7 @@
 
         </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" >
+      <el-table-column  fixed="right" :label="this.$t('zt')"  :key="19" 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>
@@ -97,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')" 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('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-button
             v-if="getDity2(scope.row,'productChStatus', scope.$index)=='0'"
@@ -116,14 +116,14 @@
 
         </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"  >
+      <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>
           <span @click="onclickOutType(scope.row,scope.$index)"  v-else style="color: #5C92B7;cursor: pointer">{{getDity(scope.row,'outputTypes')}}</span>
         </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">
+      <el-table-column fixed="right" :label="this.$t('pz')" :key="22" v-if="this.productParams.jkfs=='2'"    align="center" width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
           <el-button
             size="mini"
@@ -139,15 +139,15 @@
     <el-card v-if=" this.productType==='4'"  style="min-height: 700px ; border-radius: 15px">
       <el-table min-height="700px" v-loading="loading"  max-height="700px"  :data="channelList"  style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
         <!--<el-table-column type="selection" width="55" align="center" />-->
-        <el-table-column fixed  :label="this.$t('sbmc')" :min-width="getStringWidth(this.$t('sbmc'))"  prop="productName"  />
+        <el-table-column fixed  :label="this.$t('sbmc')" :key="1" :min-width="getStringWidth(this.$t('sbmc'))"  prop="productName"  />
         <el-table-column :label="this.$t('sbbh')" v-if="false" prop="productNumber"   />
         <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 fixed  :label="this.$t('tdmc')" :key="2" :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
+        <el-table-column fixed  :label="this.$t('tdh')" :key="3" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
+        <el-table-column  align="center" :key="4" 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" :key="5"  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"   >
+        <el-table-column :label="this.$t('sxxx')" :key="6" :min-width="getStringWidth(this.$t('sxxx'))"  prop="productPhOrder" :show-overflow-tooltip="true"   >
           <template slot-scope="scope">
             <span v-if="scope.row.outputStatus=='1'" style="color: green">{{getDity(scope.row,'productPhOrders')}}</span>
             <span v-else style="color: red">{{getDity(scope.row,'productPhOrders')}}</span>
@@ -155,22 +155,22 @@
           </template>
         </el-table-column>
 
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('dy')+'(V)'"  :min-width="getStringWidth(this.$t('dy'))"  prop="productPhOrderDy" :show-overflow-tooltip="true"   />
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('dl')+'(A)'"  :min-width="getStringWidth(this.$t('dl'))"  prop="productPhOrderDl" :show-overflow-tooltip="true"   />
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('gl')+'(W)'"  :min-width="getStringWidth(this.$t('gl'))"  prop="productPhOrderGl" :show-overflow-tooltip="true"   />
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('hdl')+'(kWh)'"  :min-width="getStringWidth(this.$t('hdl'))"  prop="productPhOrderHdl" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'" :key="41" :label="this.$t('sxx')+this.$t('dy')+'(V)'"  :min-width="getStringWidth(this.$t('dy'))"  prop="productPhOrderDy" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'"  :key="42"  :label="this.$t('sxx')+this.$t('dl')+'(A)'"  :min-width="getStringWidth(this.$t('dl'))"  prop="productPhOrderDl" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'"  :key="43"  :label="this.$t('sxx')+this.$t('gl')+'(W)'"  :min-width="getStringWidth(this.$t('gl'))"  prop="productPhOrderGl" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'"  :key="44"  :label="this.$t('sxx')+this.$t('hdl')+'(kWh)'"  :min-width="getStringWidth(this.$t('hdl'))"  prop="productPhOrderHdl" :show-overflow-tooltip="true"   />
 
 
 
-        <el-table-column :label="this.$t('dy')+'(V)'"  :min-width="getStringWidth(this.$t('dy')+'(V)')"  prop="productChVoltage" :show-overflow-tooltip="true"   />
-        <el-table-column :label="this.$t('dl')+'(A)'" :min-width="getStringWidth(this.$t('dl')+'(A)')"   prop="productChCurrent" :show-overflow-tooltip="true"  />
-        <el-table-column :label="this.$t('gl')+'(W)'" :min-width="getStringWidth(this.$t('gl')+'(W)')" prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
-        <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)'" 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" >
+        <el-table-column :label="this.$t('dy')+'(V)'"  :key="7" :min-width="getStringWidth(this.$t('dy')+'(V)')"  prop="productChVoltage" :show-overflow-tooltip="true"   />
+        <el-table-column :label="this.$t('dl')+'(A)'" :key="8" :min-width="getStringWidth(this.$t('dl')+'(A)')"   prop="productChCurrent" :show-overflow-tooltip="true"  />
+        <el-table-column :label="this.$t('gl')+'(W)'" :key="9" :min-width="getStringWidth(this.$t('gl')+'(W)')" prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
+        <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'" :min-width="getStringWidth(this.$t('pl'))"  :key="45"  align="center" prop="productChPowerFreq"  :show-overflow-tooltip="true"/>
+        <el-table-column :label="this.$t('hdl')+'(kWh)'" :key="10"  :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'"  :key="46"    :min-width="getStringWidth(this.$t('glys'))" align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
+        <el-table-column :label="this.$t('kqys')+'(S)'" v-if="this.productParams.jkfs=='2'"  :key="11"  :min-width="getStringWidth(this.$t('kqys')+'(S)')"     prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
+        <el-table-column :label="this.$t('gbys')+'(S)'" v-if="this.productParams.jkfs=='2'"  :key="12"  :min-width="getStringWidth(this.$t('gbys')+'(S)')"     align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
+        <el-table-column  fixed="right" :label="this.$t('zt')" v-if="this.productParams.jkfs=='2'"  :key="13"  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>
@@ -178,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')" 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('cz')" v-if="this.productParams.jkfs=='2'" :key="14" 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'"
@@ -197,7 +197,7 @@
 
           </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" >
+        <el-table-column fixed="right"  :label="this.$t('lxzt')" v-if="this.productParams.lxkz=='1'" :key="15"  :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>
@@ -205,7 +205,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('lxcz')" 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('lxcz')" v-if="this.productParams.lxkz=='1'" :key="16" 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'"
@@ -224,14 +224,14 @@
 
           </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"  >
+        <el-table-column  fixed="right" :label="this.$t('sclx')"   :min-width="getStringWidth(this.$t('sclx'))"  :key="17"    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>
             <span @click="onclickOutType(scope.row,scope.$index)"  v-else style="color: #5C92B7;cursor: pointer">{{getDity(scope.row,'outputTypes')}}</span>
           </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">
+        <el-table-column fixed="right" :label="this.$t('pz')" v-if="this.productParams.jkfs=='2'"  :key="18"  align="center" width="100" class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
               size="mini"
@@ -248,34 +248,34 @@
 
       <el-table min-height="700px"  max-height="700px"  v-loading="loading"    :data="channelList"   style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
         <!--<el-table-column type="selection" width="55" align="center" />-->
-        <el-table-column fixed  :label="this.$t('sbmc')"  :min-width="getStringWidth(this.$t('sbmc'))"  prop="productName"  />
+        <el-table-column fixed  :label="this.$t('sbmc')"  :key="1" :min-width="getStringWidth(this.$t('sbmc'))"  prop="productName"  />
         <el-table-column :label="this.$t('sbbh')" v-if="false" prop="productNumber"   />
         <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"   >
+        <el-table-column fixed  :label="this.$t('tdmc')" :key="2"  :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
+        <el-table-column fixed  :label="this.$t('tdh')" :key="3" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
+        <el-table-column  align="center" v-if="this.productParams.dwkjk=='1'"  :key="4" :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'"  :key="5" :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'" :key="6" prop="productPhOrder" :show-overflow-tooltip="true"   >
           <template slot-scope="scope">
             <span >{{getDity(scope.row,'productPhOrders')}}</span>
           </template>
         </el-table-column>
 
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('dy')+'(V)'"  :min-width="getStringWidth(this.$t('dy'))"  prop="productPhOrderDy" :show-overflow-tooltip="true"   />
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('dl')+'(A)'"  :min-width="getStringWidth(this.$t('dl'))"  prop="productPhOrderDl" :show-overflow-tooltip="true"   />
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('gl')+'(W)'"  :min-width="getStringWidth(this.$t('gl'))"  prop="productPhOrderGl" :show-overflow-tooltip="true"   />
-        <el-table-column  v-if="this.productType=='3'" :label="this.$t('sxx')+this.$t('hdl')+'(kWh)'"  :min-width="getStringWidth(this.$t('hdl'))"  prop="productPhOrderHdl" :show-overflow-tooltip="true"   />
-
-
-        <el-table-column :label="this.$t('dy')+'(V)'"   :min-width="getStringWidth(this.$t('dy')+'(V)')"   prop="productChVoltage" :show-overflow-tooltip="true"   />
-        <el-table-column :label="this.$t('dl')+'(A)'"  :min-width="getStringWidth(this.$t('dl')+'(A)')"  prop="productChCurrent" :show-overflow-tooltip="true"  />
-        <el-table-column :label="this.$t('gl')+'(W)'"  :min-width="getStringWidth(this.$t('gl')+'(W)')"  prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
-        <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)'"  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" >
+        <el-table-column  v-if="this.productType=='3'"  :key="41"  :label="this.$t('sxx')+this.$t('dy')+'(V)'"  :min-width="getStringWidth(this.$t('dy'))"  prop="productPhOrderDy" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'"  :key="42"  :label="this.$t('sxx')+this.$t('dl')+'(A)'"  :min-width="getStringWidth(this.$t('dl'))"  prop="productPhOrderDl" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'"  :key="43"  :label="this.$t('sxx')+this.$t('gl')+'(W)'"  :min-width="getStringWidth(this.$t('gl'))"  prop="productPhOrderGl" :show-overflow-tooltip="true"   />
+        <el-table-column  v-if="this.productType=='3'"  :key="44"  :label="this.$t('sxx')+this.$t('hdl')+'(kWh)'"  :min-width="getStringWidth(this.$t('hdl'))"  prop="productPhOrderHdl" :show-overflow-tooltip="true"   />
+
+
+        <el-table-column :label="this.$t('dy')+'(V)'"  :key="7"  :min-width="getStringWidth(this.$t('dy')+'(V)')"   prop="productChVoltage" :show-overflow-tooltip="true"   />
+        <el-table-column :label="this.$t('dl')+'(A)'"  :key="8" :min-width="getStringWidth(this.$t('dl')+'(A)')"  prop="productChCurrent" :show-overflow-tooltip="true"  />
+        <el-table-column :label="this.$t('gl')+'(W)'" :key="9" :min-width="getStringWidth(this.$t('gl')+'(W)')"  prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
+        <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'" :key="10"  :min-width="getStringWidth(this.$t('pl'))"   align="center" prop="productChPowerFreq"  :show-overflow-tooltip="true"/>
+        <el-table-column :label="this.$t('hdl')+'(kWh)'" :key="11"  :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'" :key="12"  :min-width="getStringWidth(this.$t('glys'))"  align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
+        <el-table-column :label="this.$t('kqys')+'(S)'"  v-if="this.productParams.jkfs=='2'" :key="13"   :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'"  :key="14" :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'" :key="15"  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>
@@ -283,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')" v-if="this.productParams.jkfs=='2'"   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'"  :key="16"  align="center" width="100" class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
               v-if="scope.row.productChStatus == '0'"
@@ -302,7 +302,7 @@
 
           </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" >
+        <el-table-column fixed="right"  :label="this.$t('lxzt')" v-if="this.productParams.lxkz=='1'" :key="17"   :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>
@@ -310,7 +310,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('lxcz')" 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('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-button
               v-if="getDity2(scope.row,'productChZeroStatus', scope.$index)=='0'"
@@ -329,7 +329,7 @@
 
           </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">
+        <el-table-column fixed="right" :label="this.$t('pz')" :key="19" v-if="this.productParams.jkfs=='2'"    align="center" width="100" class-name="small-padding fixed-width">
           <template slot-scope="scope" >
             <el-button
               size="mini"
@@ -486,7 +486,7 @@
     created() {
       this.usertoken= this.$store.state.user.usertoken;
       this.productParams= this.$store.state.user.productParams;
-     // this.dataRefreh();
+     //this.dataRefreh();
       this.queryProductList();
     },
     methods: {
@@ -737,7 +737,66 @@
       dataRefreh(){
         // 计时器为空,操作
         setInterval(() => {
-          this.queryChannelStatus();
+          var  resultData=[
+            {
+              "productPhOrder": "L1",
+              "closeInterval": "12",
+              "productPhOrderDl": "131",
+              "productPhOrderHdl": "12",
+              "productChStatus": Math.random() < 0.5 ? 0 : 1,
+              "outputType": "1",
+              "productName": "设备1",
+              "productChPower": "2",
+              "productPhOrderDy": "144",
+              "productChPowerFactor": "0",
+              "temperature": "12",
+              "productChConsumption": "0",
+              "humidity": "1",
+              "MACadress": "fe80::2959:2329:2c4e:b0a1%22",
+              "productChZeroStatus": "1",
+              "productChVoltage": Math.random(),
+              "productChId": "24",
+              "outputStatus": "1",
+              "productId": "35",
+              "productPhOrderGl":  Math.random(),
+              "productChCurrent":  Math.random(),
+              "productNumber": "100",
+              "firingInterval": Math.random() < 0.5 ? 1 : 2,
+              "productChName": "通道1",
+              "productChPowerFreq": "0",
+              "IPadress": "172.27.128.1"
+            },
+            {
+              "productPhOrder": "L2",
+              "closeInterval":  Math.random(),
+              "productPhOrderDl":  Math.random(),
+              "productPhOrderHdl":  Math.random(),
+              "productChStatus": Math.random() < 0.5 ? 0 : 1,
+              "outputType": "1",
+              "productName": "设备1",
+              "productChPower": "2",
+              "productPhOrderDy": "144",
+              "productChPowerFactor": "0",
+              "temperature": "12",
+              "productChConsumption": "0",
+              "humidity": "1",
+              "MACadress": "fe80::2959:2329:2c4e:b0a1%22",
+              "productChZeroStatus": "1",
+              "productChVoltage": "2",
+              "productChId": "24",
+              "outputStatus": "1",
+              "productId": "15",
+              "productPhOrderGl": "133",
+              "productChCurrent": "2",
+              "productNumber": "100",
+              "firingInterval": Math.random() < 0.5 ? 1 : 2,
+              "productChName": "通道1",
+              "productChPowerFreq": "0",
+              "IPadress": "172.27.128.1"
+            }
+          ];
+          this.channelList = resultData;
+          console.log("执行成功")
       }, 1000);
       },
       // 通道列表

+ 10 - 10
web/三相/src/views/sbwh/kzbsj/index.vue

@@ -59,7 +59,7 @@
            ref="upload"
         :limit="1"
         :action="upload.url + '?productId=' + this.productId+'&type=importData&token='+this.usertoken"
-           accept=".bin, .hex"
+
         :disabled="upload.isUploading"
            :on-change="beforeUpload"
         :on-progress="handleFileUploadProgress"
@@ -69,9 +69,9 @@
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">{{$t('drts')}}<em>{{$t('djsc')}}</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <span>{{$t('jyxdr')}}bin、hex{{$t('gswj')}}。</span>
-        </div>
+        <!--<div class="el-upload__tip text-center" slot="tip">-->
+          <!--<span>{{$t('jyxdr')}}bin、hex{{$t('gswj')}}。</span>-->
+        <!--</div>-->
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">{{$t('qd')}}</el-button>
@@ -268,12 +268,12 @@
   },
       beforeUpload(file){
         if(this.validate==""){
-          var name= file.name.split('.')[1].toLowerCase() ;
-          if ( name!='bin' && name!='hex' ) {
-            this.$modal.msgError(this.$t('jyxdr')+"bin、hex"+this.$t('gswj'));
-            this.$refs.upload.clearFiles();
-            return false;
-          }
+          // var name= file.name.split('.').pop().toLowerCase() ;
+          // if ( name!='bin' && name!='hex' ) {
+          //   this.$modal.msgError(this.$t('jyxdr')+"bin、hex"+this.$t('gswj'));
+          //   this.$refs.upload.clearFiles();
+          //   return false;
+          // }
           this.fileName=file.name;
         }
       },