新增：历史详情

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

@@ -0,0 +1,423 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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-form-item label="联锁总表id">
+              <a-input placeholder="请输入联锁总表id" v-model="queryParam.summaryid"></a-input>
+            </a-form-item>
+          </a-col> -->
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="联锁名称">
+              <a-input placeholder="请输入联锁名称" v-model="queryParam.interlockname"></a-input>
+            </a-form-item>
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="联锁条件">
+                <a-input placeholder="请输入联锁条件" v-model="queryParam.interlockConditionTag"></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> -->
+          <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">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+      <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-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <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>
+    </div> -->
+
+    <!-- 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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div> -->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import { httpAction, getAction } from '@/api/manage'
+
+  export default {
+    name: 'InterlockHistoryDetailList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        description: '联锁历史详细信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          // {
+          //   title:'联锁总表id',
+          //   align:"center",
+          //   dataIndex: 'summaryid'
+          // },
+          {
+            title:'联锁名称',
+            align:"center",
+            dataIndex: 'interlockname',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan}};
+            },
+          },
+          // {
+          //   // title:'联锁条件值',
+          //   title:'联锁条件',
+          //   align:"center",
+          //   dataIndex: 'interlockCondition'
+          // },
+          {
+            // title:'联锁条件点位',
+            title:'联锁条件',
+            align:"center",
+            dataIndex: 'interlockConditionTag'
+          },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'description'
+          },
+          {
+            title:'逻辑关系',
+            align:"center",
+            dataIndex: 'ljgx',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan2}};
+            },
+          },
+          {
+            title:'联锁设定值',
+            align:"center",
+            dataIndex: 'interlockSetValue'
+          },
+          {
+            title:'当前值',
+            align:"center",
+            dataIndex: 'currentValue'
+          },
+          {
+            title:'是否旁路',
+            align:"center",
+            dataIndex: 'ifBypass_dictText'
+          },
+          {
+            title:'联锁输出值',
+            align:"center",
+            dataIndex: 'interlockOutValue',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            },
+          },
+          {
+            title:'输入卡件状态',
+            align:"center",
+            dataIndex: 'inputStatus'
+          },
+          {
+            title:'输出卡件状态',
+            align:"center",
+            dataIndex: 'outputStatus'
+          },
+          {
+            title:'MP状态',
+            align:"center",
+            dataIndex: 'mpStatus'
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/history/interlockDetailHistory/list2",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      // this.queryParam.summaryid = this.$route.query.summaryid
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      loadData(arg) {
+        let that = this
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        if (this.$route.query.summaryid) {
+          this.queryParam.summaryid = this.$route.query.summaryid
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              // 合并单元格
+              //判断跨行
+              let rowSpan = 0
+              let rowSpan2 = 0
+              let rowSpan3 = 0
+              let interlockname = ''
+              let interlocknamePD = ''
+              let ljgx = ''
+              let interlockOutValue = ''
+              for (let i = that.dataSource.length-1; i >= 0; i--) {
+                // 联锁名称合并
+                if (interlockname == '') {
+                  that.dataSource[i].rowSpan = 0
+                  interlockname = that.dataSource[i].interlockname
+                  rowSpan++
+                } else {
+                  if(interlockname == that.dataSource[i].interlockname){
+                    that.dataSource[i].rowSpan = 0
+                    rowSpan++
+                  }else{
+                    that.dataSource[i+1].rowSpan = rowSpan
+                    that.dataSource[i].rowSpan = 0
+                    rowSpan = 1
+                    interlockname = that.dataSource[i].interlockname
+                  }
+                }
+                // 联锁状态合并
+                if (ljgx == '') {
+                  that.dataSource[i].rowSpan2 = 0
+                  ljgx = that.dataSource[i].ljgx
+                  interlocknamePD = that.dataSource[i].interlockname
+                  rowSpan2++
+                } else {
+                  if(ljgx == that.dataSource[i].ljgx){
+                    // that.dataSource[i].rowSpan2 = 0
+                    // rowSpan2++
+                    if (interlocknamePD == that.dataSource[i].interlockname) {
+                      that.dataSource[i].rowSpan2 = 0
+                      rowSpan2++
+                    } else {
+                      that.dataSource[i+1].rowSpan2 = rowSpan2
+                      that.dataSource[i].rowSpan2 = 0
+                      rowSpan2 = 1
+                      ljgx = that.dataSource[i].ljgx
+                      interlocknamePD = that.dataSource[i].interlockname
+                    }
+                  }else{
+                    that.dataSource[i+1].rowSpan2 = rowSpan2
+                    that.dataSource[i].rowSpan2 = 0
+                    rowSpan2 = 1
+                    ljgx = that.dataSource[i].ljgx
+                    interlocknamePD = that.dataSource[i].interlockname
+                  }
+
+                }
+                // 回路健康级别合并
+                if (interlockOutValue === '') {
+                  // console.log('第一层')
+                  that.dataSource[i].rowSpan3 = 0
+                  interlockOutValue = that.dataSource[i].interlockOutValue
+                  interlocknamePD = that.dataSource[i].interlockname
+                  rowSpan3++
+                } else {
+                  if(interlockOutValue == that.dataSource[i].interlockOutValue){
+                    // console.log(99,i,interlocknamePD,that.dataSource[i+1].interlockname)
+                    if (interlocknamePD == that.dataSource[i+1].interlockname) {
+                      // console.log(11111)
+                      that.dataSource[i].rowSpan3 = 0
+                      rowSpan3++
+                    } else {
+                      // console.log(22222)
+                      that.dataSource[i+1].rowSpan3 = rowSpan3
+                      that.dataSource[i].rowSpan3 = 0
+                      rowSpan3 = 1
+                      interlockOutValue = that.dataSource[i].interlockOutValue
+                      interlocknamePD = that.dataSource[i].interlockname
+                    }
+                  }else{
+                    // console.log('第二层else')
+                    that.dataSource[i+1].rowSpan3 = rowSpan3
+                    that.dataSource[i].rowSpan3 = 0
+                    rowSpan3 = 1
+                    interlockOutValue = that.dataSource[i].interlockOutValue
+                    interlocknamePD = that.dataSource[i].interlockname
+                  }
+
+                }
+              }
+              that.dataSource[0].rowSpan = rowSpan
+              that.dataSource[0].rowSpan2 = rowSpan2
+              that.dataSource[0].rowSpan3 = rowSpan3
+              this.ipagination.total = res.result.total;
+            }else{
+              this.ipagination.total = 0;
+            }
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        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:'interlockConditionTag',text:'联锁条件点位',dictCode:''})
+        fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
+        fieldList.push({type:'string',value:'deviceId',text:'设备id',dictCode:''})
+        fieldList.push({type:'string',value:'moduleName',text:'模块名称',dictCode:''})
+        fieldList.push({type:'string',value:'instrumentStatus',text:'仪表状态',dictCode:''})
+        fieldList.push({type:'string',value:'instrumentStatusJuge',text:'仪表状态判断方式',dictCode:'instrument_status_juge'})
+        fieldList.push({type:'string',value:'instrumentStatusTag',text:'仪表状态点位',dictCode:''})
+        fieldList.push({type:'string',value:'instrumentStatusValue',text:'仪表状态值',dictCode:''})
+        fieldList.push({type:'string',value:'ysmnlTag',text:'原始模拟量位号',dictCode:''})
+        fieldList.push({type:'string',value:'ysmnlValue',text:'原始模拟量值',dictCode:''})
+        fieldList.push({type:'string',value:'upperLimit',text:'高限',dictCode:''})
+        fieldList.push({type:'string',value:'lowerLimit',text:'低限',dictCode:''})
+        fieldList.push({type:'string',value:'thresholdValue',text:'阈值',dictCode:''})
+        fieldList.push({type:'string',value:'thresholdTime',text:'时间',dictCode:''})
+        fieldList.push({type:'string',value:'thresholdTimeUnit',text:'时间单位',dictCode:''})
+        fieldList.push({type:'string',value:'interlockSetValue',text:'联锁设定值',dictCode:''})
+        fieldList.push({type:'string',value:'interlockSetTag',text:'联锁设定值点位',dictCode:''})
+        fieldList.push({type:'string',value:'currentValue',text:'当前值',dictCode:''})
+        fieldList.push({type:'string',value:'currentValueTag',text:'当前值位号',dictCode:''})
+        fieldList.push({type:'string',value:'ifBypass',text:'是否旁路',dictCode:''})
+        fieldList.push({type:'string',value:'ifBypassTag',text:'旁路状态点位',dictCode:''})
+        fieldList.push({type:'string',value:'inputStatus',text:'输入卡件状态',dictCode:''})
+        fieldList.push({type:'string',value:'inputStatusTag',text:'输入卡件状态点位',dictCode:''})
+        fieldList.push({type:'string',value:'outputStatus',text:'输出卡件状态',dictCode:''})
+        fieldList.push({type:'string',value:'outputStatusTag',text:'输出卡件状态点位',dictCode:''})
+        fieldList.push({type:'string',value:'mpStatus',text:'MP状态',dictCode:''})
+        fieldList.push({type:'string',value:'mpStatusTag',text:'状态点位',dictCode:''})
+        fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

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

@@ -470,7 +470,7 @@
       },
       handleDetail(record){
         console.log(record)
-        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid}})
+        this.$router.push({path: '/interLock/history/detail',query:{summaryid:record.summaryid}})
       },
       initDictConfig(){
       },