Shannon_mu 2 лет назад
Родитель
Сommit
bef48bd5d2

+ 0 - 1
commandCenter/src/views/commandDispatch/pop/typeAccessControl.vue

@@ -81,7 +81,6 @@ export default {
                                 type: 'success',
                                 message: '远程开门成功!'
                             });
-                            this.mixins_search();
                         } else {
                             this.$message.error(msg);
                         }

+ 39 - 24
commandCenter/src/views/commandDispatch/pop/typeCard.vue

@@ -2,19 +2,19 @@
     <div class="diyTable">
         <div class="list">
             <div class="list-title">停车场</div>
-            <div class="list-text">{{ formData.address || '--' }}</div>
+            <div class="list-text">{{ formData.parkName || '--' }}</div>
         </div>
         <div class="list">
             <div class="list-title">车位总数</div>
-            <div class="list-text">{{ formData.readData || '--' }}</div>
+            <div class="list-text">{{ formData.totalNum || '--' }}</div>
         </div>
         <div class="list">
             <div class="list-title">剩余车位</div>
-            <div class="list-text">{{ typeStatus(formData.deviceStatus) }}</div>
+            <div class="list-text">{{ formData.freeSpaceNum || '--' }}</div>
         </div>
         <div class="list">
             <div class="list-title">开关按钮</div>
-            <div class="list-text">{{ formData.readData || '--' }}</div>
+            <div class="list-text"><div class="button" @click="openType(formData)">开阀</div></div>
         </div>
     </div>
 </template>
@@ -24,17 +24,17 @@ export default {
     data() {
         return {
             formData: {
-                address:'',
-                readData:'',
-                deviceStatus:'',
-                readData:''
+                parkName: '',
+                totalNum: '',
+                freeSpaceNum: '',
             }
         };
     },
     methods: {
         getData() {
+            debugger;
             this.$http
-                .get('/sc-energy/device/detail', { deviceId: this.params.row.deviceId })
+                .get('/sc-community/parkingCar/queryParkingLot', { parkId: this.params.row.deviceId })
                 .then(({ status, data, msg }) => {
                     if (status == 0) {
                         // this.formData = data;
@@ -45,21 +45,24 @@ export default {
                 })
                 .catch(() => {});
         },
-        typeStatus(val) {
-            switch (val) {
-                case 1:
-                    return '正常';
-                case 2:
-                    return '告警';
-                case 3:
-                    return '离线';
-                case 4:
-                    return '未启用';
-                case 5:
-                    return '报废';
-                default:
-                    return '--';
-            }
+        openType(formData) {
+            debugger;
+            this.$msgBox(`远程开门`, `是否远程开闸?`)
+                .then(() => {
+                    this.$http
+                        .post('/sc-community/parkingCar/operateChannel', { nodeId: '', parkId: formData.parkId, type: 0 })
+                        .then(({ status, data, msg }) => {
+                            if (0 === status) {
+                                this.$message({
+                                    type: 'success',
+                                    message: '远程开闸成功!'
+                                });
+                            } else {
+                                this.$message.error(msg);
+                            }
+                        });
+                })
+                .catch(() => {});
         }
     },
     created() {
@@ -92,6 +95,18 @@ export default {
             overflow: hidden;
             text-overflow: ellipsis;
         }
+        .button {
+            width: 60px;
+            height: 30px;
+            background: #0eaeff;
+            border-radius: 4px;
+            text-align: center;
+            line-height: 30px;
+            margin-top: 5px;
+            cursor: pointer;
+            display: inline-block;
+            margin-right: 5px;
+        }
     }
 }
 </style>

+ 18 - 14
commandCenter/src/views/commandDispatch/pop/typeHydropower.vue

@@ -19,8 +19,8 @@
         <div class="list" v-if="params.row.deviceType == 4">
             <div class="list-title">阀门控制</div>
             <div class="list-text">
-                <div class="button" @click="valveToggle(0,formData.id)">开阀</div>
-                <div class="button" @click="valveToggle(1,formData.id)">关阀</div>
+                <div class="button" @click="valveToggle(0, formData.id)">开阀</div>
+                <div class="button" @click="valveToggle(1, formData.id)">关阀</div>
             </div>
         </div>
     </div>
@@ -47,19 +47,23 @@ export default {
                 })
                 .catch(() => {});
         },
-        valveToggle(satus,id) {
-            this.$http
-                .post('/sc-energy/device/batchValve', {
-                    valveStatus: satus,
-                    ids: id
+        valveToggle(satus, id) {
+            this.$msgBox(`远程开门`, `是否远程开关阀?`)
+                .then(() => {
+                    this.$http
+                        .post('/sc-energy/device/batchValve', {
+                            valveStatus: satus,
+                            ids: id
+                        })
+                        .then(({ status, data, msg }) => {
+                            if (status === 0) {
+                                this.$message.success(msg);
+                            } else {
+                                this.$message.error(msg);
+                            }
+                        });
                 })
-                .then(({ status, data, msg }) => {
-                    if (status === 0) {
-                        this.$message.success(msg);
-                    } else {
-                        this.$message.error(msg);
-                    }
-                });
+                .catch(() => {});
         },
         open() {
             this.$store.dispatch('addPopup', {