Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/views/module_ems/baseSpace/baseSpaceList.vue

@@ -100,8 +100,7 @@
       </a-table>
     </div>
 
-    <!-- <space-modal ref="modalForm" @ok="modalFormOk"></space-modal> -->
-    <base-space-modal ref="modalForm" @ok="modalFormOk"></base-space-modal>
+    <space-modal ref="modalForm" @ok="modalFormOk"></space-modal>
   </a-card>
 </template>
 
@@ -109,15 +108,15 @@
 
   import { getAction, deleteAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import BaseSpaceModal from './modules/baseSpaceModal.vue'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { filterObj } from '@/utils/util';
+  import SpaceModal from './modules/SpaceModal.vue'
 
   export default {
     name: "SpaceList",
     mixins:[JeecgListMixin],
     components: {
-      BaseSpaceModal
+        SpaceModal
     },
     data () {
       return {

src/views/module_ems/cmmsInspectContent/CmmsInspectContentList.vue

@@ -116,7 +116,7 @@
       </a-table>
     </div>
 
-    <cmms-inspect-content-modal ref="modalForm" @ok="modalFormOk"></cmms-inspect-content-modal>
+    <inspect-content-modal ref="modalForm" @ok="modalFormOk"></inspect-content-modal>
   </a-card>
 </template>
 
@@ -125,13 +125,13 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsInspectContentModal from './modules/CmmsInspectContentModal'
+  import InspectContentModal from './modules/InspectContentModal'
 
   export default {
-    name: 'CmmsInspectContentList',
+    name: 'InspectContentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsInspectContentModal
+      InspectContentModal
     },
     data () {
       return {

src/views/module_ems/cmmsInspectContent/modules/CmmsInspectContentForm.vue

@@ -31,7 +31,10 @@
           </a-col>
           <!-- <j-popup v-model="model.jPopup" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/> -->
         </a-row>
-        <div class="cmms-dialog-item-title">设备巡检设置</div>
+        <div class="cmms-dialog-item-title u-flex-jab">
+          <div>设备巡检设置</div>
+          <div>设置</div>
+        </div>
       </a-form-model>
     </j-form-container>
   </a-spin>
@@ -43,7 +46,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsInspectContentForm',
+    name: 'InspectContentForm',
     components: {
     },
     props: {

src/views/module_ems/cmmsRepairMy/modules/CmmsRepairMyModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-repair-my-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-repair-my-form>
+    <inspect-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inspect-content-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CmmsRepairMyForm from './CmmsRepairMyForm'
+  import InspectContentForm from './InspectContentForm'
 
   export default {
-    name: 'CmmsRepairMyModal',
+    name: 'InspectContentModal',
     components: {
-      CmmsRepairMyForm
+      InspectContentForm
     },
     data () {
       return {

src/views/module_ems/cmmsInspectContent/modules/CmmsInspectContentModal.vue

@@ -5,17 +5,17 @@
     contentFull
     @ok="handleOk"
     @cancel="handleCancel">
-    <cmms-inspect-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-inspect-content-form>
+    <inspect-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inspect-content-form>
   </u-modal>
 </template>
 
 <script>
 
-  import CmmsInspectContentForm from './CmmsInspectContentForm'
+  import InspectContentForm from './InspectContentForm'
   export default {
-    name: 'CmmsInspectContentModal',
+    name: 'InspectContentModal',
     components: {
-      CmmsInspectContentForm
+      InspectContentForm
     },
     data () {
       return {

src/views/module_ems/cmmsInspectItem/CmmsInspectItemList.vue

@@ -117,7 +117,7 @@
       </a-table>
     </div>
 
-    <cmms-inspect-item-modal ref="modalForm" @ok="modalFormOk"></cmms-inspect-item-modal>
+    <inspect-item-modal ref="modalForm" @ok="modalFormOk"></inspect-item-modal>
   </a-card>
 </template>
 
@@ -126,13 +126,13 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsInspectItemModal from './modules/CmmsInspectItemModal'
+  import InspectItemModal from './modules/InspectItemModal'
 
   export default {
-    name: 'CmmsInspectItemList',
+    name: 'InspectItemList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsInspectItemModal
+      InspectItemModal
     },
     data () {
       return {

src/views/module_ems/cmmsInspectItem/modules/CmmsInspectItemForm.vue

@@ -60,7 +60,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsInspectItemForm',
+    name: 'InspectItemForm',
     components: {
     },
     props: {

src/views/module_ems/tpmEquipment/modules/TpmEquipmentModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-equipment-form>
+    <inspect-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inspect-item-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import TpmEquipmentForm from './TpmEquipmentForm'
+  import InspectItemForm from './InspectItemForm'
 
   export default {
-    name: 'TpmEquipmentModal',
+    name: 'InspectItemModal',
     components: {
-      TpmEquipmentForm
+      InspectItemForm
     },
     data () {
       return {

src/views/module_ems/tpmEquipment/modules/TpmEquipmentModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-equipment-form>
+    <inspect-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inspect-item-form>
   </j-modal>
 </template>
 
 <script>
 
-  import TpmEquipmentForm from './TpmEquipmentForm'
+  import InspectItemForm from './InspectItemForm'
   export default {
-    name: 'TpmEquipmentModal',
+    name: 'InspectItemModal',
     components: {
-      TpmEquipmentForm
+      InspectItemForm
     },
     data () {
       return {

src/views/module_ems/cmmsRepairManage/CmmsRepairManageList.vue

@@ -144,9 +144,9 @@
     </div>
 
     <!-- 增改+派单 -->
-    <cmms-repair-manage-modal ref="modalForm" @ok="modalFormOk"></cmms-repair-manage-modal>
+    <repair-manage-modal ref="modalForm" @ok="modalFormOk"></repair-manage-modal>
     <!-- 详情 -->
-    <cmms-repair-manage-detail ref="drawerDetail"></cmms-repair-manage-detail>
+    <repair-manage-detail ref="drawerDetail"></repair-manage-detail>
   </a-card>
 </template>
 
@@ -155,15 +155,15 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsRepairManageModal from './modules/CmmsRepairManageModal'
-  import CmmsRepairManageDetail from './modules/CmmsRepairManageDetail.vue'
+  import RepairManageModal from './modules/RepairManageModal'
+  import RepairManageDetail from './modules/RepairManageDetail.vue'
 
   export default {
-    name: 'CmmsRepairManageList',
+    name: 'RepairManageList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsRepairManageModal,
-      CmmsRepairManageDetail,
+      RepairManageModal,
+      RepairManageDetail,
     },
     data () {
       return {
@@ -190,6 +190,7 @@
             title:'维修工单编号',
             align:"center",
             dataIndex: 'repaircode',
+            // customCell: (record, index)=>{ return this.customCellDetail(record, index, 'customerName')}
             customCell: this.customCellDetail
           },
           {
@@ -329,6 +330,20 @@
       handleFreeze(record){
         
       },
+      customCellDetail(record){
+        return {
+          style: {
+            'color': "#1890ff",
+            'cursor': "pointer",
+          },
+          on: { 
+            // 点击事件
+            click: (event) => {
+              this.$refs.drawerDetail.detail(record);
+            },
+          },
+        };
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

src/views/module_ems/cmmsRepairManage/modules/CmmsRepairManageDetail.vue

@@ -72,7 +72,7 @@
 <script>
   import { httpAction, getAction } from '@/api/manage'
   export default {
-    name: 'CmmsRepairManageDetail',
+    name: 'RepairManageDetail',
     data () {
       return {
         title:"详情",

src/views/module_ems/cmmsRepairManage/modules/CmmsRepairManageDispatch.vue

@@ -55,7 +55,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsRepairDispatch',
+    name: 'RepairDispatch',
     components: {
     },
     props: {

src/views/module_ems/cmmsRepairManage/modules/CmmsRepairManageForm.vue

@@ -60,7 +60,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsRepairManageForm',
+    name: 'RepairManageForm',
     components: {
     },
     props: {

src/views/module_ems/cmmsRepairManage/modules/CmmsRepairManageModal.vue

@@ -8,19 +8,19 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-repair-manage-form v-if="modalType==='form'" ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-repair-manage-form>
-    <cmms-repair-manage-dispatch v-if="modalType==='dispatch'" ref="dispatchForm"></cmms-repair-manage-dispatch>
+    <repair-manage-form v-if="modalType==='form'" ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></repair-manage-form>
+    <repair-manage-dispatch v-if="modalType==='dispatch'" ref="dispatchForm"></repair-manage-dispatch>
   </j-modal>
 </template>
 
 <script>
-  import CmmsRepairManageForm from './CmmsRepairManageForm'
-  import CmmsRepairManageDispatch from './CmmsRepairManageDispatch.vue'
+  import RepairManageForm from './RepairManageForm'
+  import RepairManageDispatch from './RepairManageDispatch.vue'
   export default {
-    name: 'CmmsRepairManageModal',
+    name: 'RepairManageModal',
     components: {
-      CmmsRepairManageForm,
-      CmmsRepairManageDispatch
+      RepairManageForm,
+      RepairManageDispatch
     },
     data () {
       return {

src/views/module_ems/cmmsRepairMy/CmmsRepairMyList.vue

@@ -126,7 +126,7 @@
       </a-table>
     </div>
 
-    <cmms-repair-my-modal ref="modalForm" @ok="modalFormOk"></cmms-repair-my-modal>
+    <repair-my-modal ref="modalForm" @ok="modalFormOk"></repair-my-modal>
   </a-card>
 </template>
 
@@ -135,13 +135,13 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsRepairMyModal from './modules/CmmsRepairMyModal'
+  import RepairMyModal from './modules/RepairMyModal'
 
   export default {
-    name: 'CmmsRepairMyList',
+    name: 'RepairMyList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsRepairMyModal
+      RepairMyModal
     },
     data () {
       return {

src/views/module_ems/cmmsRepairMy/modules/CmmsRepairMyForm.vue

@@ -90,7 +90,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsRepairMyForm',
+    name: 'RepairMyForm',
     components: {
     },
     props: {

src/views/module_ems/tpmTag/modules/TpmTagModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-tag-form>
+    <repair-my-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></repair-my-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import TpmTagForm from './TpmTagForm'
+  import RepairMyForm from './RepairMyForm'
 
   export default {
-    name: 'TpmTagModal',
+    name: 'RepairMyModal',
     components: {
-      TpmTagForm
+      RepairMyForm
     },
     data () {
       return {

src/views/module_ems/tpmTag/modules/TpmTagModal.vue

@@ -8,22 +8,22 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-tag-form>
+    <repair-my-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></repair-my-form>
   </j-modal>
 </template>
 
 <script>
 
-  import TpmTagForm from './TpmTagForm'
+  import RepairMyForm from './RepairMyForm'
   export default {
-    name: 'TpmTagModal',
+    name: 'RepairMyModal',
     components: {
-      TpmTagForm
+      RepairMyForm
     },
     data () {
       return {
         title:'',
-        width:1200,
+        width:800,
         visible: false,
         disableSubmit: false
       }

src/views/module_cmms/spotcheck/SpotcheckList.vue

@@ -0,0 +1,231 @@
+<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="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="点检时间">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.spotcheckdate_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.spotcheckdate_end"></j-date>
+            </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.result" dictCode="spotcheck_result"/>
+            </a-form-item>
+          </a-col>
+          <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>
+
+    <!-- <cmms-spotcheck-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-modal> -->
+    <spotcheck-modal ref="modalForm" @ok="modalFormOk"></spotcheck-modal>
+  </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 SpotcheckModal from './modules/SpotcheckModal.vue'
+
+  export default {
+    name: 'SpotcheckList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+        SpotcheckModal
+    },
+    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: 'contentcode'
+          },
+          {
+            title:'所属点检内容名称',
+            align:"center",
+            dataIndex: 'contentname'
+          },
+          {
+            title:'设备ID',
+            align:"center",
+            dataIndex: 'equipmentid_dictText'
+          },
+          {
+            title:'所属点检内容ID',
+            align:"center",
+            dataIndex: 'spotcheckcontid_dictText'
+          },
+          {
+            title:'点检时间',
+            align:"center",
+            dataIndex: 'spotcheckdate'
+          },
+          {
+            title:'点检结果',
+            align:"center",
+            dataIndex: 'result_dictText'
+          },
+          {
+            title:'点检描述',
+            align:"center",
+            dataIndex: 'description'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsSpotcheck/cmmsSpotcheck/list",
+          delete: "/cmmsSpotcheck/cmmsSpotcheck/delete",
+          deleteBatch: "/cmmsSpotcheck/cmmsSpotcheck/deleteBatch",
+          exportXlsUrl: "/cmmsSpotcheck/cmmsSpotcheck/exportXls",
+          importExcelUrl: "cmmsSpotcheck/cmmsSpotcheck/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:'contentcode',text:'所属点检内容编号',dictCode:''})
+        fieldList.push({type:'string',value:'contentname',text:'所属点检内容名称',dictCode:''})
+        fieldList.push({type:'sel_search',value:'equipmentid',text:'设备ID',dictTable:"ems_tpm_equipment", dictText:'equipmentname', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'spotcheckcontid',text:'所属点检内容ID',dictTable:"ems_cmms_spotcheck_content", dictText:'contentname', dictCode:'id'})
+        fieldList.push({type:'datetime',value:'spotcheckdate',text:'点检时间'})
+        fieldList.push({type:'string',value:'result',text:'点检结果',dictCode:'spotcheck_result'})
+        fieldList.push({type:'string',value:'description',text:'点检描述',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -0,0 +1,134 @@
+<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="所属点检内容编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentcode">
+              <a-input v-model="model.contentcode" placeholder="请输入所属点检内容编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属点检内容名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contentname">
+              <a-input v-model="model.contentname" placeholder="请输入所属点检内容名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <j-search-select-tag v-model="model.equipmentid" dict="ems_tpm_equipment,equipmentname,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属点检内容ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotcheckcontid">
+              <j-search-select-tag v-model="model.spotcheckcontid" dict="ems_cmms_spotcheck_content,contentname,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="点检时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spotcheckdate">
+              <j-date placeholder="请选择点检时间"  v-model="model.spotcheckdate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="点检结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="result">
+              <j-dict-select-tag type="list" v-model="model.result" dictCode="spotcheck_result" placeholder="请选择点检结果" />
+            </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-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: 'SpotcheckForm',
+    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: "/cmmsSpotcheck/cmmsSpotcheck/add",
+          edit: "/cmmsSpotcheck/cmmsSpotcheck/edit",
+          queryById: "/cmmsSpotcheck/cmmsSpotcheck/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>

src/views/module_ems/cmmsSpotcheckContent/modules/CmmsSpotcheckContentModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-content-form>
+    <!-- <cmms-spotcheck-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-form> -->
+    <spotcheck-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></spotcheck-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>
@@ -17,12 +18,12 @@
 
 <script>
 
-  import CmmsSpotcheckContentForm from './CmmsSpotcheckContentForm'
+  import SpotcheckForm from './SpotcheckForm.vue'
 
   export default {
-    name: 'CmmsSpotcheckContentModal',
+    name: 'SpotcheckModal',
     components: {
-      CmmsSpotcheckContentForm
+        SpotcheckForm
     },
     data () {
       return {

src/views/module_ems/cmmsInspectItem/modules/CmmsInspectItemModal.vue

@@ -8,17 +8,18 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-inspect-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-inspect-item-form>
+    <!-- <cmms-spotcheck-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-form> -->
+    <spotcheck-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></spotcheck-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CmmsInspectItemForm from './CmmsInspectItemForm'
+  import SpotcheckForm from './SpotcheckForm.vue'
   export default {
-    name: 'CmmsInspectItemModal',
+    name: 'SpotcheckModal',
     components: {
-      CmmsInspectItemForm
+        SpotcheckForm
     },
     data () {
       return {

src/views/module_ems/cmmsSpotcheckContent/CmmsSpotcheckContentList.vue

@@ -109,7 +109,8 @@
       </a-table>
     </div>
 
-    <cmms-spotcheck-content-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-content-modal>
+    <!-- <cmms-spotcheck-content-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-content-modal> -->
+    <spotcheck-content-modal ref="modalForm" @ok="modalFormOk"></spotcheck-content-modal>
   </a-card>
 </template>
 
@@ -118,15 +119,15 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsSpotcheckContentModal from './modules/CmmsSpotcheckContentModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { httpAction, getAction } from '@/api/manage'
+  import SpotcheckContentModal from './modules/SpotcheckContentModal.vue'
 
   export default {
-    name: 'CmmsSpotcheckContentList',
+    name: 'SpotcheckContentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsSpotcheckContentModal
+      SpotcheckContentModal
     },
     data () {
       return {

src/views/module_ems/cmmsSpotcheckContent/index.vue

@@ -3,17 +3,18 @@
         <div class="left">
         </div>
         <div class="right">
-            <cmms-spotcheck-content-list></cmms-spotcheck-content-list>
+            <!-- <cmms-spotcheck-content-list></cmms-spotcheck-content-list> -->
+            <spotcheck-content-list></spotcheck-content-list>
         </div>
     </div>
 </template>
 
 <script>
-import CmmsSpotcheckContentList from './CmmsSpotcheckContentList.vue';
+import SpotcheckContentList from './SpotcheckContentList.vue';
 
     export default({
         components: {
-            CmmsSpotcheckContentList
+            SpotcheckContentList
         },
         data () {
             return {

src/views/module_ems/cmmsSpotcheckContent/modules/CmmsSpotcheckContentForm.vue

@@ -50,12 +50,13 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :dataSource="dataSource"
+          :dataSource="model.spotcheckContentItemList"
           :pagination="false"
           :loading="loading"
           class="j-table-force-nowrap">
         </a-table>
-        <cmms-spotcheck-content-modal-add ref="modalForm" @ok="modalFormOk" :modelForm="model" :dataList="dataSource" @customEvent="handleCustomEvent"></cmms-spotcheck-content-modal-add>
+        <!-- <cmms-spotcheck-content-modal-add ref="modalForm" @ok="modalFormOk" :modelForm="model" :dataList="model.spotcheckContentItemList" @customEvent="handleCustomEvent"></cmms-spotcheck-content-modal-add> -->
+        <spotcheck-content-modal-add  ref="modalForm" @ok="modalFormOk" :modelForm="model" :dataList="model.spotcheckContentItemList" @customEvent="handleCustomEvent"></spotcheck-content-modal-add>
       </a-form-model>
     </j-form-container>
   </a-spin>
@@ -69,13 +70,13 @@
 
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
-import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
+  import SpotcheckContentModalAdd from './SpotcheckContentModalAdd.vue'
 
   export default {
-    name: 'CmmsSpotcheckContentForm',
+    name: 'SpotcheckContentForm',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-        CmmsSpotcheckContentModalAdd
+        SpotcheckContentModalAdd
     },
     props: {
       //表单禁用
@@ -88,6 +89,7 @@ import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
     data () {
       return {
         model:{
+          spotcheckContentItemList: []
         },
         labelCol: {
           xs: { span: 24 },
@@ -143,13 +145,14 @@ import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
             dataIndex: 'remark'
           }
         ],
-        dataSource: [],
+        // dataSource: [],
         loading:false,
         url: {
           list: "/cmmsSpotcheckItem/cmmsSpotcheckItem/listbyequipmentid/{equipmentid}",
           add: "/cmmsSpotcheckContent/cmmsSpotcheckContent/add",
           edit: "/cmmsSpotcheckContent/cmmsSpotcheckContent/edit",
-          queryById: "/cmmsSpotcheckContent/cmmsSpotcheckContent/queryById"
+          // queryById: "/cmmsSpotcheckContent/cmmsSpotcheckContent/queryById"
+          queryById: "/cmmsSpotcheckContent/cmmsSpotcheckContent/queryContentAndItemById"
         }
       }
     },
@@ -164,10 +167,16 @@ import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+        // this.edit(this.modelDefault);
+        this.model = Object.assign({}, this.modelDefault);
+        this.visible = true;
       },
       edit (record) {
-        this.model = Object.assign({}, record);
+        getAction(this.url.queryById, record).then((res) => {
+            console.log(88,res)
+            this.model = res.result
+        })
+        // this.model = Object.assign({}, record);
         this.visible = true;
       },
       submitForm () {
@@ -181,20 +190,22 @@ import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
             if(!this.model.id){
               httpurl+=this.url.add;
               method = 'post';
+              this.model.status = 1
             }else{
               httpurl+=this.url.edit;
-               method = 'put';
+              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;
-            })
+            console.log(99,this.model)
+            // 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;
+            // })
           }
 
         })
@@ -213,7 +224,7 @@ import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
       handleCustomEvent(data) {
         // 处理从子组件传递过来的数据
         console.log("Received Data:", data);
-        this.dataSource = data;
+        this.model.spotcheckContentItemList = data;
       }
     }
   }

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentModal.Style#Drawer.vue

@@ -0,0 +1,85 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <!-- <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-content-form> -->
+    <spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></spotcheck-content-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 SpotcheckContentForm from './SpotcheckContentForm.vue'
+
+  export default {
+    name: 'SpotcheckContentModal',
+    components: {
+        SpotcheckContentForm
+    },
+    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>

src/views/module_ems/cmmsSpotcheckContent/modules/CmmsSpotcheckContentModal.vue

@@ -7,19 +7,19 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-content-form>
+    <!-- <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-content-form> -->
+    <spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></spotcheck-content-form>
   </u-modal>
 </template>
 
 <script>
-import UModal from '../../../../components/module_ems/UModal/UModal.vue'
-
-  import CmmsSpotcheckContentForm from './CmmsSpotcheckContentForm'
+  import UModal from '../../../../components/module_ems/UModal/UModal.vue'
+  import SpotcheckContentForm from './SpotcheckContentForm.vue'
   export default {
-    name: 'CmmsSpotcheckContentModal',
+    name: 'SpotcheckContentModal',
     components: {
-      CmmsSpotcheckContentForm,
-        UModal
+        UModal,
+        SpotcheckContentForm
     },
     data () {
       return {

src/views/module_ems/cmmsSpotcheckContent/modules/CmmsSpotcheckContentModalAdd.vue

@@ -28,7 +28,7 @@
 import { httpAction, getAction } from '@/api/manage'
   
   export default {
-    name: 'CmmsSpotcheckContentModalAdd',
+    name: 'SpotcheckContentModalAdd',
     components: {
         
     },
@@ -95,16 +95,14 @@ import { httpAction, getAction } from '@/api/manage'
         ],
         dataSource: [],
         url: {
-            getList: "/cmmsSpotcheckItem/cmmsSpotcheckItem/listbyequipmentid/${equipmentid}"
+            getList: "/cmmsSpotcheckItem/cmmsSpotcheckItem/listbyequipmentid/{equipmentid}"
         },
       }
     },
     methods: {
       add () {
-        this.visible=true
-        console.log(1111,this.modelForm)
+        this.visible = true;
         getAction(`/cmmsSpotcheckItem/cmmsSpotcheckItem/listbyequipmentid/${this.modelForm.equipmentid}`).then((res) => {
-            console.log(2222,res)
             this.dataSource = res.result
         })
       },
@@ -119,6 +117,10 @@ import { httpAction, getAction } from '@/api/manage'
         this.$emit('close');
         this.visible = false;
         this.onClearSelected()
+        this.selectionRows = this.dataList
+        this.selectedRowKeys = this.dataList.map((res) => {
+            return res.id
+        })
       },
       handleOk () {
         console.log(this.selectionRows)

src/views/module_ems/cmmsSpotcheckItem/CmmsSpotcheckItemList.vue

@@ -131,7 +131,8 @@
       </a-table>
     </div>
 
-    <cmms-spotcheck-item-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-item-modal>
+    <!-- <cmms-spotcheck-item-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-item-modal> -->
+    <spotcheck-item-modal ref="modalForm" @ok="modalFormOk"></spotcheck-item-modal>
   </a-card>
 </template>
 
@@ -140,14 +141,14 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsSpotcheckItemModal from './modules/CmmsSpotcheckItemModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import SpotcheckItemModal from './modules/SpotcheckItemModal.vue'
 
   export default {
-    name: 'CmmsSpotcheckItemList',
+    name: 'SpotcheckItemList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsSpotcheckItemModal
+      SpotcheckItemModal
     },
     data () {
       return {

src/views/module_ems/cmmsSpotcheckItem/modules/CmmsSpotcheckItemForm.vue

@@ -62,7 +62,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsSpotcheckItemForm',
+    name: 'SpotcheckItemForm',
     components: {
     },
     props: {

src/views/module_cmms/spotcheckItem/modules/SpotcheckItemModal.Style#Drawer.vue

@@ -0,0 +1,85 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <!-- <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-item-form> -->
+    <spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></spotcheck-item-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 SpotcheckItemForm from './SpotcheckItemForm.vue'
+
+  export default {
+    name: 'SpotcheckItemModal',
+    components: {
+        SpotcheckItemForm
+    },
+    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>

src/views/module_cmms/spotcheckItem/modules/SpotcheckItemModal.vue

@@ -0,0 +1,61 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <!-- <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-item-form> -->
+    <spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></spotcheck-item-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import SpotcheckItemForm from './SpotcheckItemForm.vue'
+  export default {
+    name: 'SpotcheckItemModal',
+    components: {
+        SpotcheckItemForm
+    },
+    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>

src/views/module_ems/cmmsSpotcheckItem/modules/CmmsSpotcheckItemModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-item-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 CmmsSpotcheckItemForm from './CmmsSpotcheckItemForm'
-
-  export default {
-    name: 'CmmsSpotcheckItemModal',
-    components: {
-      CmmsSpotcheckItemForm
-    },
-    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>

src/views/module_ems/tpmEquipment/TpmEquipmentList.vue

@@ -151,7 +151,8 @@
       </a-table>
     </div>
 
-    <tpm-equipment-modal ref="modalForm" @ok="modalFormOk"></tpm-equipment-modal>
+    <!-- <tpm-equipment-modal ref="modalForm" @ok="modalFormOk"></tpm-equipment-modal> -->
+    <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
   </a-card>
 </template>
 
@@ -160,14 +161,14 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmEquipmentModal from './modules/TpmEquipmentModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import EquipmentModal from './modules/EquipmentModal.vue'
 
   export default {
-    name: 'TpmEquipmentList',
+    name: 'EquipmentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      TpmEquipmentModal
+        EquipmentModal
     },
     data () {
       return {

src/views/module_ems/tpmEquipment/modules/TpmEquipmentForm.vue

@@ -71,7 +71,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'TpmEquipmentForm',
+    name: 'EquipmentForm',
     components: {
     },
     props: {

src/views/module_ems/cmmsInspectItem/modules/CmmsInspectItemModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-inspect-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-inspect-item-form>
+    <!-- <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-equipment-form> -->
+    <equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></equipment-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>
@@ -16,13 +17,12 @@
 </template>
 
 <script>
-
-  import CmmsInspectItemForm from './CmmsInspectItemForm'
+  import EquipmentForm from './EquipmentForm.vue'
 
   export default {
-    name: 'CmmsInspectItemModal',
+    name: 'EquipmentModal',
     components: {
-      CmmsInspectItemForm
+        EquipmentForm
     },
     data () {
       return {

src/views/module_ems/cmmsRepairMy/modules/CmmsRepairMyModal.vue

@@ -8,17 +8,18 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-repair-my-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-repair-my-form>
+    <!-- <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-equipment-form> -->
+    <equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></equipment-form>
   </j-modal>
 </template>
 
 <script>
+  import EquipmentForm from './EquipmentForm.vue'
 
-  import CmmsRepairMyForm from './CmmsRepairMyForm'
   export default {
-    name: 'CmmsRepairMyModal',
+    name: 'EquipmentModal',
     components: {
-      CmmsRepairMyForm
+        EquipmentForm
     },
     data () {
       return {

src/views/module_ems/tpmEquipmentTree/TpmEquipmentTreeList.vue

@@ -109,7 +109,8 @@
       </a-table>
     </div>
 
-    <tpmEquipmentTree-modal ref="modalForm" @ok="modalFormOk"></tpmEquipmentTree-modal>
+    <!-- <tpmEquipmentTree-modal ref="modalForm" @ok="modalFormOk"></tpmEquipmentTree-modal> -->
+    <equipment-tree-modal ref="modalForm" @ok="modalFormOk"></equipment-tree-modal>
   </a-card>
 </template>
 
@@ -117,15 +118,15 @@
 
   import { getAction, deleteAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmEquipmentTreeModal from './modules/TpmEquipmentTreeModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { filterObj } from '@/utils/util';
+  import EquipmentTreeModal from './modules/EquipmentTreeModal.vue'
 
   export default {
-    name: "TpmEquipmentTreeList",
+    name: "EquipmentTreeList",
     mixins:[JeecgListMixin],
     components: {
-      TpmEquipmentTreeModal
+        EquipmentTreeModal
     },
     data () {
       return {

src/views/module_ems/tpmEquipmentTree/modules/TpmEquipmentTreeModal.vue

@@ -37,7 +37,7 @@
   import { duplicateCheck } from '@/api/api'
   import { validateDuplicateValue } from '@/utils/util'
   export default {
-    name: "TpmEquipmentTreeModal",
+    name: "EquipmentTreeModal",
     components: {
     },
     data () {

src/views/module_ems/tpmTag/TpmDeviceList.vue

@@ -28,6 +28,7 @@
 <script>
   import { getAction } from '@api/manage'
   export default({
+    name: 'DeviceList',
     components: {
     },
     data () {

src/views/module_ems/tpmTag/TpmTagList.vue

@@ -113,8 +113,10 @@
       </a-table>
     </div>
 
-    <tpm-tag-modal ref="modalForm" @ok="modalFormOk"></tpm-tag-modal>
-    <TpmTagModalPL ref="modalFormPL" @ok="modalFormOk"></TpmTagModalPL>
+    <!-- <tpm-tag-modal ref="modalForm" @ok="modalFormOk"></tpm-tag-modal> -->
+    <tag-modal ref="modalForm" @ok="modalFormOk"></tag-modal>
+    <tag-modal-pl  ref="modalFormPL" @ok="modalFormOk"></tag-modal-pl>
+    <!-- <TpmTagModalPL ref="modalFormPL" @ok="modalFormOk"></TpmTagModalPL> -->
   </a-card>
 </template>
 
@@ -123,16 +125,16 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmTagModal from './modules/TpmTagModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import TpmTagModalPL from './modulesPL/TpmTagModalPL.vue'
+import TagModal from './modules/TagModal.vue'
+import TagModalPL from './modulesPL/TagModalPL.vue'
 
   export default {
-    name: 'TpmTagList',
+    name: 'TagList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      TpmTagModal,
-      TpmTagModalPL
+        TagModal,
+        TagModalPL
     },
     data () {
       return {

src/views/module_ems/tpmTag/index.vue

@@ -1,22 +1,24 @@
 <template>
     <div class="all">
         <div class="left">
-            <tpm-device-list></tpm-device-list>
+            <!-- <tpm-device-list></tpm-device-list> -->
+            <device-list></device-list>
         </div>
         <div class="right">
-            <tpm-tag-list></tpm-tag-list>
+            <!-- <tpm-tag-list></tpm-tag-list> -->
+            <tag-list></tag-list>
         </div>
     </div>
 </template>
 
 <script>
-import TpmTagList from './TpmTagList.vue';
-import TpmDeviceList from './TpmDeviceList.vue';
+import TagList from './TagList.vue';
+import DeviceList from './DeviceList.vue';
 
     export default({
         components: {
-            TpmTagList,
-            TpmDeviceList
+            TagList,
+            DeviceList
         },
         data () {
             return {

src/views/module_ems/tpmTag/modules/TpmTagForm.vue

@@ -93,7 +93,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'TpmTagForm',
+    name: 'TagForm',
     components: {
     },
     props: {

src/views/module_ems/cmmsInspectContent/modules/CmmsInspectContentModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-inspect-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-inspect-content-form>
+    <!-- <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-tag-form> -->
+    <tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tag-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>
@@ -16,13 +17,13 @@
 </template>
 
 <script>
+import TagForm from './TagForm.vue'
 
-  import CmmsInspectContentForm from './CmmsInspectContentForm'
 
   export default {
-    name: 'CmmsInspectContentModal',
+    name: 'TagModal',
     components: {
-      CmmsInspectContentForm
+        TagForm
     },
     data () {
       return {

src/views/module_ems/cmmsSpotcheckItem/modules/CmmsSpotcheckItemModal.vue

@@ -8,22 +8,23 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-item-form>
+    <!-- <tpm-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-tag-form> -->
+    <tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tag-form>
   </j-modal>
 </template>
 
 <script>
+import TagForm from './TagForm.vue'
 
-  import CmmsSpotcheckItemForm from './CmmsSpotcheckItemForm'
   export default {
-    name: 'CmmsSpotcheckItemModal',
+    name: 'TagModal',
     components: {
-      CmmsSpotcheckItemForm
+        TagForm
     },
     data () {
       return {
         title:'',
-        width:800,
+        width:1200,
         visible: false,
         disableSubmit: false
       }

src/views/module_ems/tpmTag/modulesPL/TpmTagFormPL1.vue

@@ -92,7 +92,7 @@
 import { httpAction, getAction } from '@/api/manage'
 
 export default {
-    name: 'TpmTagFormPL1',
+    name: 'TagFormPL1',
     components: {
     },
     data () {

src/views/module_ems/tpmTag/modulesPL/TpmTagModalPL.vue

@@ -7,18 +7,19 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <TpmTagFormPL1 ref="realForm" @ok="submitCallback"></TpmTagFormPL1>
+    <!-- <TpmTagFormPL1 ref="realForm" @ok="submitCallback"></TpmTagFormPL1> -->
+    <tag-form-pl-1 ref="realForm" @ok="submitCallback"></tag-form-pl-1>
   </u-modal>
 </template>
 
 <script>
 import UModal from '../../../../components/module_ems/UModal/UModal.vue';
-  import TpmTagFormPL1 from './TpmTagFormPL1'
+import TagFormPL1 from './TagFormPL1.vue';
   export default {
-    name: 'TpmTagModalPL',
+    name: 'TagModalPL',
     components: {
-      TpmTagFormPL1,
-        UModal
+        UModal,
+        TagFormPL1
     },
     data () {
       return {