Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/home/infrastructurePage.vue

@@ -117,14 +117,14 @@
           </div>
           <a-button
             style="
-               width: 80px; 
-               height: 32px;
-               text-align: center;
-               background: #0558e1;
-                color: #fff;
-                border: 1px solid #0558e1;
-                border-radius: 2px;
-                font-size: 14px;
+              width: 80px;
+              height: 32px;
+              text-align: center;
+              background: #0558e1;
+              color: #fff;
+              border: 1px solid #0558e1;
+              border-radius: 2px;
+              font-size: 14px;
             "
             @click="appointment(item)"
           >
@@ -357,7 +357,7 @@
                   :showSearch="true"
                 >
                   <a-select-option
-                    :value="item.value"
+                    :value="item.label"
                     v-for="item in deptList"
                     :key="item.value"
                   >
@@ -408,23 +408,12 @@
             :wrapper-col="{ span: 14, offset: 4 }"
             style="text-align: center; margin-top: 0.4rem"
           >
-          <a-button
-             class="tijiao"
-            
-              @click="onSubmit"
-            >
-              提交
-            </a-button>
-            <a-button class="quxiao" @click="appointmentRoom = false" >
+            <a-button class="tijiao" @click="onSubmit">提交</a-button>
+            <a-button class="quxiao" @click="appointmentRoom = false">
               取消
             </a-button>
-   
           </a-form-item>
         </a-form>
-       
-          
-            
-   
       </a-modal>
     </div>
     <div v-if="room">
@@ -882,7 +871,7 @@
     deptList.value = []
     res.data.data.map((val) => {
       deptList.value.push({
-        value: val.name,
+        value: val.id,
         label: val.name,
       })
     })
@@ -1215,7 +1204,8 @@
     if (item && item.status != 1) {
       return
       // return message.warning('当前设备离线, 不可预览！')
-    }handleChose
+    }
+    handleChose
     console.log('打开视频', id)
     const param = {
       key: id,
@@ -2520,38 +2510,37 @@
   })
 </script>
 <style lang="less" scoped>
- 
-.quxiao{
-      margin-right:12px;
-      cursor: pointer;
-      width: 90px;
-      height: 32px;
-      background: #ffffff;
-      color:#0058e1;
-      border-radius: 2px;
-      border: 1px #0058e1 solid;
-    }
-    .quxiao:hover{
-      background: #fff;
-  color: #0558e1;
-  opacity: 0.8;
-    }
-    .tijiao{
-      margin-right:12px;
-      cursor: pointer;
-      width: 90px;
-      height: 32px;
-      background: #0058e1;
-      color:#ffffff;
-      border-radius: 2px;
-      border: 1px #0058e1 solid;
-      margin-left:20px;
-    }
-    .tijiao:hover{
-      background: #0558e1;
-      color: #fff;
-      opacity: 0.8;
-    }
+  .quxiao {
+    margin-right: 12px;
+    cursor: pointer;
+    width: 90px;
+    height: 32px;
+    background: #ffffff;
+    color: #0058e1;
+    border-radius: 2px;
+    border: 1px #0058e1 solid;
+  }
+  .quxiao:hover {
+    background: #fff;
+    color: #0558e1;
+    opacity: 0.8;
+  }
+  .tijiao {
+    margin-right: 12px;
+    cursor: pointer;
+    width: 90px;
+    height: 32px;
+    background: #0058e1;
+    color: #ffffff;
+    border-radius: 2px;
+    border: 1px #0058e1 solid;
+    margin-left: 20px;
+  }
+  .tijiao:hover {
+    background: #0558e1;
+    color: #fff;
+    opacity: 0.8;
+  }
   .queding {
     margin-left: 16px;
     cursor: pointer;
@@ -2870,7 +2859,7 @@
       .rightContent {
         height: 1.75rem;
         width: 5.8rem;
-        margin-right:72px;
+        margin-right: 72px;
         .topContent {
           font-size: 0.2rem;
           color: #000;
@@ -2903,16 +2892,15 @@
     font-size: 16px !important;
     font-weight: 600 !important;
   }
-  :deep(.ant-table-tbody > tr.ant-table-row-selected > td){
+  :deep(.ant-table-tbody > tr.ant-table-row-selected > td) {
     background: #e6eefb;
- }
- :deep(.ant-checkbox-checked .ant-checkbox-inner){
-  background-color: #0058e1;
- }
- :deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after){
-  background-color: #0058e1;
- }
-
+  }
+  :deep(.ant-checkbox-checked .ant-checkbox-inner) {
+    background-color: #0058e1;
+  }
+  :deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after) {
+    background-color: #0058e1;
+  }
 </style>
 <style lang="less">
   .eia-dropdown-class {
@@ -2950,13 +2938,13 @@
 
     .ant-modal-title {
       font-weight: 600;
-      color:#fff;
+      color: #fff;
     }
-    
+
     .ant-modal-content {
       .ant-modal-header {
         background: #0058e1;
-      margin-bottom: 16px;
+        margin-bottom: 16px;
         border-bottom: 0 !important;
       }
     }