Merge remote-tracking branch 'origin/master'

src/views/module_interLock/InterlockDetail/InterlockDetailList.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="联锁总表id">
               <a-input placeholder="请输入联锁总表id" v-model="queryParam.summaryid"></a-input>
             </a-form-item>
@@ -13,27 +13,27 @@
             <a-form-item label="联锁名称">
               <a-input placeholder="请输入联锁名称" v-model="queryParam.interlockname"></a-input>
             </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="联锁条件值">
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="联锁条件">
                 <a-input placeholder="请输入联锁条件值" v-model="queryParam.interlockCondition"></a-input>
               </a-form-item>
             </a-col>
+          <!-- <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="仪表状态判断方式">
                 <j-dict-select-tag placeholder="请选择仪表状态判断方式" v-model="queryParam.instrumentStatusJuge" dictCode="instrument_status_juge"/>
               </a-form-item>
             </a-col>
-          </template>
+          </template> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -43,27 +43,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
       <a-button type="primary" icon="download" @click="handleExportXls('联锁详细信息表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <!-- <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>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      </div> -->
 
       <a-table
         ref="table"
@@ -75,9 +75,9 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -145,7 +145,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -154,95 +154,36 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'联锁总表id',
-            align:"center",
-            dataIndex: 'summaryid'
-          },
+          // {
+          //   title:'联锁总表id',
+          //   align:"center",
+          //   dataIndex: 'summaryid'
+          // },
           {
             title:'联锁名称',
             align:"center",
             dataIndex: 'interlockname'
           },
           {
-            title:'联锁条件值',
+            // title:'联锁条件值',
+            title:'联锁条件',
             align:"center",
             dataIndex: 'interlockCondition'
           },
-          {
-            title:'联锁条件点位',
-            align:"center",
-            dataIndex: 'interlockConditionTag'
-          },
+          // {
+          //   title:'联锁条件点位',
+          //   align:"center",
+          //   dataIndex: 'interlockConditionTag'
+          // },
           {
             title:'描述',
             align:"center",
             dataIndex: 'description'
           },
           {
-            title:'设备id',
-            align:"center",
-            dataIndex: 'deviceId'
-          },
-          {
-            title:'模块名称',
-            align:"center",
-            dataIndex: 'moduleName'
-          },
-          {
-            title:'仪表状态',
-            align:"center",
-            dataIndex: 'instrumentStatus'
-          },
-          {
-            title:'仪表状态判断方式',
-            align:"center",
-            dataIndex: 'instrumentStatusJuge_dictText'
-          },
-          {
-            title:'仪表状态点位',
-            align:"center",
-            dataIndex: 'instrumentStatusTag'
-          },
-          {
-            title:'仪表状态值',
-            align:"center",
-            dataIndex: 'instrumentStatusValue'
-          },
-          {
-            title:'原始模拟量位号',
-            align:"center",
-            dataIndex: 'ysmnlTag'
-          },
-          {
-            title:'原始模拟量值',
-            align:"center",
-            dataIndex: 'ysmnlValue'
-          },
-          {
-            title:'高限',
+            title:'逻辑关系',
             align:"center",
-            dataIndex: 'upperLimit'
-          },
-          {
-            title:'低限',
-            align:"center",
-            dataIndex: 'lowerLimit'
-          },
-          {
-            title:'阈值',
-            align:"center",
-            dataIndex: 'thresholdValue'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'thresholdTime'
-          },
-          {
-            title:'时间单位',
-            align:"center",
-            dataIndex: 'thresholdTimeUnit'
+            dataIndex: 'ljgx'
           },
           {
             title:'联锁设定值',
@@ -250,29 +191,19 @@
             dataIndex: 'interlockSetValue'
           },
           {
-            title:'联锁设定值点位',
-            align:"center",
-            dataIndex: 'interlockSetTag'
-          },
-          {
             title:'当前值',
             align:"center",
             dataIndex: 'currentValue'
           },
           {
-            title:'当前值位号',
-            align:"center",
-            dataIndex: 'currentValueTag'
-          },
-          {
             title:'是否旁路',
             align:"center",
             dataIndex: 'ifBypass'
           },
           {
-            title:'旁路状态点位',
+            title:'联锁输出值',
             align:"center",
-            dataIndex: 'ifBypassTag'
+            dataIndex: 'interlockOutValue'
           },
           {
             title:'输入卡件状态',
@@ -280,46 +211,26 @@
             dataIndex: 'inputStatus'
           },
           {
-            title:'输入卡件状态点位',
-            align:"center",
-            dataIndex: 'inputStatusTag'
-          },
-          {
             title:'输出卡件状态',
             align:"center",
             dataIndex: 'outputStatus'
           },
           {
-            title:'输出卡件状态点位',
-            align:"center",
-            dataIndex: 'outputStatusTag'
-          },
-          {
             title:'MP状态',
             align:"center",
             dataIndex: 'mpStatus'
           },
-          {
-            title:'状态点位',
-            align:"center",
-            dataIndex: 'mpStatusTag'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
-          list: "/detail/interlockDetail/list",
+          list: "/detail/interlockDetail/list2",
           delete: "/detail/interlockDetail/delete",
           deleteBatch: "/detail/interlockDetail/deleteBatch",
           exportXlsUrl: "/detail/interlockDetail/exportXls",
@@ -345,7 +256,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'summaryid',text:'联锁总表id',dictCode:''})
         fieldList.push({type:'string',value:'interlockname',text:'联锁名称',dictCode:''})
-        fieldList.push({type:'string',value:'interlockCondition',text:'联锁条件值',dictCode:''})
+        fieldList.push({type:'string',value:'interlockCondition',text:'联锁条件',dictCode:''})
         fieldList.push({type:'string',value:'interlockConditionTag',text:'联锁条件点位',dictCode:''})
         fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
         fieldList.push({type:'string',value:'deviceId',text:'设备id',dictCode:''})