提交

src/components/vBottomMenu.vue

@@ -437,27 +437,27 @@
 						icon: 'iconfont sj-icon-sjdw',
 						click: 'eventLocation'
 					},
-					{
-						name: '图层切换',
-						icon: 'iconfont sj-icon-tcqh',
-						click: 'layerSwitching'
-					},
+					// {
+					// 	name: '图层切换',
+					// 	icon: 'iconfont sj-icon-tcqh',
+					// 	click: 'layerSwitching'
+					// },
 					{
 						name: '测量工具',
 						icon: 'iconfont sj-icon-clgj',
 						click: 'editableLayers'
 					},
-					{
-						name: '林班',
-						icon: 'iconfont sj-icon-lbzy',
-						click: 'forestban'
-					},
-
-					{
-						name: '林场',
-						icon: 'iconfont sj-icon-lczy',
-						click: 'forestchang'
-					},
+					// {
+					// 	name: '林班',
+					// 	icon: 'iconfont sj-icon-lbzy',
+					// 	click: 'forestban'
+					// },
+          //
+					// {
+					// 	name: '林场',
+					// 	icon: 'iconfont sj-icon-lczy',
+					// 	click: 'forestchang'
+					// },
 					{
 						name: '电视墙',
 						icon: 'el-icon-s-grid',

src/views/forest.vue

@@ -84,20 +84,13 @@
           <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-27" style="padding-left: 1rem;">
-              <el-collapse accordion>
-                <el-collapse-item v-for="(item,index) in forestFarm" :key="index">
-                  <!-- deptId -->
-                  <template slot="title">
-                    <div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.deptId}"
+                    <div class="d-l-con sj-collapse" v-for="(item,index) in forestFarm" :class="{on:listCurrentIndex1==item.deptId}"
                          v-on:click="selectCameraByDeptId(item.deptId)">
                       <div class="d-l-l-text">
                         <h4 class="collapse-title">{{ item.deptName }}</h4>
                       </div>
                       <div class="d-l-l-count">{{ item.eventCount }}</div>
                     </div>
-                  </template>
-                </el-collapse-item>
-              </el-collapse>
             </div>
           </dv-border-box-13>
         </div>
@@ -384,7 +377,7 @@
       </div>
       <vBottomMenu ref="bottomMenu" @stopAudio="stopAudio" ></vBottomMenu>
     </div>
-    <audio id="resource" ref="up" :src="audioSrc" controls style="display: none;"></audio>
+    <audio id="resource" ref="up" :src="audioSrc" muted controls style="display: none;"></audio>
     <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay" @getEventList="getEventList"
                         @getTodayEvents="getTodayEvents" @getFirespread="getFirespread"></eventdetailsdialog>
 

src/views/monitor.vue

@@ -42,20 +42,13 @@
                 </div>
               </div>
               <div class="overflow-y" style="height: 33vh;">
-                <el-collapse accordion>
-                  <el-collapse-item v-for="(item,index) in region" :key="index">
-                    <!-- deptId -->
-                    <template slot="title">
-                      <div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.deptId}"
+                      <div class="d-l-con sj-collapse" v-for="(item,index) in region" :class="{on:listCurrentIndex1==item.deptId}"
                            v-on:click="selectCameraByDeptId(item.deptId)">
                         <div class="d-l-l-text">
                           <h4 class="collapse-title">{{ item.deptName }}</h4>
                         </div>
                         <div class="d-l-l-count">{{ item.deptCount }}</div>
                       </div>
-                    </template>
-                  </el-collapse-item>
-                </el-collapse>
               </div>
 
               <!-- 横向柱状 echart -->