Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly

src/router/index.js

@@ -135,7 +135,7 @@ const SimulationPlatform = () => import('@/views/trainingPlatform/simulation');
 
 const PublishMap = () => import('@/views/publish/publishMap/index');
 const SubsystemManage = () => import('@/views/publish/publishMap/subsystem');
-const IscsDataManage = () => import('@/views/publish/publishMap/iscsDataManage');
+const IscsDataManage = () => import('@/views/publish/publishMap/iscsDataManage/index');
 const PublishMapDetail = () => import('@/views/publish/publishMap/list'); // 发布历史
 const PublishLesson = () => import('@/views/publish/publishLesson/index');
 const RunPlanTemplate = () => import('@/views/publish/runPlanTemplate/index');

src/views/publish/publishMap/iscsDataManage/index.vue

@@ -74,13 +74,6 @@ export default {
                 labelWidth: '120px',
                 reset: true,
                 queryObject: {
-                    mapId: {
-                        type: 'select',
-                        label: '地图',
-                        config: {
-                            data: []
-                        }
-                    },
                     code: {
                         type: 'text',
                         label: 'code'
@@ -109,7 +102,7 @@ export default {
                 }
             },
             deviceQueryList: {
-                query: pagedIscsDevice,
+                query: this.queryDeviceFunction,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -171,13 +164,6 @@ export default {
                 labelWidth: '120px',
                 reset: true,
                 queryObject: {
-                    mapId: {
-                        type: 'select',
-                        label: '地图',
-                        config: {
-                            data: []
-                        }
-                    },
                     system: {
                         type: 'select',
                         label: '系统',
@@ -196,7 +182,7 @@ export default {
 
             },
             resourceQueryList: {
-                query: pagedIscsResources,
+                query: this.queryResourcesFunction,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -311,6 +297,11 @@ export default {
             }
         };
     },
+    computed: {
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
     mounted() {
         getPublishMapListOnline().then(resp => {
             this.mapList = resp.data;
@@ -318,12 +309,20 @@ export default {
             this.mapList.forEach(elem => {
                 list.push({ label: elem.name, value: elem.id });
             });
-            this.deviceQueryForm.queryObject.mapId.config.data = list;
+            // this.deviceQueryForm.queryObject.mapId.config.data = list;
         }).catch(() => {
             this.$message.error('获取地图列表失败！');
         });
     },
     methods: {
+        queryDeviceFunction(params) {
+            params.mapId = this.mapId;
+            return pagedIscsDevice(params);
+        },
+        queryResourcesFunction(params) {
+            params.mapId = this.mapId;
+            return pagedIscsResources(params);
+        },
         // 删除
         handleDeleteDevice(index, row) {
             this.$confirm('此操作将删除该ISCS设备数据！', this.$t('global.tips'), {