修复bug

commandCenter/src/views/commandDispatch/index.vue

@@ -19,7 +19,8 @@
             <work-order-processing-status></work-order-processing-status>
         </div>
         <div class="index-content-right-buttom" @click="toggleShow"><span></span>{{ !showChart ? '显示' : '隐藏' }}图表</div>
-        <div class="index-dotting-list" :class="showChart ? '' : 'showChart'" v-if="menuListShow">
+        <div class="index-dotting-list" :class="showChart ? '' : 'showChart'" >
+           <!-- <div class="index-dotting-list" :class="showChart ? '' : 'showChart'" v-if="menuListShow"></div> -->
             <div class="list-type" @click="addPoint()" :class="{ thisDotting: openCur == 1 }">
                 <span class="zoniot_font zoniot-icon-tianjia1"></span>添加
             </div>

commandCenter/src/views/commandDispatch/pop/dottingEquipment.vue

@@ -123,7 +123,7 @@ export default {
                     if (status == 0) {
                         data.list.map((item) => {
                             arrs.push({
-                                id: item.id,
+                                id: `${item.id},${item.tenantId}`,
                                 name: item.deviceName,
                                 address: item.address
                             });

commandCenter/src/views/commandDispatch/pop/tableList.vue

@@ -64,7 +64,7 @@ export default {
         },
         getAccessControl() {
             this.$http
-                .get('/sc-gate-web/alarm/page', { deviceNo: this.params.deviceNo })
+                .get('/sc-gate-web/alarm/page', { gateId: this.params.deviceNo })
                 .then(({ status, data: { list = [], total = 0 }, msg }) => {
                     this.cols[0].prop = 'alarmName';
                     this.cols[1].prop = 'waringDate';

commandCenter/src/views/commandDispatch/pop/typeAccessControl.vue

@@ -27,10 +27,10 @@ export default {
         };
     },
     methods: {
-        getData() {
+        getData(id) {
             new Promise((resolve) => {
                 this.$http
-                    .get(`/sc-gate-web/gate/find/${this.params.row.deviceId}`)
+                    .get(`/sc-gate-web/gate/find/${id}`)
                     .then(({ status, data, msg }) => {
                         if (status == 0) {
                             resolve && resolve(data);
@@ -75,7 +75,7 @@ export default {
         openType(id) {
             this.$msgBox(`远程开门`, `是否远程开门?`)
                 .then(() => {
-                    this.$http.post('/sc-gate-web/gate/remoteOpenDoor', { ids: id }).then(({ status, data, msg }) => {
+                    this.$http.post('/sc-gate-web/gate/remoteOpenDoor', { ids: [id] }).then(({ status, data, msg }) => {
                         if (0 === status) {
                             this.$message({
                                 type: 'success',
@@ -99,7 +99,7 @@ export default {
                 showCancelButton: true,
                 props: {
                     row: this.params.row,
-                    deviceNo: this.formData.deviceNo
+                    deviceNo: this.formData.tenantId
                 }
             });
             this.params.callback();
@@ -107,7 +107,12 @@ export default {
         }
     },
     created() {
-        this.getData();
+        let ids = JSON.parse(JSON.stringify(this.params.row.deviceId));
+        let newIds = ids.split(',');
+        debugger;
+        this.formData.nodeId = newIds[0];
+        this.formData.tenantId = newIds[1];
+        this.getData(newIds[0]);
     }
 };
 </script>