Merge remote-tracking branch 'origin/main'

ui/dasadmin/src/views/backend/WindBlower/index.vue

@@ -987,6 +987,8 @@ const realTimeDataState = computed(() => {
             return '停机'
         case 11:
             return '待机'
+        case 33:
+            return '通讯中断'
         case 1110:
             return '解缆状态'
         case 1111:

ui/dasadmin/src/views/backend/energyManage/index.vue

@@ -174,7 +174,7 @@
                                 </div>
                                 <div class="right">
                                     <div class="num">33</div>
-                                    <div class="unit">MW</div>
+                                    <div class="unit">MVar</div>
                                 </div>
                             </div>
                             <div class="rect">
@@ -184,7 +184,7 @@
                                 </div>
                                 <div class="right">
                                     <div class="num">6</div>
-                                    <div class="unit">MW</div>
+                                    <div class="unit">MVar</div>
                                 </div>
                             </div>
                             <div class="check">
@@ -227,17 +227,17 @@
                                 </div>
                             </div>
                             <div class="check">
-                                <div class="left">AVC可增有功</div>
+                                <div class="left">AVC可增无功</div>
                                 <div class="right">
                                     <div class="num">5</div>
-                                    <div class="unit">MW</div>
+                                    <div class="unit">MVar</div>
                                 </div>
                             </div>
                             <div class="check">
-                                <div class="left">AVC可减有功</div>
+                                <div class="left">AVC可减无功</div>
                                 <div class="right">
                                     <div class="num">5</div>
-                                    <div class="unit">MW</div>
+                                    <div class="unit">MVar</div>
                                 </div>
                             </div>
                         </div>

ui/dasadmin/src/views/backend/equipment/airBlower/index.vue

@@ -272,6 +272,10 @@ const airBlowerSelectOptions = reactive<{ [K in SelectTypeKeyUnionType]: { label
             label: '停机',
             value: 2,
         },
+        {
+            label: '通讯中断',
+            value: 33,
+        },
         {
             label: '解缆状态',
             value: 1110,

ui/dasadmin/src/views/backend/home/windMatrix.vue

@@ -6,32 +6,35 @@
                      @click="handleClick(item)"
                      @contextmenu.prevent="windContextMenu($event,item)"
                 >
-                    <div class="FanList-panel" :class="item.standard == true ? 'wind-mark' : 'wind-default'">
+                    <div class="FanList-panel" :class="{
+                                'wind-mark': item.standard==1,
+                                'wind-default': item.standard==0,
+                                'wind-offline': item.attributeMap.processedoperationmode == 33
+                                  }">
+
                     <div class="fanlist-top">
-                            <span :class="item.standard == true ? 'wind-mark-icon' : 'fanlist-icon'">
+                            <span :class="item.standard == 1 ? 'wind-mark-icon' : 'fanlist-icon'">
-                                <img :class="item.standard == true ? '' : 'wind-picture'" src="~assets/dashboard/biaogan.png" alt="" />
+                                <img :class="item.standard == 1 ? '' : 'wind-picture'" src="~assets/dashboard/biaogan.png" alt="" />
                             </span>
                             <span class="fanlist-name"> {{ item.name }}</span>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 20" class="tag-panel is-primary" type="primary">并网</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 11" class="tag-panel is-warning" type="primary">待机</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 16" class="tag-panel is-success" type="primary">启动</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 10" class="tag-panel is-maintenance" type="primary"
-                                >维护</el-tag
+                                >维护</el-tag>
-                            >
                             <el-tag v-if="item.attributeMap.processedoperationmode === 0" class="tag-panel is-offline" type="primary">离线</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 8" class="tag-panel info" type="primary">限功率运行</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 6" class="tag-panel is-danger" type="primary">正常停机</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 1" class="tag-panel is-danger" type="primary"
-                                >外部因素导致停机</el-tag
+                                >外部因素导致停机</el-tag>
-                            >
                             <el-tag v-if="item.attributeMap.processedoperationmode === 2" class="tag-panel is-danger" type="primary">停机</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 1110" class="tag-panel is-info" type="primary">解缆状态</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 1111" class="tag-panel is-danger" type="primary"
-                                >电网故障停机</el-tag
+                                >电网故障停机</el-tag>
-                            >
                             <el-tag v-if="item.attributeMap.processedoperationmode === 1112" class="tag-panel is-danger" type="primary"
-                                >安全链停机</el-tag
+                                >安全链停机</el-tag>
-                            >
+                            <el-tag v-if="item.attributeMap.processedoperationmode === 33" class="tag-panel is-offline" type="primary"
+                            >通讯中断</el-tag>
                         </div>
                         <div class="fanlist-main">
                             <el-row>
@@ -254,6 +257,10 @@ const sendManualCommand = (type: 1 | 0) => {
     background-image: linear-gradient(180deg, #f0f6ff 0%, #ffffff 50%);
     border: 1px solid #e1edf6;
 }
+.wind-offline {
+    background-image: linear-gradient(180deg, #eeeeee 0%, #eeeeee 50%);
+    border: 1px solid #eeeeee;
+}
 .wind-picture {
     display: none;
 }

ui/dasadmin/src/views/backend/node/protocol.vue

@@ -1052,6 +1052,22 @@ const formColumnList: formColumnType[] = [
                         value: true,
                     },
                 },
+                {
+                    key: 'adsUser',
+                    data: {
+                        label: 'ADS账号',
+                        type: 'input',
+                        value: '',
+                    },
+                },
+                {
+                    key: 'adsPassword',
+                    data: {
+                        label: 'ADS密码',
+                        type: 'password',
+                        value: '',
+                    },
+                },
                 {
                     key: 'ftpMode',
                     data: {
@@ -1101,26 +1117,6 @@ const formColumnList: formColumnType[] = [
                         showValue: '1',
                     },
                 },
-                {
-                    key: 'adsUser',
-                    data: {
-                        label: 'ADS账号',
-                        type: 'input',
-                        value: '',
-                        showKey: 'ftpMode',
-                        showValue: '1',
-                    },
-                },
-                {
-                    key: 'adsPassword',
-                    data: {
-                        label: 'ADS密码',
-                        type: 'password',
-                        value: '',
-                        showKey: 'ftpMode',
-                        showValue: '1',
-                    },
-                },
             ],
             timeOutOption: [],
             otherOption: [],