优化

src/views/module_cmms/spotcheck/SpotcheckList.vue

@@ -20,10 +20,10 @@
             <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">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -34,12 +34,12 @@
     <!-- 操作按钮区域 -->
     <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-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>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <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>
@@ -216,8 +216,8 @@
         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:'sel_search',value:'equipmentid',text:'设备ID',dictTable:"tpm_equipment", dictText:'equipmentname', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'spotcheckcontid',text:'所属点检内容ID',dictTable:"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:''})

src/views/module_cmms/spotcheck/index.vue

@@ -0,0 +1,49 @@
+<template>
+    <div class="all">
+        <div class="left">
+            <u-equipment-tree @select="selectEquipment"></u-equipment-tree>
+        </div>
+        <div class="right">
+            <spotcheck-list></spotcheck-list>
+        </div>
+    </div>
+</template>
+
+<script>
+import SpotcheckList from './SpotcheckList.vue';
+
+    export default({
+        components: {
+            SpotcheckList
+        },
+        data () {
+            return {
+            }
+        },
+        methods: {
+            selectEquipment(selectedKeys,e){
+                console.log(selectedKeys,e)
+            }
+        },
+    })
+</script>
+
+<style scoped>
+.all{
+    height: calc(100vh - 90px);
+    width: 100%;
+    display: flex;
+}
+.left{
+    height: 100%;
+    width: 20%;
+    /* border: 2px solid red; */
+    margin-right: 10px;
+    margin-left: 5px;
+}
+.right{
+    height: 100%;
+    width: 80%;
+    /* border: 2px solid red; */
+}
+</style>

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

@@ -15,12 +15,12 @@
           </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"  />
+              <j-search-select-tag v-model="model.equipmentid" dict="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"  />
+              <j-search-select-tag v-model="model.spotcheckcontid" dict="cmms_spotcheck_content,contentname,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

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

@@ -1,5 +1,5 @@
 <template>
-  <j-modal
+  <u-modal
     :title="title"
     :width="width"
     :visible="visible"
@@ -8,9 +8,8 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <!-- <cmms-spotcheck-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-form> -->
     <spotcheck-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></spotcheck-form>
-  </j-modal>
+  </u-modal>
 </template>
 
 <script>

src/views/module_cmms/spotcheckContent/index.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="all">
         <div class="left">
+            <u-equipment-tree @select="selectEquipment"></u-equipment-tree>
         </div>
         <div class="right">
-            <!-- <cmms-spotcheck-content-list></cmms-spotcheck-content-list> -->
             <spotcheck-content-list></spotcheck-content-list>
         </div>
     </div>
@@ -19,13 +19,18 @@ import SpotcheckContentList from './SpotcheckContentList.vue';
         data () {
             return {
             }
-        }
+        },
+        methods: {
+            selectEquipment(selectedKeys,e){
+                console.log(selectedKeys,e)
+            }
+        },
     })
 </script>
 
 <style scoped>
 .all{
-    height: calc(100vh - 135px);
+    height: calc(100vh - 90px);
     width: 100%;
     display: flex;
 }

src/views/module_tpm/tag/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="all">
         <div class="left">
-            <!-- <tpm-device-list></tpm-device-list> -->
-            <device-list></device-list>
+            <u-equipment-tree @select="selectEquipment"></u-equipment-tree>
+            <!-- <device-list></device-list> -->
         </div>
         <div class="right">
             <!-- <tpm-tag-list></tpm-tag-list> -->
@@ -24,13 +24,18 @@ import DeviceList from './DeviceList.vue';
             return {
                 
             }
-        }
+        },
+        methods: {
+            selectEquipment(selectedKeys,e){
+                console.log(selectedKeys,e)
+            }
+        },
     })
 </script>
 
 <style scoped>
 .all{
-    height: calc(100vh - 135px);
+    height: calc(100vh - 90px);
     width: 100%;
     display: flex;
 }