瀏覽代碼

fix设备分类

LLL 1 年之前
父節點
當前提交
d8d35bab7e

+ 1 - 1
.env.test

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://boot.jeecg.com:8080/jeecg-boot
+VUE_APP_API_BASE_URL=http://boot.jeecg.com:8867/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 13 - 13
src/views/module_ems/tpmEquipmentDefine/TpmEquipmentDefineList.vue

@@ -11,7 +11,7 @@
                 ref="treeSelect"
                 placeholder="请选择设备分类"
                 v-model="queryParam.id"
-                dict="ems_tpm_equipment_define,name,id"
+                dict="ems_tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"
@@ -108,7 +108,7 @@
       </a-table>
     </div>
 
-    <tpmEquipmentDefine-modal ref="modalForm" @ok="modalFormOk"></tpmEquipmentDefine-modal>
+    <tpmEquipmentTree-modal ref="modalForm" @ok="modalFormOk"></tpmEquipmentTree-modal>
   </a-card>
 </template>
 
@@ -116,15 +116,15 @@
 
   import { getAction, deleteAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmEquipmentDefineModal from './modules/TpmEquipmentDefineModal'
+  import TpmEquipmentTreeModal from './modules/TpmEquipmentTreeModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { filterObj } from '@/utils/util';
 
   export default {
-    name: "TpmEquipmentDefineList",
+    name: "TpmEquipmentTreeList",
     mixins:[JeecgListMixin],
     components: {
-      TpmEquipmentDefineModal
+      TpmEquipmentTreeModal
     },
     data () {
       return {
@@ -146,13 +146,13 @@
           }
         ],
         url: {
-          list: "/tpmEquipmentDefine/tpmEquipmentDefine/rootList",
-          childList: "/tpmEquipmentDefine/tpmEquipmentDefine/childList",
-          getChildListBatch: "/tpmEquipmentDefine/tpmEquipmentDefine/getChildListBatch",
-          delete: "/tpmEquipmentDefine/tpmEquipmentDefine/delete",
-          deleteBatch: "/tpmEquipmentDefine/tpmEquipmentDefine/deleteBatch",
-          exportXlsUrl: "/tpmEquipmentDefine/tpmEquipmentDefine/exportXls",
-          importExcelUrl: "tpmEquipmentDefine/tpmEquipmentDefine/importExcel",
+          list: "/tpmEquipmentTree/tpmEquipmentTree/rootList",
+          childList: "/tpmEquipmentTree/tpmEquipmentTree/childList",
+          getChildListBatch: "/tpmEquipmentTree/tpmEquipmentTree/getChildListBatch",
+          delete: "/tpmEquipmentTree/tpmEquipmentTree/delete",
+          deleteBatch: "/tpmEquipmentTree/tpmEquipmentTree/deleteBatch",
+          exportXlsUrl: "/tpmEquipmentTree/tpmEquipmentTree/exportXls",
+          importExcelUrl: "tpmEquipmentTree/tpmEquipmentTree/importExcel",
         },
         expandedRowKeys:[],
         hasChildrenField:"hasChild",
@@ -357,7 +357,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'设备分类名称',dictCode:''})
-        fieldList.push({type:'string',value:'parentid',text:'上级ID',dictCode:"ems_tpm_equipment_define,name,id"})
+        fieldList.push({type:'string',value:'parentid',text:'上级ID',dictCode:"ems_tpm_equipment_tree,name,id"})
         this.superFieldList = fieldList
       }
     }

+ 10 - 10
src/views/module_ems/tpmEquipmentDefine/modules/TpmEquipmentDefineModal.vue

@@ -18,14 +18,14 @@
             ref="treeSelect"
             placeholder="请选择上级"
             v-model="model.parentid"
-            dict="ems_tpm_equipment_define,name,id"
+            dict="ems_tpm_equipment_tree,name,id"
             pidField="parentid"
             pidValue="0"
             hasChildField="has_child"
             >
           </j-tree-select>
         </a-form-model-item>
-        
+
       </a-form-model>
     </a-spin>
   </j-modal>
@@ -37,8 +37,8 @@
   import { duplicateCheck } from '@/api/api'
   import { validateDuplicateValue } from '@/utils/util'
   export default {
-    name: "TpmEquipmentDefineModal",
-    components: { 
+    name: "TpmEquipmentTreeModal",
+    components: {
     },
     data () {
       return {
@@ -67,12 +67,12 @@
           // ],
         },
         url: {
-          add: "/tpmEquipmentDefine/tpmEquipmentDefine/add",
-          edit: "/tpmEquipmentDefine/tpmEquipmentDefine/edit",
+          add: "/tpmEquipmentTree/tpmEquipmentTree/add",
+          edit: "/tpmEquipmentTree/tpmEquipmentTree/edit",
         },
         expandedRowKeys:[],
         pidField:"parentid"
-     
+
       }
     },
     created () {
@@ -82,7 +82,7 @@
     methods: {
       validateTemplateCode(rule, value, callback){
         var params = {
-          tableName: "ems_tpm_equipment_define",
+          tableName: "ems_tpm_equipment_tree",
           fieldName: "name",
           fieldVal: value,
           dataId: this.model.name
@@ -170,8 +170,8 @@
           }
         }
       }
-      
-      
+
+
     }
   }
 </script>