소스 검색

智慧场景-智·会议-智慧会议会议中状态额会议室不能点击配置策略UI优化。菜单背景调整。

DESKTOP-6LTVLN7\Liumouren 2 년 전
부모
커밋
b1111a2339

+ 4 - 4
src/components/home/HomeAside.vue

@@ -70,7 +70,7 @@ export default {
     <div
       title="收起"
       class="collapse-btn"
-      style="right: 0;background-color: #23608c;border-radius: 15px 0px 0px 15px"
+      style="right: 0;background-color: #0053cb;border-radius: 15px 0px 0px 15px"
       @click="toggleCollapse"
       v-if="!collapse"
     >
@@ -104,8 +104,8 @@ export default {
 </template>
 
 <style lang="less" scoped>
-@menu-dark-bg: #266a99;
-@menu-dark-submenu-bg: #266a99;
+@menu-dark-bg: #1461cc;
+@menu-dark-submenu-bg: #1461cc;
 @menu-dark-color: #fff;
 @menu-dark-arrow-color: #fff;
 @menu-dark-highlight-color: #fff;
@@ -131,7 +131,7 @@ export default {
     width: 14px;
     height: 80px;
     cursor: pointer;
-    background-color: #266999;
+    background-color: #1461cc;
     position: absolute;
     top: 40%;
     right: -10px;

+ 1 - 1
src/components/home/HomeHeader.vue

@@ -256,7 +256,7 @@ export default {
 }
 
 .icon:hover {
-  background-color: #186399;
+  background-color: #00000032;
 }
 
 /deep/ .ant-select-selection {

+ 13 - 22
src/components/home/HomeLeft.vue

@@ -1,12 +1,7 @@
 <template>
   <div class="homeLeft">
-    <a-menu
-        style="height: 100%;width: 200px;display: inline-block"
-        mode="inline"
-        theme="dark"
-    >
-
-      <a-menu-item-group key="g1" >
+    <a-menu style="height: 100%;width: 200px;display: inline-block" mode="inline" theme="dark">
+      <a-menu-item-group key="g1">
         <template slot="title">
           <div @mouseover="showNav" class="allNavBtn">
             <div style="height: 12px"></div>
@@ -17,7 +12,7 @@
         </template>
       </a-menu-item-group>
 
-      <a-menu-item-group key="common" @mouseover="hideNav" >
+      <a-menu-item-group key="common" @mouseover="hideNav">
         <template slot="title">
           <div style="text-align: center;margin-bottom: 12px">
             <span style="color: #d5d5d5;cursor: default;display: inline-block;margin-left: 12px">常用功能</span>
@@ -55,27 +50,23 @@
           智慧场景
         </a-menu-item>
       </a-menu-item-group>
-
     </a-menu>
 
-    <div class="ioc-nav" v-if="navVisible"  >
-      <NavigationPage :to-route="toRoute" />
-    </div>
-
+    <div class="ioc-nav" v-if="navVisible"><NavigationPage :to-route="toRoute" /></div>
   </div>
 </template>
 
 <script>
 import NavigationPage from "@/components/home/NavigationPage.vue";
-import {requireImg} from "@/utils/requireImg";
+import { requireImg } from "@/utils/requireImg";
 export default {
   data() {
     return {
       navVisible: true
-    }
+    };
   },
   props: {
-    close: Function,
+    close: Function
   },
   components: {
     NavigationPage
@@ -84,12 +75,12 @@ export default {
     requireImg,
     toRoute(item, parent) {
       this.$store.menuStore().currMenu = parent;
-      this.$router.push({path: item.router});
+      this.$router.push({ path: item.router });
       this.close();
     },
     handleClickMenuItem(path) {
-      this.$router.push({path: path});
-      this.close()
+      this.$router.push({ path: path });
+      this.close();
     },
     showNav() {
       //this.navVisible = true;
@@ -98,12 +89,12 @@ export default {
       //this.navVisible = false;
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
-@menu-dark-bg: #266a99;
-@menu-dark-submenu-bg: #266a99;
+@menu-dark-bg: #1461cc;
+@menu-dark-submenu-bg: #1461cc;
 @menu-dark-color: #fff;
 @menu-dark-arrow-color: #fff;
 @menu-dark-highlight-color: #fff;

+ 17 - 37
src/components/notice/notice.vue

@@ -1,52 +1,35 @@
 <template>
   <div class="ioc-notice">
-
     <a-layout style="height: 100%">
       <a-layout-sider v-model="collapsed" :trigger="null" collapsible>
         <div class="logo" />
         <a-menu :default-selected-keys="['unReadNotice']" theme="dark" mode="inline" style="height: 100%" @click="handleClick">
           <a-menu-item-group key="message">
             <template slot="title">
-              <span style="color: white"><a-icon type="notification" /></span>
+              <span style="color: white"><a-icon type="notification"/></span>
               <span style="color: #f0f2f5;padding-left: 12px">通知</span>
             </template>
-            <a-menu-item key="unReadNotice">
-              未读通知
-            </a-menu-item>
-            <a-menu-item key="readNotice">
-              已读通知
-            </a-menu-item>
-            <a-menu-item key="allNotice">
-              全部通知
-            </a-menu-item>
+            <a-menu-item key="unReadNotice"> 未读通知 </a-menu-item>
+            <a-menu-item key="readNotice"> 已读通知 </a-menu-item>
+            <a-menu-item key="allNotice"> 全部通知 </a-menu-item>
           </a-menu-item-group>
           <a-menu-item-group key="feedback">
             <template slot="title">
-              <span style="color: white"><a-icon type="sound" /></span>
+              <span style="color: white"><a-icon type="sound"/></span>
               <span style="color: #f0f2f5;padding-left: 12px">用户反馈</span>
             </template>
-            <a-menu-item key="unReadFeedback">
-              未读反馈
-            </a-menu-item>
-            <a-menu-item key="readFeedback">
-              已读反馈
-            </a-menu-item>
-            <a-menu-item key="allFeedback">
-              全部反馈
-            </a-menu-item>
+            <a-menu-item key="unReadFeedback"> 未读反馈 </a-menu-item>
+            <a-menu-item key="readFeedback"> 已读反馈 </a-menu-item>
+            <a-menu-item key="allFeedback"> 全部反馈 </a-menu-item>
           </a-menu-item-group>
-
         </a-menu>
       </a-layout-sider>
       <a-layout>
-        <a-layout-content
-            :style="{ margin: '12px', padding: '15px', background: '#fff', minHeight: '280px' }"
-        >
+        <a-layout-content :style="{ margin: '12px', padding: '15px', background: '#fff', minHeight: '280px' }">
           <NoticeList :type="type"></NoticeList>
         </a-layout-content>
       </a-layout>
     </a-layout>
-
   </div>
 </template>
 
@@ -56,25 +39,24 @@ export default {
   data() {
     return {
       collapsed: false,
-      type: 'unReadNotice'
-    }
+      type: "unReadNotice"
+    };
   },
   components: {
     NoticeList
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     handleClick(e) {
-      this.type = e.key
+      this.type = e.key;
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
-@menu-dark-bg: #266a99;
-@menu-dark-submenu-bg: #266a99;
+@menu-dark-bg: #1461cc;
+@menu-dark-submenu-bg: #1461cc;
 @menu-dark-color: #fff;
 @menu-dark-arrow-color: #fff;
 @menu-dark-highlight-color: #fff;
@@ -82,10 +64,8 @@ export default {
   width: 100%;
   height: 100%;
   .ioc-notice-left {
-
   }
   .ioc-notice-right {
-
   }
 }
-</style>
+</style>

+ 15 - 24
src/components/scene/meeting/config/meetingRoomItem.vue

@@ -3,10 +3,7 @@
     <a-row>
       <a-col :span="24">
         <div class="meetingRoomItem-title">
-          {{ obj.name }}
-          <span style="font-size: 15px">{{
-            "[" + obj.timeRange[0] + "-" + obj.timeRange[1] + "]"
-          }}</span>
+          {{ obj.name }} <span style="font-size: 15px">{{ "[" + obj.timeRange[0] + "-" + obj.timeRange[1] + "]" }}</span>
         </div>
       </a-col>
       <a-col :span="16" style="z-index:999;">
@@ -28,27 +25,21 @@
       <a-col :span="8">
         <div style="">
           <div class="meetingRoomItem-state" :style="{ color: color.primary }">
-            <span v-if="obj.status == 1">会议中</span>
-            <span v-if="obj.status == 2">闲置中</span>
+            <span v-if="obj.status == 1">会议中</span> <span v-if="obj.status == 2">闲置中</span>
             <span v-if="obj.status == 3">已预订</span>
           </div>
-          <div class="meetingRoomItem-num" :style="{ color: color.primary }">
-            {{ obj.time }}
-          </div>
+          <div class="meetingRoomItem-num" :style="{ color: color.primary }">{{ obj.time }}</div>
         </div>
       </a-col>
       <a-col>
         <div class="meetingRoomItem-opr">
-          <a-button
-            class="meetingRoomItem-opr-btn"
-            :style="{ backgroundColor: color.dark }"
-            @click="viewDetails"
+          <a-button class="meetingRoomItem-opr-btn" :style="{ backgroundColor: color.dark }" @click="viewDetails"
             >查看信息</a-button
           >
           <!-- update-LiuMengxiang:会议中的会议,配置策略不可点击。添加disabled属性 -->
           <a-button
             class="meetingRoomItem-opr-btn"
-            :style="{ backgroundColor: color.dark }"
+            :style="{ backgroundColor: obj.status == 1 ? '#ccc' : color.dark }"
             :disabled="obj.status == 1"
             @click="configMeeting"
             >配置策略</a-button
@@ -98,7 +89,7 @@ export default {
       color: {
         primary: "#3CC2AC",
         light: "rgba(60,194,172,0.5)",
-        dark: "#3CC2AC",
+        dark: "#3CC2AC"
       },
       devicesMap: {
         audio: "麦克风",
@@ -107,35 +98,35 @@ export default {
         control: "门禁",
         notification: "喇叭",
         unlock: "门锁",
-        "safety-certificate": "监控",
-      },
+        "safety-certificate": "监控"
+      }
     };
   },
   components: {
     MeetingRoomDetails,
-    MeetingRoomConfig,
+    MeetingRoomConfig
   },
   props: {
-    obj: Object,
+    obj: Object
   },
   mounted() {
     if (this.obj.status == 1) {
       this.color = {
         primary: "#3CC2AC",
         light: "rgba(60,194,172,0.5)",
-        dark: "#3CC2AC",
+        dark: "#3CC2AC"
       };
     } else if (this.obj.status == 2) {
       this.color = {
         primary: "#3AA7E6",
         light: "rgba(58,167,230,0.5)",
-        dark: "#3AA7E6",
+        dark: "#3AA7E6"
       };
     } else if (this.obj.status == 3) {
       this.color = {
         primary: "#EE8242",
         light: "rgba(238,130,66,0.5)",
-        dark: "#EE8242",
+        dark: "#EE8242"
       };
     }
   },
@@ -149,8 +140,8 @@ export default {
       } else {
         this.configVisible = true;
       }
-    },
-  },
+    }
+  }
 };
 </script>