优化

src/views/module_ems/baseSpace/baseSpaceList.vue

@@ -178,6 +178,7 @@
         ],
         url: {
           list: "/space/space/rootList",
+          // list: "/space/space/list",
           childList: "/space/space/childList",
           getChildListBatch: "/space/space/getChildListBatch",
           delete: "/space/space/delete",

src/views/module_ems/tpmEquipmentTree/TpmEquipmentTreeList.vue

@@ -146,7 +146,8 @@
           }
         ],
         url: {
-          list: "/tpmEquipmentTree/tpmEquipmentTree/rootList",
+          // list: "/tpmEquipmentTree/tpmEquipmentTree/rootList",
+          list: "/tpmEquipmentTree/tpmEquipmentTree/treeList",
           childList: "/tpmEquipmentTree/tpmEquipmentTree/childList",
           getChildListBatch: "/tpmEquipmentTree/tpmEquipmentTree/getChildListBatch",
           delete: "/tpmEquipmentTree/tpmEquipmentTree/delete",

src/views/module_ems/tpmTag/TpmTagList.vue

@@ -10,6 +10,18 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="点位名">
+              <j-search-select-tag v-model="queryParam.tagname" placeholder="请选择点位" dict="ems_tpm_tag,tagname,tagname"  />
+              <!-- <a-select
+              v-model="queryParam.tagname"
+              placeholder="请选择点位"
+              show-search
+              allowClear
+              :options="pointOptions">
+              </a-select> -->
+            </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>
@@ -107,7 +119,7 @@
 </template>
 
 <script>
-
+  import { httpAction, getAction } from '@/api/manage'
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -222,14 +234,18 @@ import TpmTagModalPL from './modulesPL/TpmTagModalPL.vue'
           deleteBatch: "/tpmTag/tpmTag/deleteBatch",
           exportXlsUrl: "/tpmTag/tpmTag/exportXls",
           importExcelUrl: "tpmTag/tpmTag/importExcel",
-
+          getPoint: "/tpmIoserverTag/tpmIoserverTag/tagList"
         },
         dictOptions:{},
         superFieldList:[],
+        // 点位名下拉列表
+        pointOptions: [],
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
+      // 获取点位数据
+      this.getPointOptions()
     },
     computed: {
       importExcelUrl: function(){
@@ -261,7 +277,17 @@ import TpmTagModalPL from './modulesPL/TpmTagModalPL.vue'
         this.$refs.modalFormPL.title = "批量引入点位";
         this.$refs.modalFormPL.disableSubmit = false;
         this.$refs.modalFormPL.visible = true;
-      }
+      },
+      getPointOptions() {
+            getAction(this.url.getPoint, this.queryParam).then((res) => {
+                this.pointOptions = res.result.map(item => {
+                    return {
+                      value: item.tagname,
+                      label: item.tagname
+                    }
+                })
+            })
+        },
     }
   }
 </script>