传感器增加类型

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

@@ -969,7 +969,7 @@
           id=row.alarmStatus
         }else if(type=='leakageStatus'){
           formTrain=this.leakageStatuss
-          id=row.alarmStatus
+          id=row.leakageStatus
         }
         else if(type=='connectionStatus'){
           formTrain=this.connectionStatuss

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

@@ -121,7 +121,7 @@
             <el-table-column :label="this.$t('dw')" align="center" prop="unit" />
             <el-table-column :label="this.$t('cz')" align="center" :min-width="getStringWidth($t('mc'))" class-name="small-padding fixed-width">
               <template slot-scope="scope" >
-                <el-button v-if="scope.row.sensorType=='0' || scope.row.sensorType=='4'  || scope.row.sensorType=='5' "
+                <el-button v-if="scope.row.sensorType=='0' || scope.row.sensorType=='4'  || scope.row.sensorType=='5'  || scope.row.sensorType=='8'  || scope.row.sensorType=='9' || scope.row.sensorType=='10'"
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
@@ -437,7 +437,7 @@
         sensorStatusForm: {}, // 传感器表单数据
         sensorStatusOpen: false, // 配置传感器
         sensorStatusTitle: '',
-        sensorStatusTabs:[{"id":"0","name":"wsdcgq"},{"id":"1","name":"ywcgq"},{"id":"2","name":"sqcgq"},{"id":"3","name":"mjcgq"},{"id":"4","name":"qtcgq"},{"id":"5","name":"qyqlcgq"},{"id":"6","name":"ktcgq"}],
+        sensorStatusTabs:[{"id":"0","name":"wsdcgq"},{"id":"1","name":"ywcgq"},{"id":"2","name":"sqcgq"},{"id":"3","name":"mjcgq"},{"id":"4","name":"qtcgq"},{"id":"5","name":"qyqlcgq"},{"id":"6","name":"ktcgq"},{"id":"7","name":"xlcgq"},{"id":"8","name":"dwdcgq"},{"id":"9","name":"stwdcgq"},{"id":"10","name":"ylcgq"}],
         dyTypes: [{"id":"0","name":"shib"},{"id":"1","name":"td"}],
         // 在线/离线
         connectionStatuss:[{"id":"0","name":"zx"},{"id":"1","name":"lix"}],

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

@@ -331,49 +331,13 @@
 
       </el-tab-pane>
       <el-tab-pane :label="$t('dwdcgq')" name="8" lazy  style="height: 700px;overflow-y: auto">
-        <el-row >
-          <el-col v-for="(item1, index) in sensorStatusList">
-            <el-card   style="height: 600px ;border-radius: 15px" >
-              <!--<div slot="header" style="display: flex;"><span style=" font-size: 20px; font-weight: bold;">{{item1.sensorName}}</span></div>-->
-              <el-table max-height="220"  :data="sensorStatusList" :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
-                <!--<el-table-column type="selection" width="55" align="center" />-->
-                <el-table-column :label="$t('sbmc')" prop="productName" :min-width="getStringWidth($t('sbmc'))" />
-                <el-table-column :label="$t('sbbh')" prop="productNumber" :min-width="getStringWidth($t('sbbh'))"/>
-                <el-table-column label="设备id" v-if="false" prop="productId"   />
-                <el-table-column :label="$t('cgqxh')" prop="sensorId" :show-overflow-tooltip="true"   :min-width="getStringWidth($t('cgqxh'))"/>
-                <el-table-column :label="$t('cgqmc')" prop="sensorName" :show-overflow-tooltip="true"   :min-width="getStringWidth($t('cgqmc'))"/>
-                <el-table-column :label="$t('lx')" prop="sensorType" :min-width="getStringWidth($t('lx'))"/>
-                <!--<el-table-column :label="'COM'+$t('kh')" prop="comSlogan" :min-width="getStringWidth('COM'+$t('kh'))"/>-->
-                <el-table-column v-if="activeName==='0' ||  activeName==='1' ||  activeName==='5' ||  activeName==='6' "  :label="$t('dz')" prop="sensorAddr" align="center"  />
-                <el-table-column :label="$t('btl')"  v-if="activeName==='0' ||  activeName==='1' || activeName==='5' ||  activeName==='6' "  align="center" prop="sensorBaud" :min-width="getStringWidth($t('btl'))"/>
-                <el-table-column :label="$t('ljzt')" align="center" prop="connectionStatus" :min-width="getStringWidth($t('ljzt'))">
-                  <template slot-scope="scope">
-                    <span v-if="scope.row.connectionStatus=='1'" style="color: red">{{getDity(scope.row,'connectionStatus')}}</span>
-                    <span v-else style="color: green">{{getDity(scope.row,'connectionStatus')}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column v-if="activeName==='0'  || activeName==='8' " :label="$t('wdz')+'(℃)'" align="center" prop="temperatureValue" :min-width="getStringWidth($t('wdz'))"/>
-                <el-table-column v-if="activeName==='0'" :label="$t('sdz')+'(%)'" align="center" prop="humidityValue" :min-width="getStringWidth($t('sdz'))"/>
-                <el-table-column v-if="activeName==='1'" :label="$t('bjzt')" align="center" prop="alarmStatus" :min-width="getStringWidth($t('bjzt'))">
-                  <template slot-scope="scope">
-                    <span>{{getDity(scope.row,'alarmStatus')}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column v-if="activeName==='2'" :label="$t('sqrzt')" align="center" prop="waterImmersionState" :min-width="getStringWidth($t('sqrzt'))">
-                  <template slot-scope="scope">
-                    <span>{{getDity(scope.row,'waterImmersionState')}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column v-if="activeName==='3'" :label="$t('mjsfzt')" align="center" prop="accessControlStatus" :min-width="getStringWidth($t('mjsfzt'))">
-                  <template slot-scope="scope">
-                    <span>{{getDity(scope.row,'accessControlStatus')}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column v-if="activeName==='4'" :label="$t('qtld')" align="center" prop="gasConcentration" :min-width="getStringWidth($t('qtld'))"/>
-                <el-table-column v-if="activeName==='5'" :label="$t('qlz')+'(m/s)'" align="center" prop="airflowValue" :min-width="getStringWidth($t('qlz'))"/>
-                <el-table-column v-if="activeName==='5'" :label="$t('qyz')+'(MPa)'" align="center" prop="airPressureValue" :min-width="getStringWidth($t('qyz'))"/>
-              </el-table>
-
+        <el-row    class="elRow" >
+          <el-col v-for="(item, index) in sensorStatusList" :span="12"   >
+            <el-card   style="height: 400px ;border-radius: 15px" >
+              <div slot="header" style="display: flex;"><span style=" font-size: 20px; font-weight: bold;">{{item.sensorName}}</span></div>
+              <div style="width: 100%">
+                <div   :id="'sbCgqRefGl'+item.sensorId" v-if="activeName === '8'" style="height: 310px; width: 100%;min-width: 600px;"></div>
+              </div>
             </el-card>
           </el-col>
         </el-row>
@@ -518,7 +482,7 @@
           if(response.data==null ||  response==null){
             this.$modal.msgSuccess(this.$t('zwsj'));
           }
-        if(this.activeName=='0' || this.activeName=='4' || this.activeName=='5' || this.activeName=='9' || this.activeName=='10'){
+        if(this.activeName=='0' || this.activeName=='4' || this.activeName=='5' || this.activeName=='8' || this.activeName=='9' || this.activeName=='10'){
           for(var y=0;y< this.sensorStatusList.length;y++){
             var reData=this.sensorStatusList[y];
             const typeDataList=reData.typeData;
@@ -651,7 +615,7 @@
           id=row.alarmStatus
         }else if(type=='leakageStatus'){
           formTrain=this.leakageStatuss
-          id=row.alarmStatus
+          id=row.leakageStatus
         }
         else if(type=='connectionStatus'){
           formTrain=this.connectionStatuss

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

@@ -78,8 +78,8 @@
             <el-table-column v-if="tab.id==='5'" :label="$t('qlz')+'(m/s)'" align="center" prop="airflowValue" :min-width="getStringWidth($t('qlz'))"/>
             <el-table-column v-if="tab.id==='5'" :label="$t('qyz')+'(MPa)'" align="center" prop="airPressureValue" :min-width="getStringWidth($t('qyz'))"/>
             <el-table-column :label="$t('cz')" align="center" min-width="110"  class-name="small-padding fixed-width"  >
-              <template slot-scope="scope" >
-                <el-button
+              <template slot-scope="scope">
+                <el-button  v-if="tab.id !='7'"
                   size="mini"
                   type="text"
                   @click="sensorStatusUpdate(scope.row)"
@@ -365,7 +365,7 @@
           id=row.alarmStatus
         }else if(type=='leakageStatus'){
           formTrain=this.leakageStatuss
-          id=row.alarmStatus
+          id=row.leakageStatus
         }
         else if(type=='connectionStatus'){
           formTrain=this.connectionStatuss