src/views/module_interLock/InterlockDetail/InterlockDetailList.vue

@@ -198,11 +198,11 @@
             align:"center",
             dataIndex: 'interlockSetValue'
           },
-          {
-            title:'当前值',
-            align:"center",
-            dataIndex: 'currentValue'
-          },
+          // {
+          //   title:'当前值',
+          //   align:"center",
+          //   dataIndex: 'currentValue'
+          // },
           {
             title:'是否旁路',
             align:"center",
@@ -275,6 +275,7 @@
         if (this.$route.query.summaryid) {
           this.queryParam.summaryid = this.$route.query.summaryid
         }
+        this.queryParam.interlockSystemId = this.$route.query.interlockSystemId
         var params = this.getQueryParams();//查询条件
         this.loading = true;
         getAction(this.url.list, params).then((res) => {

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -58,7 +58,7 @@
     <!-- table区域-begin -->
     <div>
       <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <span style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div> -->
 
@@ -217,8 +217,24 @@
             title:'回路健康级别',
             align:"center",
             dataIndex: 'loopHealthLevel',
-            customRender:function (t,r,index) {
-              return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            // customRender:function (t,r,index) {
+            //   return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            // },
+            customRender:(t,record,index)=> {
+              console.log('t是什么',t)
+              const text = record.loopHealthLevel
+              var childrenMore = (
+                // <a-tooltip>
+                //   <template slot="title">
+                //     A：全部正常；
+                //     B：有一个有问题；
+                //     C：有两个有问题；
+                //     D：全部故障
+                //   </template>
+                  <span >{{ text }}</span>
+                // </a-tooltip>
+              )
+              return {children: childrenMore,attrs: {rowSpan:record.rowSpan3}};
             },
           },
           // {
@@ -501,7 +517,7 @@
       },
       handleDetail(record){
         console.log(record)
-        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid}})
+        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid,interlockSystemId:record.interlockSystemId}})
       },
       initDictConfig(){
       },

src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-divider orientation="left"> <span style="font-size: 12px;">基本信息</span> </a-divider>
           <a-col :span="24">
-            <a-form-model-item label="联锁条件位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockConditionData">
+            <a-form-model-item label="联锁条件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockConditionData">
               <a-cascader
                 v-model="model.interlockConditionData"
                 :options="tagDataOptions"
@@ -21,50 +21,50 @@
               <a-input v-model="model.interlockSetValue" placeholder="请输入描述"></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="当前值位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentValueData">
+          <!-- <a-col :span="24">
+            <a-form-model-item label="当前值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentValueData">
               <a-cascader
                 v-model="model.currentValueData"
                 :options="tagDataOptions"
                 :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择当前值位号"/>
+                placeholder="请选择当前值"/>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
-            <a-form-model-item label="输入卡件状态位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inputStatusData">
+            <a-form-model-item label="输入卡件状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inputStatusData">
               <a-cascader
                 v-model="model.inputStatusData"
                 :options="tagDataOptions"
                 :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择输入卡件状态位号"
+                placeholder="请选择输入卡件状态"
               />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="输出卡件状态位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outputStatusData">
+            <a-form-model-item label="输出卡件状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outputStatusData">
               <a-cascader
                 v-model="model.outputStatusData"
                 :options="tagDataOptions"
                 :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择输出卡件状态位号"
+                placeholder="请选择输出卡件状态"
               />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="MP状态位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mpStatusData">
+            <a-form-model-item label="MP状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mpStatusData">
               <a-cascader
                 v-model="model.mpStatusData"
                 :options="tagDataOptions"
                 :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择MP状态位号"
+                placeholder="请选择MP状态"
               />
             </a-form-model-item>
           </a-col>
@@ -81,27 +81,27 @@
           </a-col>
           <template v-if="model.instrumentStatusJuge === '0'">
             <a-col :span="24">
-              <a-form-model-item label="仪表状态位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusData">
+              <a-form-model-item label="仪表状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusData">
                 <a-cascader
                 v-model="model.instrumentStatusData"
                 :options="tagDataOptions"
                 :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择仪表状态位号"/>
+                placeholder="请选择仪表状态"/>
               </a-form-model-item>
             </a-col>
           </template>
           <template v-if="model.instrumentStatusJuge === '1'">
             <a-col :span="24">
-              <a-form-model-item label="原始模拟量位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlData">
+              <a-form-model-item label="原始模拟量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlData">
                 <a-cascader
                   v-model="model.ysmnlData"
                   :options="tagDataOptions"
                   :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
-                  placeholder="请选择原始模拟量位号"
+                  placeholder="请选择原始模拟量"
                 />
               </a-form-model-item>
             </a-col>
@@ -118,14 +118,14 @@
           </template>
           <template v-if="model.instrumentStatusJuge === '2'">
             <a-col :span="24">
-              <a-form-model-item label="原始模拟量位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlData">
+              <a-form-model-item label="原始模拟量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlData">
                 <a-cascader
                   v-model="model.ysmnlData"
                   :options="tagDataOptions"
                   :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
-                  placeholder="请选择原始模拟量位号"
+                  placeholder="请选择原始模拟量"
                 />
               </a-form-model-item>
             </a-col>
@@ -181,7 +181,7 @@
           <!-- 是否旁路 -->
           <a-divider orientation="left"> <span style="font-size: 12px;">旁路状态</span> </a-divider>
           <a-col :span="24">
-            <a-form-model-item label="是否有旁路位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypass">
+            <a-form-model-item label="是否有旁路" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypass">
               <a-radio-group name="radioGroup" v-model="model.ifBypass">
                 <!--  :default-value="model.ifBypass" -->
                 <a-radio :value="'1'"> 是 </a-radio>
@@ -191,14 +191,14 @@
           </a-col>
           <template v-if="model.ifBypass === '1'">
             <a-col :span="24">
-              <a-form-model-item label="旁路位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bypassData">
+              <a-form-model-item label="旁路" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bypassData">
                 <a-cascader
                 v-model="model.bypassData"
                 :options="tagDataOptions"
                 :display-render="displayRender"
                 :fieldNames="customFieldNames"
                 expand-trigger="hover"
-                placeholder="请选择旁路位号"/>
+                placeholder="请选择旁路"/>
               </a-form-model-item>
             </a-col>
           </template>
@@ -254,17 +254,17 @@
         confirmLoading: true,
         validatorRules: {
           interlockConditionData: [{
-            required: true, message: '请选择联锁条件位号!',
+            required: true, message: '请选择联锁条件!',
           }],
           instrumentStatusJuge: [{
             required: true, message: '请选择仪表状态判定依据!',
           }],
           instrumentStatusData: [{
-            required: true, message: '请选择仪表状态位号!',
+            required: true, message: '请选择仪表状态!',
           }],
           // 高低限
           ysmnlData: [{
-            required: true, message: '请选择原始模拟量位号!',
+            required: true, message: '请选择原始模拟量!',
           }],
           upperLimit: [{
             required: true, message: '请输入高限值!',
@@ -293,13 +293,13 @@
             required: true, message: '请输入联锁设定值!',
           }],
           currentValueData: [{
-            required: true, message: '请选择当前值位号!',
+            required: true, message: '请选择当前值!',
           }],
           ifBypass: [{
             required: true, message: '请选择是否旁路!',
           }],
           bypassData: [{
-            required: true, message: '请选择旁路位号!',
+            required: true, message: '请选择旁路!',
           }],
           bypassNo: [{
             required: true, message: '请选择旁路状态!',
@@ -308,13 +308,13 @@
             required: true, message: '请选择!',
           }],
           interlockConditionData: [{
-            required: true, message: '请选择输入卡件状态位号!',
+            required: true, message: '请选择输入卡件状态!',
           }],
           outputStatusData: [{
-            required: true, message: '请选择输出卡件状态位号!',
+            required: true, message: '请选择输出卡件状态!',
           }],
           mpStatusData: [{
-            required: true, message: '请选择MP状态位号!',
+            required: true, message: '请选择MP状态!',
           }],
         },
         url: {

src/views/module_interLock/InterlockSummary/modules/InterlockSummaryForm.vue

@@ -121,14 +121,14 @@
           <div class="interlock-summary-item-title">联锁输出</div>
           <a-row>
             <a-col :span="12">
-              <a-form-model-item label="联锁输出值位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockOutValueData">
+              <a-form-model-item label="联锁输出值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockOutValueData">
                 <a-cascader
                   v-model="model.interlockOutValueData"
                   :options="tagDataOptions"
                   :display-render="displayRender"
                   :fieldNames="customFieldNames"
                   expand-trigger="hover"
-                  placeholder="请选择位号"
+                  placeholder="请选择"
                   @change="dianwerChange"
                   />
               </a-form-model-item>
@@ -200,7 +200,7 @@
             required: true, message: '请输入逻辑关系!',
           }],
           interlockOutValueData: [{
-            required: true, message: '请选择联锁输出值位号!',
+            required: true, message: '请选择联锁输出值!',
           }],
         },
         url: {
@@ -260,32 +260,32 @@
             dataIndex: 'description'
           },
           {
-            title:'联锁设定值位号',
+            title:'联锁设定值',
             align:"center",
             dataIndex: 'interlockSetValue'
           },
+          // {
+          //   title:'当前值',
+          //   align:"center",
+          //   dataIndex: 'currentValueTag'
+          // },
           {
-            title:'当前值位号',
-            align:"center",
-            dataIndex: 'currentValueTag'
-          },
-          {
-            title:'旁路状态/位号',
+            title:'旁路状态',
             align:"center",
             scopedSlots: { customRender: 'ifBypass' }
           },
           {
-            title:'输入卡件状态位号',
+            title:'输入卡件状态',
             align:"center",
             dataIndex: 'inputStatusTag'
           },
           {
-            title:'输出卡件状态位号',
+            title:'输出卡件状态',
             align:"center",
             dataIndex: 'outputStatusTag'
           },
           {
-            title:'MP状态位号',
+            title:'MP状态',
             align:"center",
             dataIndex: 'mpStatusTag'
           },

src/views/module_interLock/interlockHistoryData/InterlockHistory/HistoryDetailList.vue

@@ -194,11 +194,11 @@
             align:"center",
             dataIndex: 'interlockSetValue'
           },
-          {
-            title:'当前值',
-            align:"center",
-            dataIndex: 'currentValue'
-          },
+          // {
+          //   title:'当前值',
+          //   align:"center",
+          //   dataIndex: 'currentValue'
+          // },
           {
             title:'是否旁路',
             align:"center",

src/views/module_interLock/interlockHistoryData/InterlockHistory/InterlockHistoryList.vue

@@ -172,8 +172,16 @@
             title:'联锁名称',
             align:"center",
             dataIndex: 'interlockname',
-            customRender:function (t,r,index) {
-              return {children: t,attrs: {rowSpan:r.rowSpan}};
+            // customRender:function (t,r,index) {
+            //   return {children: t,attrs: {rowSpan:r.rowSpan}};
+            // },
+            customRender:(t,record,index)=> {
+              console.log('t是什么',t)
+              const text = record.interlockname
+              var childrenMore = (
+                <a onClick={() => {this.handleDetail(record)}}>{{ text }}</a>
+              )
+              return {children: childrenMore,attrs: {rowSpan:record.rowSpan}};
             },
           },
           {
@@ -247,23 +255,23 @@
           //   align:"center",
           //   dataIndex: 'remark'
           // },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:107,
-            // scopedSlots: { customRender: 'action' },
-            customRender: (text,record,index)=> {
-              var childrenDetail = (<a onClick={() => {this.handleDetail(record)}}>详情</a>)
-              return {
-                children: [childrenDetail],
-                attrs: {
-                  rowSpan: record.rowSpan
-                }
-              }
-            },
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:107,
+          //   // scopedSlots: { customRender: 'action' },
+          //   customRender: (text,record,index)=> {
+          //     var childrenDetail = (<a onClick={() => {this.handleDetail(record)}}>详情</a>)
+          //     return {
+          //       children: [childrenDetail],
+          //       attrs: {
+          //         rowSpan: record.rowSpan
+          //       }
+          //     }
+          //   },
+          // }
         ],
         url: {
           list: "/history/interlockDetailHistory/list1",