Merge branch 'develop' into test

miniprogram/pages/components/EquipmentWarning/EquipmentWarning.ts

@@ -134,6 +134,23 @@ Component({
           console.log(err);
         });
     },
+    openEquipment(e) {
+      const { code, type } = e.currentTarget.dataset;
+      console.log(code);
+      deviceFetch({
+        url: `/device/${code}/${type}/enable`,
+        method: 'POST',
+      })
+        .then(res => {
+          wx.showToast({
+            title: res.msg || '操作成功',
+          });
+          this.refreshList();
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
     closeEquipment(e) {
       const { code, type } = e.currentTarget.dataset;
       console.log(code);

miniprogram/pages/components/EquipmentWarning/EquipmentWarning.wxml

@@ -14,9 +14,12 @@
         <view class="EquipmentWarning-listItem-title">
           <view class="EquipmentWarning-listItem-titleCode">{{item.deviceCode}}</view>
           <view class="EquipmentWarning-listItem-titleLocation">{{item.deviceLocation}}</view>
-          <view class="EquipmentWarning-listItem-titleState" data-code="{{item.deviceCode}}" data-type="{{item.deviceType}}" bind:tap="closeEquipment">
+          <view wx:if="{{item.status === 1}}" class="EquipmentWarning-listItem-titleState Close" data-code="{{item.deviceCode}}" data-type="{{item.deviceType}}" bind:tap="closeEquipment">
             禁用
           </view>
+          <view wx:if="{{item.status === 0}}" class="EquipmentWarning-listItem-titleState Open" data-code="{{item.deviceCode}}" data-type="{{item.deviceType}}" bind:tap="openEquipment">
+            启用
+          </view>
         </view>
         <view class="EquipmentWarning-listItem-info">
           <view class="EquipmentWarning-listItem-infoErr">{{item.operationName}}</view>

miniprogram/pages/components/EquipmentWarning/EquipmentWarning.wxss

@@ -67,9 +67,15 @@
   width: 80rpx;
   height: 60rpx;
   line-height: 60rpx;
+  margin-left: 120rpx;
+}
+.EquipmentWarning-listItem-titleState.Open {
+  background-color: #e6f9ec;
+  color: #6edb8f;
+}
+.EquipmentWarning-listItem-titleState.Close {
   background-color: #ffe5e5;
   color: #fe6868;
-  margin-left: 120rpx;
 }
 .EquipmentWarning-listItem-info {
   display: flex;