wyh 9 ヶ月 前
コミット
ca0fa26a29

+ 384 - 0
src/views/module_interLock/InterlockDetail/InterlockDetailList.vue

@@ -0,0 +1,384 @@
+<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>
+          <template v-if="toggleSearchStatus">
+            <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>
+            <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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <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-detail-modal ref="modalForm" @ok="modalFormOk"></interlock-detail-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import InterlockDetailModal from './modules/InterlockDetailModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'InterlockDetailList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      InterlockDetailModal
+    },
+    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'
+          },
+          {
+            title:'联锁条件值',
+            align:"center",
+            dataIndex: 'interlockCondition'
+          },
+          {
+            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:'高限',
+            align:"center",
+            dataIndex: 'upperLimit'
+          },
+          {
+            title:'低限',
+            align:"center",
+            dataIndex: 'lowerLimit'
+          },
+          {
+            title:'阈值',
+            align:"center",
+            dataIndex: 'thresholdValue'
+          },
+          {
+            title:'时间',
+            align:"center",
+            dataIndex: 'thresholdTime'
+          },
+          {
+            title:'时间单位',
+            align:"center",
+            dataIndex: 'thresholdTimeUnit'
+          },
+          {
+            title:'联锁设定值',
+            align:"center",
+            dataIndex: 'interlockSetValue'
+          },
+          {
+            title:'联锁设定值点位',
+            align:"center",
+            dataIndex: 'interlockSetTag'
+          },
+          {
+            title:'当前值',
+            align:"center",
+            dataIndex: 'currentValue'
+          },
+          {
+            title:'当前值位号',
+            align:"center",
+            dataIndex: 'currentValueTag'
+          },
+          {
+            title:'是否旁路',
+            align:"center",
+            dataIndex: 'ifBypass'
+          },
+          {
+            title:'旁路状态点位',
+            align:"center",
+            dataIndex: 'ifBypassTag'
+          },
+          {
+            title:'输入卡件状态',
+            align:"center",
+            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' }
+          }
+        ],
+        url: {
+          list: "/detail/interlockDetail/list",
+          delete: "/detail/interlockDetail/delete",
+          deleteBatch: "/detail/interlockDetail/deleteBatch",
+          exportXlsUrl: "/detail/interlockDetail/exportXls",
+          importExcelUrl: "detail/interlockDetail/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      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>

+ 254 - 0
src/views/module_interLock/InterlockDetail/modules/InterlockDetailForm.vue

@@ -0,0 +1,254 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="联锁总表id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="summaryid">
+              <a-input v-model="model.summaryid" placeholder="请输入联锁总表id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联锁名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockname">
+              <a-input v-model="model.interlockname" placeholder="请输入联锁名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联锁条件值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockCondition">
+              <a-input v-model="model.interlockCondition" placeholder="请输入联锁条件值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联锁条件点位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockConditionTag">
+              <a-input v-model="model.interlockConditionTag" placeholder="请输入联锁条件点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
+              <a-input v-model="model.description" placeholder="请输入描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceId">
+              <a-input v-model="model.deviceId" placeholder="请输入设备id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleName">
+              <a-input v-model="model.moduleName" placeholder="请输入模块名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="仪表状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatus">
+              <a-input v-model="model.instrumentStatus" placeholder="请输入仪表状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="仪表状态判断方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusJuge">
+              <j-dict-select-tag type="list" v-model="model.instrumentStatusJuge" dictCode="instrument_status_juge" placeholder="请选择仪表状态判断方式" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="仪表状态点位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusTag">
+              <a-input v-model="model.instrumentStatusTag" placeholder="请输入仪表状态点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="仪表状态值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusValue">
+              <a-input v-model="model.instrumentStatusValue" placeholder="请输入仪表状态值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="原始模拟量位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlTag">
+              <a-input v-model="model.ysmnlTag" placeholder="请输入原始模拟量位号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="原始模拟量值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlValue">
+              <a-input v-model="model.ysmnlValue" placeholder="请输入原始模拟量值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="高限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperLimit">
+              <a-input v-model="model.upperLimit" placeholder="请输入高限"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="低限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lowerLimit">
+              <a-input v-model="model.lowerLimit" placeholder="请输入低限"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="阈值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thresholdValue">
+              <a-input v-model="model.thresholdValue" placeholder="请输入阈值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thresholdTime">
+              <a-input v-model="model.thresholdTime" placeholder="请输入时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时间单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thresholdTimeUnit">
+              <a-input v-model="model.thresholdTimeUnit" placeholder="请输入时间单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联锁设定值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockSetValue">
+              <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="interlockSetTag">
+              <a-input v-model="model.interlockSetTag" placeholder="请输入联锁设定值点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="当前值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentValue">
+              <a-input v-model="model.currentValue" placeholder="请输入当前值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="当前值位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentValueTag">
+              <a-input v-model="model.currentValueTag" placeholder="请输入当前值位号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否旁路" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypass">
+              <a-input v-model="model.ifBypass" placeholder="请输入是否旁路"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="旁路状态点位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypassTag">
+              <a-input v-model="model.ifBypassTag" placeholder="请输入旁路状态点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="输入卡件状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inputStatus">
+              <a-input v-model="model.inputStatus" placeholder="请输入输入卡件状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="输入卡件状态点位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inputStatusTag">
+              <a-input v-model="model.inputStatusTag" placeholder="请输入输入卡件状态点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="输出卡件状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outputStatus">
+              <a-input v-model="model.outputStatus" placeholder="请输入输出卡件状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="输出卡件状态点位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outputStatusTag">
+              <a-input v-model="model.outputStatusTag" placeholder="请输入输出卡件状态点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="MP状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mpStatus">
+              <a-input v-model="model.mpStatus" placeholder="请输入MP状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态点位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mpStatusTag">
+              <a-input v-model="model.mpStatusTag" placeholder="请输入状态点位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-textarea v-model="model.remark" rows="4" placeholder="请输入备注" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'InterlockDetailForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/detail/interlockDetail/add",
+          edit: "/detail/interlockDetail/edit",
+          queryById: "/detail/interlockDetail/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

+ 84 - 0
src/views/module_interLock/InterlockDetail/modules/InterlockDetailModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <interlock-detail-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></interlock-detail-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import InterlockDetailForm from './InterlockDetailForm'
+
+  export default {
+    name: 'InterlockDetailModal',
+    components: {
+      InterlockDetailForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

+ 60 - 0
src/views/module_interLock/InterlockDetail/modules/InterlockDetailModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <interlock-detail-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></interlock-detail-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import InterlockDetailForm from './InterlockDetailForm'
+  export default {
+    name: 'InterlockDetailModal',
+    components: {
+      InterlockDetailForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>