Merge branch 'develop' of ssh://gitlab.fuxicarbon.com:1111/hongshan/voiceMate-web into develop

src/layout/components/Sidebar/SidebarItem.vue

@@ -22,7 +22,7 @@ const props = defineProps({
     default: ''
   }
 })
-
+const router = useRouter();
 const onlyOneChild = ref({});
 
 function hasOneShowingChild(children = [], parent) {
@@ -79,17 +79,30 @@ function getIconPath (iconName) {
   const whitelist = ['workbench', 'call', 'notice', 'analyse','services', 'whiteList'];
   return whitelist.includes(iconName) ? iconName + '-active' : iconName;
 }
+
+function toPage(path) {
+  if ( path == "/voice/dashboard" ) {
+    const { href } = router.resolve({
+      path: '/voice/dashboard'
+    });
+    window.open(href, '_blank');
+  } else {
+    router.push(path)
+  }
+}
 </script>
 <template>
   <li v-if="!item.hidden" class="menu-item__inner">
     <template v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
+      <!-- <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)"> -->
+      <div v-if="onlyOneChild.meta" @click="toPage(resolvePath(onlyOneChild.path, onlyOneChild.query))">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
           <svg-icon :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" v-show="activeKey !== resolvePath(onlyOneChild.path)"/>
           <svg-icon :icon-class="getIconPath(onlyOneChild.meta.icon || (item.meta && item.meta.icon))" v-show="activeKey == resolvePath(onlyOneChild.path)"/>
           <template #title><span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span></template>
         </el-menu-item>
-      </app-link>
+      </div>
+      <!-- </app-link> -->
     </template>
 
     <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>

src/layout/components/Sidebar/index.vue

@@ -52,12 +52,12 @@ const onJumpPage = () => {
         </el-menu>
       </div>
     </el-scrollbar>
-    <div class="vocie-menu-footer">
+    <!-- <div class="vocie-menu-footer">
       <div class="dashboard-btn space-x-[10px]" @click="onJumpPage">
         <el-icon><TrendCharts /></el-icon>
         <span class="text-[14px]">驾驶舱</span>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/layout/components/TelNoticeBar/index.vue

@@ -76,7 +76,7 @@ const handleCallAnswered = () => {
   z-index: 1100;
   border-radius: 8px;
   color: #fff;
-  transition: top ease-out .5s;
+  transition: top ease-out .2s;
 
   .notice-left .avatar-box {
     position: relative;

src/store/modules/voice.js

@@ -67,9 +67,11 @@ const useVoiceStore = defineStore('voice', () => {
     noiceBarVisibleState.value = false;
     noiceBoxVisibleState.value = false;
 
-    isMakingCall.value = false;
+    setTimeout(() => {
-    callAnswered.value = false;
+      isMakingCall.value = false;
-    callDialing.value = false;
+      callAnswered.value = false;
+      callDialing.value = false;
+    }, 300)
 
     isShowTimer.value = false;
 

src/views/voice/notice/add.vue

@@ -8,7 +8,6 @@ import BaseLayoutViewport from '@/components/BaseLayout';
 const router = useRouter();
 const route = useRoute();
 
-
 const formRef = ref(null);
 const pumpingValue = ref(null);
 const housingValue = ref(null);
@@ -102,7 +101,6 @@ onMounted(() => {
     })
   }
 
-
   // 泵站
   servicesApi.getPumpingList({pageSize: 10000, pageNum: 1}).then(res => {
     pumpingOptions.value = res.data;
@@ -170,6 +168,10 @@ onMounted(() => {
                 <ul class="select-group space-x-[40px] mr-[20px]" style="width: 784px;">
                   <li class="space-x-[5px]">
                     <span>根据泵站添加：</span>
+                      <!-- multiple
+                      collapse-tags
+                      collapse-tags-tooltip
+                      :max-collapse-tags="1" -->
                     <el-select
                       v-model="pumpingValue"
                       placeholder="请选择"