Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/layouts/default/header/components/VoiceBroadcastGsd.vue

@@ -26,14 +26,9 @@
           <div v-if="(broadcastList && broadcastList.length == 0) || !broadcastList" class="no-context">暂无内容 </div>
           <div class="context-detail" v-else v-for="(item, index) in broadcastList" :key="index">
             <div>{{ item['label'] }}</div>
-            <!-- <div>{{ item['createTime'] }}</div>
-                        <div>{{ item['devicename'] }}</div>
-                        <div>{{ item['wardescrip'] || item['nwartype_dictText'] }}</div>
-                        <div>{{ item['isok'] ? '已解决' : '未解决' }}</div> -->
           </div>
         </div>
         <div class="more" @click="toMore">更多>></div>
-        <!-- <div v-if="broadcastList.length > 0" class="more" @click.self="test()">测试>></div> -->
       </div>
     </div>
   </div>

src/layouts/default/header/index.vue

@@ -57,8 +57,8 @@
   <div :class="`${prefixCls}-action`" style="position: fixed; top: 30px; right: 20px; z-index: 999999">
     <div class="right-position">
       <!-- 公司端不显示语音播报功能 -->
-      <!-- <VoiceBroadcast v-if="sysOrgCode != 'sdmtjtgsd'" /> -->
-      <VoiceBroadcastGsd v-if="sysOrgCode != 'sdmtjtgsd'" />
+      <VoiceBroadcast v-if="sysOrgCode != 'sdmtjtgsd'" />
+      <VoiceBroadcastGsd v-if="sysOrgCode == 'sdmtjtgsd'" />
       <UserDropDown v-if="showUserDropdown" :theme="getHeaderTheme" />
       <LoginSelect ref="loginSelectRef" @success="loginSelectOk" />
     </div>