历史数据详情等

src/views/module_interLock/interlockHistoryData/InterlockHistoryList.vue

@@ -335,7 +335,8 @@
               // this.$router.push({path: '/interLock/detail',query:{summaryid:record.summaryid,interlockSystemId:record.interlockSystemId}})
               var data = {
                 summaryid: record.summaryid,
-                interlockSystemId: record.interlockSystemId
+                interlockSystemId: record.interlockSystemId,
+                detailName: record.interlockname,
               }
               this.$emit('click', data)
             },

src/views/module_interLock/interlockHistoryData/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <template v-if="showPage === 'summary'">
+    <template v-if="showPage === 'history'">
       <a-tabs type="card">
         <a-tab-pane key="historyData">
           <span slot="tab">
@@ -26,7 +26,7 @@
       </a-tabs>
     </template>
     <!-- 详情 -->
-    <interlock-detail-list v-if="showPage === 'detail'" @click="showPage='summary'" ref="summaryDetailRef" :currentData="currentData"></interlock-detail-list>
+    <interlock-detail-list v-if="showPage === 'detail'" @click="showPage='history'" ref="summaryDetailRef" :currentData="currentData"></interlock-detail-list>
   </div>
 </template>
 
@@ -43,9 +43,9 @@
     },
     data () {
       return {
-        showPage: 'summary',
-        treeData: [],
-        selectData: {}
+        showPage: 'history',
+        selectData: {},
+        currentData: {}
       }
     },
     created () {

src/views/module_interLock/interlockHistoryDetail/InterlockHistoryDetailList.vue

@@ -1,126 +1,134 @@
 <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>
+    <div class="interlock-detail-header">
+      <a-icon type="arrow-left" @click="goBack"/>
+      <span>{{currentData.detailName ? currentData.detailName : '详情'}}</span>
     </div>
-    <!-- 查询区域-END -->
+    <div class="iotmenu-content">
+      <a-card :bordered="false" style="background-color: #FAFAFA;">
+        <!-- 查询区域 -->
+        <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> -->
+        <!-- 操作按钮区域 -->
+        <!-- <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> -->
+        <!-- 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}" -->
+          <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>
+            <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>
+            <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-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>
+          </a-table>
+        </div>
+      </a-card>
     </div>
-  </a-card>
+  </div>
 </template>
 
 <script>
@@ -136,6 +144,7 @@
     mixins:[JeecgListMixin, mixinDevice],
     components: {
     },
+    props: ['currentData'],
     data () {
       return {
         description: '联锁历史详细信息表管理页面',
@@ -184,7 +193,7 @@
           {
             title:'逻辑关系',
             align:"center",
-            dataIndex: 'ljgx',
+            dataIndex: 'ljgx_dictText',
             customRender:function (t,r,index) {
               return {children: t,attrs: {rowSpan:r.rowSpan2}};
             },
@@ -202,7 +211,7 @@
           {
             title:'是否旁路',
             align:"center",
-            dataIndex: 'ifBypass_dictText'
+            dataIndex: 'bypassName'
           },
           {
             title:'联锁输出值',
@@ -215,17 +224,22 @@
           {
             title:'输入卡件状态',
             align:"center",
-            dataIndex: 'inputStatus_dictText'
+            dataIndex: 'inputStatusName'
           },
           {
             title:'输出卡件状态',
             align:"center",
-            dataIndex: 'outputStatus_dictText'
+            dataIndex: 'outputStatusName'
           },
           {
             title:'MP状态',
             align:"center",
-            dataIndex: 'mpStatus_dictText'
+            dataIndex: 'mpStatusName'
+          },
+          {
+            title:'时间',
+            align:"center",
+            dataIndex: 'tagTime'
           },
           // {
           //   title: '操作',
@@ -264,10 +278,12 @@
         if (arg === 1) {
           this.ipagination.current = 1;
         }
-        if (this.$route.query.summaryid) {
-          this.queryParam.summaryid = this.$route.query.summaryid
-        }
+        // if (this.$route.query.summaryid) {
+        //   this.queryParam.summaryid = this.$route.query.summaryid
+        // }
         var params = this.getQueryParams();//查询条件
+        params.summaryid = this.currentData.summaryid
+        // params.interlockSystemId = this.currentData.interlockSystemId
         this.loading = true;
         getAction(this.url.list, params).then((res) => {
           if (res.success) {
@@ -378,6 +394,9 @@
           this.loading = false
         })
       },
+      goBack(){
+        this.$emit('click')
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

src/views/module_interLock/interlockSummaryDetail/InterlockSummaryDetailList.vue

@@ -295,10 +295,9 @@
         //   this.queryParam.summaryid = this.$route.query.summaryid
         // }
         // this.queryParam.interlockSystemId = this.$route.query.interlockSystemId
-        this.queryParam.summaryid = this.currentData.summaryid
-        this.queryParam.interlockSystemId = this.currentData.interlockSystemId
         var params = this.getQueryParams();//查询条件
-        // console.log('currentData', this.currentData)
+        params.summaryid = this.currentData.summaryid
+        params.interlockSystemId = this.currentData.interlockSystemId
         
         this.loading = true;
         getAction(this.url.list, params).then((res) => {