历史数据优化

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

@@ -1,24 +1,495 @@
 <template>
-  <div>
-    111
-  </div>
+  <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="联锁名称">
+              <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.interlockStatus"></a-input> -->
+              <j-dict-select-tag v-model="queryParam.interlockStatus" placeholder="请输入联锁状态" dictCode="interlock_status"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="回路健康级别">
+                <!-- <a-input placeholder="请输入回路健康级别" v-model="queryParam.loopHealthLevel"></a-input> -->
+                <a-select placeholder="请输入回路健康级别" v-model="queryParam.loopHealthLevel" allowClear :options="healthLevelOption"></a-select>
+              </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 v-if="interlockType == '1'" @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"
+        :customRow="customRow"
+        @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>
+
+    <!-- <interlock-summary-modal ref="modalForm" @ok="modalFormOk"></interlock-summary-modal> -->
+  </a-card>
 </template>
 
 <script>
-export default {
-  name: '',
-  data () {
-    return {
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  // import InterlockSummaryModal from './modules/InterlockSummaryModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import { httpAction, getAction } from '@/api/manage'
+
+  export default {
+    name: 'InterlockSummaryList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      // InterlockSummaryModal
+    },
+    props: {
+      selectData: {
+        type: Object,
+        default: function(){
+            return {} // 使用工厂函数返回默认值
+        }
+      },
+    },
+    data () {
+      return {
+        description: '联锁总表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'联锁名称',
+            align:"center",
+            dataIndex: 'interlockname',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan}};
+            },
+          },
+          {
+            title:'联锁条件',
+            align:"center",
+            dataIndex: 'interlockConditionTag'
+          },
+          {
+            title:'仪表状态',
+            align:"center",
+            dataIndex: 'instrumentStatus_dictText'
+          },
+          // {
+          //   title:'系统id',
+          //   align:"center",
+          //   dataIndex: 'interlockSystemId'
+          // },
+          // {
+          //   title:'装置id',
+          //   align:"center",
+          //   dataIndex: 'interlockApparatusId'
+          // },
+          {
+            title:'联锁状态',
+            align:"center",
+            dataIndex: 'interlockStatus_dictText',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan2}};
+            },
+          },
+          {
+            title:'控制系统状态',
+            align:"center",
+            dataIndex: 'controlSystemStatus_dictText',
+          },
+          {
+            title:'回路健康级别',
+            align:"center",
+            dataIndex: 'loopHealthLevel',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            },
+          },
+          {
+            title:'旁路状态',
+            align:"center",
+            dataIndex: 'bypass_dictText',
+          },
+          // {
+          //   title:'逻辑关系',
+          //   align:"center",
+          //   dataIndex: 'ljgx'
+          // },
+          // {
+          //   title:'联锁输出值',
+          //   align:"center",
+          //   dataIndex: 'interlockOutValue'
+          // },
+          // {
+          //   title:'联锁输出值点位',
+          //   align:"center",
+          //   dataIndex: 'interlockOutValueTag'
+          // },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            // 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",
+          delete: "/summary/interlockSummary/delete",
+          deleteBatch: "/summary/interlockSummary/deleteBatch",
+          exportXlsUrl: "/summary/interlockSummary/exportXls",
+          importExcelUrl: "summary/interlockSummary/importExcel",
+
+        },
+        // 回路健康级别下拉列表
+        healthLevelOption: [
+          {value: 'A', label: 'A'},
+          {value: 'B', label: 'B'},
+          {value: 'C', label: 'C'},
+          {value: 'D', label: 'D'},
+        ],
+        dictOptions:{},
+        superFieldList:[],
+        mouseSummaryid: '',
+        // 判断点击的是否为系统（0为装置，1为系统，2为未选中）
+        interlockType: '',
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      // 合并后悬浮行背景色一起显示
+      customRow(record, index) {
+        return {
+          style: {
+          //样式
+            'background-color': record.summaryid === this.mouseSummaryid ? '#e6faff' : ''
+          },
+          on: {
+            // 鼠标移入
+            mouseenter: event => {
+              // 维护一个变量记录当前行id 因为我是根据id来进行行合并的
+              this.mouseSummaryid = record.summaryid
+            },
+            //移除 清除id 还原样式
+            mouseleave: (event) => {
+              this.mouseSummaryid = ''
+            },
+            // 点击合并行颜色未一起改变-待优化
+            click: (event) => {
+              this.mouseSummaryid = record.summaryid
+            },
+          }
+        }
+      },
+      // 处理父组件传过来的数据
+      getDataList(){
+        console.log(111,this.selectData)
+        this.interlockType = this.selectData.interlockType
+        if (this.selectData.interlockType == 1) {
+          this.queryParam.interlockApparatusId = ''
+          this.queryParam.interlockSystemId = this.selectData.id
+        } else {
+          this.queryParam.interlockSystemId = ''
+          this.queryParam.interlockApparatusId = this.selectData.id
+        }
+        this.loadData()
+      },
+      searchReset() {
+        this.interlockType = 2
+        this.queryParam = {}
+        this.loadData(1);
+      },
+      loadData(arg) {
+        let that = this
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        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 interlockStatus = ''
+              let loopHealthLevel = ''
+              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 (interlockStatus == '') {
+                  that.dataSource[i].rowSpan2 = 0
+                  interlockStatus = that.dataSource[i].interlockStatus
+                  interlocknamePD = that.dataSource[i].interlockname
+                  rowSpan2++
+                } else {
+                  if(interlockStatus == that.dataSource[i].interlockStatus){
+                    // 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
+                      interlockStatus = that.dataSource[i].interlockStatus
+                      interlocknamePD = that.dataSource[i].interlockname
+                    }
+                  }else{
+                    that.dataSource[i+1].rowSpan2 = rowSpan2
+                    that.dataSource[i].rowSpan2 = 0
+                    rowSpan2 = 1
+                    interlockStatus = that.dataSource[i].interlockStatus
+                    interlocknamePD = that.dataSource[i].interlockname
+                  }
+
+                }
+                // 回路健康级别合并
+                if (loopHealthLevel === '') {
+                  // console.log('第一层')
+                  that.dataSource[i].rowSpan3 = 0
+                  // // 判断回路健康级别是否为空（不会出现此类问题）
+                  // if (that.dataSource[i].loopHealthLevel != '') {
+                  //   console.log('走不走这步')
+                  //   loopHealthLevel = that.dataSource[i].loopHealthLevel
+                  //   interlocknamePD = that.dataSource[i].interlockname
+                  //   rowSpan3++
+                  // }
+                  loopHealthLevel = that.dataSource[i].loopHealthLevel
+                  interlocknamePD = that.dataSource[i].interlockname
+                  rowSpan3++
+                } else {
+                  if(loopHealthLevel == that.dataSource[i].loopHealthLevel){
+                    // 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
+                      loopHealthLevel = that.dataSource[i].loopHealthLevel
+                      interlocknamePD = that.dataSource[i].interlockname
+                    }
+                  }else{
+                    // console.log('第二层else')
+                    that.dataSource[i+1].rowSpan3 = rowSpan3
+                    that.dataSource[i].rowSpan3 = 0
+                    rowSpan3 = 1
+                    loopHealthLevel = that.dataSource[i].loopHealthLevel
+                    interlocknamePD = that.dataSource[i].interlockname
+                  }
+
+                }
+              }
+              that.dataSource[0].rowSpan = rowSpan
+              that.dataSource[0].rowSpan2 = rowSpan2
+              that.dataSource[0].rowSpan3 = rowSpan3
+              // console.log(22222222222,that.dataSource)
+
+
+              // console.log('返回的是',res.result.total)
+              this.ipagination.total = res.result.total;
+              // console.log('页码',this.ipagination.total)
+            }else{
+              this.ipagination.total = 0;
+            }
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      // 新增传值
+      handleAdd() {
+        this.$refs.modalForm.add();
+        this.$refs.modalForm.title = "新增";
+        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.addInterlock = this.selectData;
+      },
+      handleDetail(record){
+        console.log(record)
+        this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid}})
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'interlockname',text:'联锁名称',dictCode:''})
+        fieldList.push({type:'string',value:'interlockSystemId',text:'系统id',dictCode:''})
+        fieldList.push({type:'string',value:'interlockApparatusId',text:'装置id',dictCode:''})
+        fieldList.push({type:'string',value:'interlockStatus',text:'联锁状态',dictCode:'interlock_status'})
+        fieldList.push({type:'string',value:'loopHealthLevel',text:'回路健康级别',dictCode:''})
+        fieldList.push({type:'string',value:'ljgx',text:'逻辑关系',dictCode:''})
+        fieldList.push({type:'string',value:'interlockOutValue',text:'联锁输出值',dictCode:''})
+        fieldList.push({type:'string',value:'interlockOutValueTag',text:'联锁输出值点位',dictCode:''})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        this.superFieldList = fieldList
+      }
     }
-  },
-  created () {
-  },
-  mounted () {
-  },
-  methods: {
   }
-}
 </script>
-
-<style lang="less" scoped>
-</style>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_interLock/interlockHistoryData/InterlockHistoryIndex.vue

@@ -4,8 +4,8 @@
             <u-equipment-tree @select="selectEquipment"></u-equipment-tree>
         </div>
         <div class="right">
-          <!-- <interlock-history-list ref="summaryList" :selectData="selectData"></interlock-history-list> -->
-          <interlock-summary-list ref="summaryList" :selectData="selectData"></interlock-summary-list>
+          <interlock-history-list ref="summaryList" :selectData="selectData"></interlock-history-list>
+          <!-- <interlock-summary-list ref="summaryList" :selectData="selectData"></interlock-summary-list> -->
         </div>
     </div>
 </template>