巡检

src/views/module_cmms/inspectContent/InspectContentList.vue

@@ -188,7 +188,7 @@
           deleteBatch: "/cmmsInspectContent/cmmsInspectContent/deleteBatch",
           exportXlsUrl: "/cmmsInspectContent/cmmsInspectContent/exportXls",
           importExcelUrl: "cmmsInspectContent/cmmsInspectContent/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -219,4 +219,8 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  .ant-card{
+    height: 100%;
+    overflow: auto;
+  }
 </style>

src/views/module_cmms/inspectContent/modules/InspectContentForm.vue

@@ -9,14 +9,24 @@
               <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="classification">
+              <j-dict-select-tag type="radio" v-model="model.classification" dictCode="inspect_item_type"  placeholder="请选择巡检类型" @input="inspectTypeChange()" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="12">
             <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="12">
-            <a-form-model-item label="巡检设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <j-search-select-tag v-model="model.equipmentid" dict="ems_tpm_equipment,equipmentname,id"  />
+          <a-col :span="12" v-if="model.classification === '1'">
+            <a-form-model-item label="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <div class="u-flex select-equipment">
+                <j-search-select-tag v-model="model.equipmentid" dict="tpm_equipment,equipmentname,id"  />
+                <div class="u-flex-jac search-btn" @click="chooseEquipment">
+                  <a-icon type="search" style="color: #fff;font-size: 18px;" />
+                </div>
+              </div>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -26,28 +36,47 @@
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+              <a-input v-model="model.remark" placeholder="请输入备注"></a-input>
             </a-form-model-item>
           </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 u-flex-jab">
           <div>设备巡检设置</div>
-          <div>设置</div>
+          <div @click="addInspectItem"><a-icon type="plus"/>巡检项</div>
         </div>
+        <a-table
+          ref="table"
+          size="middle"
+          :scroll="{x:true}"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="model.cmmsInspectContentItemList"
+          :pagination="false"
+          class="j-table-force-nowrap">
+          <!-- :loading="loading" -->
+        </a-table>
       </a-form-model>
+      <inspect-content-modal-add ref="addItemRef" :equipmentId="model.equipmentid" :selectData="model.cmmsInspectContentItemList" @ok="handleItemOk"></inspect-content-modal-add>
     </j-form-container>
   </a-spin>
 </template>
 
 <script>
+  // import '@/assets/less/TableExpand.less'
+  // import { mixinDevice } from '@/utils/mixin'
+  // import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import InspectContentModalAdd from './InspectContentModalAdd.vue'
 
   export default {
     name: 'InspectContentForm',
+    // mixins:[JeecgListMixin, mixinDevice],
     components: {
+      InspectContentModalAdd
     },
     props: {
       //表单禁用
@@ -60,7 +89,8 @@
     data () {
       return {
         model:{
-         },
+          cmmsInspectContentItemList: []
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -71,21 +101,53 @@
         },
         confirmLoading: false,
         validatorRules: {
-           contentname: [
-              { required: true, message: '请输入巡检内容名称!'},
-           ],
-           equipmentid: [
-              { required: true, message: '请输入设备id!'},
-           ],
-           status: [
-              { required: true, message: '请输入状态：启用：0、禁用:1!'},
-           ],
+          contentname: [
+          { required: true, message: '请输入巡检内容名称!'},
+          ],
+          equipmentid: [
+          { required: true, message: '请选择设备!'},
+          ],
+          status: [
+          { required: true, message: '请选择状态!'},
+          ],
         },
         url: {
           add: "/cmmsInspectContent/cmmsInspectContent/add",
           edit: "/cmmsInspectContent/cmmsInspectContent/edit",
           queryById: "/cmmsInspectContent/cmmsInspectContent/queryById"
-        }
+        },
+        columns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          {
+            title:'点检项编号',
+            align:"center",
+            dataIndex: 'itemcode'
+          },
+          {
+            title:'点检项名称',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          {
+            title:'标准',
+            align:"center",
+            dataIndex: 'inspectionstandards',
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          }
+        ],
       }
     },
     computed: {
@@ -98,12 +160,33 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      inspectTypeChange(){
+        this.model.cmmsInspectContentItemList = []
+        this.$refs.addItemRef.type = this.model.classification
+      },
+      chooseEquipment(){
+
+      },
+      addInspectItem(){
+        if (this.model.classification === '1' && this.model.equipmentid == undefined) {
+          this.$message.error("请先选择设备！");
+        } else {
+          this.$refs.addItemRef.add();
+          this.$refs.addItemRef.title = "选择巡检项";
+        }
+      },
       add () {
-        this.edit(this.modelDefault);
+        // this.edit(this.modelDefault);
+        this.visible = true
       },
       edit (record) {
-        this.model = Object.assign({}, record);
         this.visible = true;
+        this.confirmLoading = true
+        // this.model = Object.assign({}, record);
+        getAction(this.url.queryById, {id: record.id}).then((res) => {
+          this.model = res.result
+          this.confirmLoading = false
+        })
       },
       submitForm () {
         const that = this;
@@ -131,9 +214,13 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
+      handleItemOk(data){
+        console.log(data)
+        this.model.cmmsInspectContentItemList = data;
+      }
     }
   }
 </script>
@@ -141,4 +228,24 @@
   @import '~@/assets/less/uStyle.less';
 </style>
 <style lang="less" scoped>
+.select-equipment{
+  /deep/ .ant-select-selection{
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right: none;
+  }
+  .search-btn{
+    background-color: #1890FF;
+    width: 50px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border: 1px solid #1890FF;
+    cursor: pointer;
+  }
+}
+// .select-equipment:focus .search-btn{
+//   border-right-width: 1px !important;
+//   outline: 0;
+//   box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+// }
 </style>

src/views/module_cmms/inspectContent/modules/InspectContentModalAdd.vue

@@ -0,0 +1,150 @@
+<template>
+  <j-modal
+  :title="title"
+  :width="width"
+  :visible="visible"
+  @ok="handleOk"
+  @cancel="handleCancel"
+  cancelText="关闭">
+    <a-table
+      ref="table"
+      size="middle"
+      :scroll="{x:true}"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :pagination="false"
+      class="j-table-force-nowrap">
+    </a-table>
+  </j-modal>
+</template>
+
+<script>
+  import { httpAction, getAction } from '@/api/manage'
+  
+  export default {
+    name: 'SpotcheckContentModalAdd',
+    components: {
+        
+    },
+    props: {
+      //表单禁用
+      equipmentId: {
+        type: String,
+        default: ''
+      },
+      selectData: {
+        type: Array,
+        default: function(){
+          return [] // 使用工厂函数返回默认值
+        }
+      },
+    },
+    data () {
+      return {
+        title:'',
+        width: 1000,
+        visible: false,
+        type: '',
+        /* table选中keys*/
+        selectedRowKeys: [],
+        /* table选中records*/
+        selectionRows: [],
+        columns: [
+          // {
+          //   title: '',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          {
+            title:'巡检项ID',
+            align:"center",
+            dataIndex: 'id'
+          },
+          {
+            title:'巡检项编号',
+            align:"center",
+            dataIndex: 'itemcode'
+          },
+          {
+            title:'巡检项名称',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          {
+            title:'标准',
+            align:"center",
+            dataIndex: 'inspectionstandards',
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          }
+        ],
+        dataSource: [],
+        url: {
+          getList: "/cmmsInspectItem/cmmsInspectItem/getItemByEqId",
+          itemList: "/cmmsInspectItem/cmmsInspectItem/list",
+        },
+      }
+    },
+    methods: {
+      add () {
+        this.visible = true;
+        if(this.type === '1'){
+          getAction(this.url.getList, {eqid: this.equipmentId}).then((res) => {
+            this.dataSource = res.result
+          })
+        } else {
+          getAction(this.url.itemList, {classification: this.type}).then((res) => {
+            this.dataSource = res.result.records
+          })
+        }
+        this.selectList()
+      },
+      // 将以选中的值重新在列表中选中
+      selectList() {
+        this.selectionRows = this.selectData
+        console.log(this.selectData)
+        this.selectedRowKeys = this.selectData.map((res) => {
+          return res.id
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+        this.onClearSelected()
+        this.selectionRows = this.selectData
+        this.selectedRowKeys = this.selectData.map((res) => {
+          return res.id
+        })
+        this.dataSource = []
+      },
+      handleOk () {
+        console.log(this.selectionRows)
+        this.$emit('ok', this.selectionRows);
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        console.log(this.selectedRowKeys,this.selectionRows)
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+    }
+  }
+</script>

src/views/module_cmms/inspectItem/InspectItemList.vue

@@ -10,8 +10,13 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备类型ID(设备定义)">
-              <a-input placeholder="请输入设备类型ID(设备定义)" v-model="queryParam.equipdefid"></a-input>
+            <a-form-item label="设备类型">
+              <a-input placeholder="请输入设备类型" v-model="queryParam.equipdefid"></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 type="list" v-model="queryParam.classification" dictCode="inspect_item_type" placeholder="请选择巡检类型" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">

src/views/module_cmms/inspectItem/modules/InspectItemForm.vue

@@ -25,10 +25,11 @@
                 ref="treeSelect"
                 placeholder="请选择设备类型"
                 v-model="model.equipdefid"
-                dict="ems_tpm_equipment_tree,name,id"
+                dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"
+                multiple
                 >
               </j-tree-select>
             </a-form-model-item>
@@ -148,7 +149,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <inspect-line-modal ref="modalForm" @ok="modalFormOk"></inspect-line-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import InspectLineModal from './modules/InspectLineModal'
+
+  export default {
+    name: 'InspectLineList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      InspectLineModal
+    },
+    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: 'remark'
+          },
+          {
+            title:'巡检路线编号',
+            align:"center",
+            dataIndex: 'linecode'
+          },
+          {
+            title:'巡检路线名称',
+            align:"center",
+            dataIndex: 'linename'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsInspectLine/cmmsInspectLine/list",
+          delete: "/cmmsInspectLine/cmmsInspectLine/delete",
+          deleteBatch: "/cmmsInspectLine/cmmsInspectLine/deleteBatch",
+          exportXlsUrl: "/cmmsInspectLine/cmmsInspectLine/exportXls",
+          importExcelUrl: "cmmsInspectLine/cmmsInspectLine/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:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'linecode',text:'巡检路线编号',dictCode:''})
+        fieldList.push({type:'string',value:'linename',text:'巡检路线名称',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_cmms/inspectLine/modules/InspectLineForm.vue

@@ -0,0 +1,114 @@
+<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="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="巡检路线编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linecode">
+              <a-input v-model="model.linecode" placeholder="请输入巡检路线编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="巡检路线名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linename">
+              <a-input v-model="model.linename" 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: 'InspectLineForm',
+    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: "/cmmsInspectLine/cmmsInspectLine/add",
+          edit: "/cmmsInspectLine/cmmsInspectLine/edit",
+          queryById: "/cmmsInspectLine/cmmsInspectLine/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_cmms/inspectLine/modules/InspectLineModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <inspect-line-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inspect-line-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 InspectLineForm from './InspectLineForm'
+
+  export default {
+    name: 'InspectLineModal',
+    components: {
+      InspectLineForm
+    },
+    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/inspectLine/modules/InspectLineModal.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="关闭">
+    <inspect-line-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inspect-line-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import InspectLineForm from './InspectLineForm'
+  export default {
+    name: 'InspectLineModal',
+    components: {
+      InspectLineForm
+    },
+    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_cmms/inspectPlan/InspectPlanList.vue

@@ -0,0 +1,264 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <inspect-plan-modal ref="modalForm" @ok="modalFormOk"></inspect-plan-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import InspectPlanModal from './modules/InspectPlanModal'
+
+  export default {
+    name: 'InspectPlanList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      InspectPlanModal
+    },
+    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: 'remark'
+          },
+          {
+            title:'巡检计划编号',
+            align:"center",
+            dataIndex: 'plancode'
+          },
+          {
+            title:'巡检计划名称',
+            align:"center",
+            dataIndex: 'planname'
+          },
+          {
+            title:'是否开启时间设置：Y是、N否',
+            align:"center",
+            dataIndex: 'iftimeset'
+          },
+          {
+            title:'开始时间',
+            align:"center",
+            dataIndex: 'begintime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'重复',
+            align:"center",
+            dataIndex: 'repeatnum'
+          },
+          {
+            title:'重复类型：年、月、周、日、时、分',
+            align:"center",
+            dataIndex: 'repeattype'
+          },
+          {
+            title:'提前通知时间',
+            align:"center",
+            dataIndex: 'noticenum'
+          },
+          {
+            title:'提前通知类型：天、时、分',
+            align:"center",
+            dataIndex: 'noticetype'
+          },
+          {
+            title:'状态（0启用 1停用）',
+            align:"center",
+            dataIndex: 'status'
+          },
+          {
+            title:'待办人',
+            align:"center",
+            dataIndex: 'chargeruser'
+          },
+          {
+            title:'下次执行时间',
+            align:"center",
+            dataIndex: 'nexttime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'任务数量',
+            align:"center",
+            dataIndex: 'tasknum'
+          },
+          {
+            title:'下次通知时间',
+            align:"center",
+            dataIndex: 'noticetime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'是否已通知：是/否',
+            align:"center",
+            dataIndex: 'ifnotice'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsInspectPlan/cmmsInspectPlan/list",
+          delete: "/cmmsInspectPlan/cmmsInspectPlan/delete",
+          deleteBatch: "/cmmsInspectPlan/cmmsInspectPlan/deleteBatch",
+          exportXlsUrl: "/cmmsInspectPlan/cmmsInspectPlan/exportXls",
+          importExcelUrl: "cmmsInspectPlan/cmmsInspectPlan/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:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'plancode',text:'巡检计划编号',dictCode:''})
+        fieldList.push({type:'string',value:'planname',text:'巡检计划名称',dictCode:''})
+        fieldList.push({type:'string',value:'iftimeset',text:'是否开启时间设置：Y是、N否',dictCode:''})
+        fieldList.push({type:'date',value:'begintime',text:'开始时间'})
+        fieldList.push({type:'int',value:'repeatnum',text:'重复',dictCode:''})
+        fieldList.push({type:'string',value:'repeattype',text:'重复类型：年、月、周、日、时、分',dictCode:''})
+        fieldList.push({type:'int',value:'noticenum',text:'提前通知时间',dictCode:''})
+        fieldList.push({type:'string',value:'noticetype',text:'提前通知类型：天、时、分',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'状态（0启用 1停用）',dictCode:''})
+        fieldList.push({type:'string',value:'chargeruser',text:'待办人',dictCode:''})
+        fieldList.push({type:'date',value:'nexttime',text:'下次执行时间'})
+        fieldList.push({type:'int',value:'tasknum',text:'任务数量',dictCode:''})
+        fieldList.push({type:'date',value:'noticetime',text:'下次通知时间'})
+        fieldList.push({type:'string',value:'ifnotice',text:'是否已通知：是/否',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_cmms/inspectPlan/modules/InspectPlanForm.vue

@@ -0,0 +1,174 @@
+<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="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="巡检计划编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="plancode">
+              <a-input v-model="model.plancode" placeholder="请输入巡检计划编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="巡检计划名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planname">
+              <a-input v-model="model.planname" placeholder="请输入巡检计划名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否开启时间设置：Y是、N否" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iftimeset">
+              <a-input v-model="model.iftimeset" placeholder="请输入是否开启时间设置：Y是、N否"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="begintime">
+              <j-date placeholder="请选择开始时间" v-model="model.begintime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="重复" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repeatnum">
+              <a-input-number v-model="model.repeatnum" placeholder="请输入重复" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="重复类型：年、月、周、日、时、分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repeattype">
+              <a-input v-model="model.repeattype" placeholder="请输入重复类型：年、月、周、日、时、分"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提前通知时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticenum">
+              <a-input-number v-model="model.noticenum" placeholder="请输入提前通知时间" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提前通知类型：天、时、分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticetype">
+              <a-input v-model="model.noticetype" placeholder="请输入提前通知类型：天、时、分"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态（0启用 1停用）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-input v-model="model.status" placeholder="请输入状态（0启用 1停用）"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="待办人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeruser">
+              <a-input v-model="model.chargeruser" placeholder="请输入待办人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下次执行时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nexttime">
+              <j-date placeholder="请选择下次执行时间" v-model="model.nexttime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tasknum">
+              <a-input-number v-model="model.tasknum" placeholder="请输入任务数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下次通知时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticetime">
+              <j-date placeholder="请选择下次通知时间" v-model="model.noticetime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否已通知：是/否" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifnotice">
+              <a-input v-model="model.ifnotice" 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: 'InspectPlanForm',
+    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: "/cmmsInspectPlan/cmmsInspectPlan/add",
+          edit: "/cmmsInspectPlan/cmmsInspectPlan/edit",
+          queryById: "/cmmsInspectPlan/cmmsInspectPlan/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_cmms/inspectPlan/modules/InspectPlanModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <inspect-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inspect-plan-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 InspectPlanForm from './InspectPlanForm'
+
+  export default {
+    name: 'InspectPlanModal',
+    components: {
+      InspectPlanForm
+    },
+    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/inspectPlan/modules/InspectPlanModal.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="关闭">
+    <inspect-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inspect-plan-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import InspectPlanForm from './InspectPlanForm'
+  export default {
+    name: 'InspectPlanModal',
+    components: {
+      InspectPlanForm
+    },
+    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_cmms/inspectSpot/InspectSpotList.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <inspect-spot-modal ref="modalForm" @ok="modalFormOk"></inspect-spot-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import InspectSpotModal from './modules/InspectSpotModal'
+
+  export default {
+    name: 'InspectSpotList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      InspectSpotModal
+    },
+    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:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsInspectSpot/cmmsInspectSpot/list",
+          delete: "/cmmsInspectSpot/cmmsInspectSpot/delete",
+          deleteBatch: "/cmmsInspectSpot/cmmsInspectSpot/deleteBatch",
+          exportXlsUrl: "/cmmsInspectSpot/cmmsInspectSpot/exportXls",
+          importExcelUrl: "cmmsInspectSpot/cmmsInspectSpot/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:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'contentcode',text:'巡检内容编号',dictCode:''})
+        fieldList.push({type:'string',value:'contentname',text:'巡检内容名称',dictCode:''})
+        fieldList.push({type:'string',value:'equipdefid',text:'设备类型',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_cmms/inspectSpot/modules/InspectSpotForm.vue

@@ -0,0 +1,187 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <div class="cmms-dialog-item-title">巡检点基本信息</div>
+        <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="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipdefid">
+              <a-input v-model="model.equipdefid" 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-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <div class="cmms-dialog-item-title u-flex-jab">
+          <div>巡检项目设置</div>
+          <div @click="addInspectItem"><a-icon type="plus"/>巡检项目</div>
+        </div>
+        <a-table
+          ref="table"
+          size="middle"
+          :scroll="{x:true}"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="model.inspectContentList"
+          :pagination="false"
+          class="j-table-force-nowrap">
+          <!-- :loading="loading" -->
+        </a-table>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'InspectSpotForm',
+    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: "/cmmsInspectSpot/cmmsInspectSpot/add",
+          edit: "/cmmsInspectSpot/cmmsInspectSpot/edit",
+          queryById: "/cmmsInspectSpot/cmmsInspectSpot/queryById"
+        },
+        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:'巡检项目类型',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          {
+            title:'巡检设备',
+            align:"center",
+            dataIndex: 'equipmentname'
+          },
+          // {
+          //   title:'标准',
+          //   align:"center",
+          //   dataIndex: 'inspectionstandards',
+          // },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          }
+        ],
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.visible = true;
+        // this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.visible = true;
+        this.confirmLoading = true
+        // this.model = Object.assign({}, record);
+        getAction(this.url.queryById, {id: record.id}).then((res) => {
+          this.model = res.result
+          this.confirmLoading = false
+        })
+      },
+      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>
+<style scoped>
+  @import '~@/assets/less/uStyle.less';
+</style>

src/views/module_cmms/inspectSpot/modules/InspectSpotModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <inspect-spot-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inspect-spot-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 InspectSpotForm from './InspectSpotForm'
+
+  export default {
+    name: 'InspectSpotModal',
+    components: {
+      InspectSpotForm
+    },
+    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/inspectSpot/modules/InspectSpotModal.vue

@@ -0,0 +1,56 @@
+<template>
+  <u-modal
+    :title="title"
+    :visible.sync="visible"
+    @ok="handleOk"
+    @cancel="handleCancel">
+    <inspect-spot-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inspect-spot-form>
+  </u-modal>
+</template>
+
+<script>
+
+  import InspectSpotForm from './InspectSpotForm'
+  export default {
+    name: 'InspectSpotModal',
+    components: {
+      InspectSpotForm
+    },
+    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>