监控中心替换组织机构查询摄像头

src/api/monitor.js

@@ -29,11 +29,11 @@ export function getRegionalFlag(id) {
     method: 'get',
   })
 }
-// 查询部门经纬度在摄像头半径范围内的摄像头列表
-export function findCameraByDept(deptId) {
-  return request({
-    url: '/center-fire/VisuForestEventCenterController/findCameraByDept',
-    method: 'post',
-    data: {deptId:deptId,type:'1'}
-  })
-}
+// // 查询部门经纬度在摄像头半径范围内的摄像头列表(暂时不用 但不要删除)
+// export function findCameraByDept(deptId) {
+//   return request({
+//     url: '/center-fire/VisuForestEventCenterController/findCameraByDept',
+//     method: 'post',
+//     data: {deptId:deptId,type:'1'}
+//   })
+// }

src/views/leader.vue

@@ -68,47 +68,69 @@
 					<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="this-title">
-							<span>巡林计划</span>
+							<span>巡林任务</span>
 							<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
 						</div>
 						<div class="i-list-con h-73">
 
 							<div class="h-73 overflow-y">
-								<el-collapse accordion>
-									<el-collapse-item v-for="(item,index) in xunLinListOne">
-										<template slot="title">
-											<div class="d-l-con sj-collapse"
-												@click="getRecordList(item.id, item.personId)">
-												<div class="d-l-l-text">
-													<el-tooltip class="item" effect="dark" placement="left"
-														style="width:10rem ;" :disabled="(item.name.length <= 20)">
-														<div slot="content">
-															<h4 class="collapse-title" style="width: 200px;">
-																{{ item.name}}</h4>
-														</div>
-														<h4 class="collapse-title" style="width: 100px;">
-															{{ item.name | ellipsis20}}</h4>
-													</el-tooltip>
-												</div>
-												<div class="d-l-l-count">({{ item.recordCount }}/{{ item.planCount }})
-												</div>
-											</div>
-										</template>
-										<div class="d-l-con this-child sj-collapse" @click="getPointList(child.id)"
-											v-for="(child,index) in recordList">
-											<div class="d-l-l-text">
-												<h4>{{child.beginTime}} - {{child.endTime}}</h4>
-											</div>
-											<!--<div class="d-l-l-count">{{index}}</div>-->
-										</div>
-										<div class="d-l-con this-child sj-collapse"
-											v-if="showNothing && (recordList == null || recordList == '' || recordList == [])">
-											<div class="d-l-l-text">
-												<h4 class="text-gray">暂无信息</h4>
-											</div>
-										</div>
-									</el-collapse-item>
-								</el-collapse>
+                <el-collapse accordion>
+                  <el-collapse-item v-for="(item,index) in xunLinListOne">
+                    <template slot="title">
+                      <div class="d-l-con sj-collapse"
+                           @click="getRecordList(item.id, item.personId)">
+                        <div class="d-l-l-text">
+                          <el-tooltip class="item" effect="dark" placement="left"
+                                      style="width:10rem ;" :disabled="(item.name.length <= 20)">
+                            <div slot="content">
+                              <h4 class="collapse-title" style="width: 200px;">
+                                {{ item.name}}</h4>
+                            </div>
+                            <h4 class="collapse-title" style="width: 100px;">
+                              {{ item.name | ellipsis20}}</h4>
+                          </el-tooltip>
+                        </div>
+                        <div class="d-l-l-count">({{ item.recordCount }}/{{ item.planCount }})
+                        </div>
+                      </div>
+                    </template>
+                    <el-collapse accordion>
+                      <el-collapse-item v-for="(item,index) in xunLinListOne">
+                        <template slot="title">
+                          <div class="d-l-con sj-collapse"
+                               @click="getRecordList(item.id, item.personId)">
+                            <div class="d-l-l-text">
+                              <el-tooltip class="item" effect="dark" placement="left"
+                                          style="width:10rem ;" :disabled="(item.name.length <= 20)">
+                                <div slot="content">
+                                  <h4 class="collapse-title" style="width: 200px;">
+                                    {{ item.name}}</h4>
+                                </div>
+                                <h4 class="collapse-title" style="width: 100px;">
+                                  {{ item.name | ellipsis20}}</h4>
+                              </el-tooltip>
+                            </div>
+                            <div class="d-l-l-count">({{ item.recordCount }}/{{ item.planCount }})
+                            </div>
+                          </div>
+                        </template>
+                        <div class="d-l-con this-child sj-collapse" @click="getPointList(child.id)"
+                             v-for="(child,index) in recordList">
+                          <div class="d-l-l-text">
+                            <h4>{{child.beginTime}} - {{child.endTime}}</h4>
+                          </div>
+                          <!--<div class="d-l-l-count">{{index}}</div>-->
+                        </div>
+                        <div class="d-l-con this-child sj-collapse"
+                             v-if="showNothing && (recordList == null || recordList == '' || recordList == [])">
+                          <div class="d-l-l-text">
+                            <h4 class="text-gray">暂无信息</h4>
+                          </div>
+                        </div>
+                      </el-collapse-item>
+                    </el-collapse>
+                  </el-collapse-item>
+                </el-collapse>
 								<!--<div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
                      v-for="(item,index) in xunLinListOne"
                      @click="setConnectList(item.planLine,item.planName)">

src/views/monitor.vue

@@ -41,29 +41,29 @@
                   </div>
                 </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}"
-                           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>
+              <!--<div class="overflow-y" style="height: 33vh;">-->
+                <!--<el-collapse accordion>-->
+                  <!--<el-collapse-item v-for="(item,index) in region" :key="index">-->
+                    <!--&lt;!&ndash; deptId &ndash;&gt;-->
+                    <!--<template slot="title">-->
+                      <!--<div class="d-l-con sj-collapse" :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>-->
 
               <!--&lt;!&ndash; 横向柱状 echart &ndash;&gt;-->
               <!--<div class="overflow-y" style="height: 33vh;">-->
                 <!--<div id="camera-chart" style="width: 100%;height:33vh;"></div>-->
               <!--</div>-->
-              <div  class="overflow-y" style="height: 33vh;">
-                  <div class="i-list-con h-43">
+              <div  class="overflow-y" style="height: 70vh;">
+                  <div class="i-list-con h-65">
                     <div class="head-container">
                       <el-input
                         v-model="deptName"
@@ -281,7 +281,8 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.findCameraByDept(data.id)
+      // this.findCameraByDept(data.id)
+      this.selectCameraByDeptId(data.id);
     },
     findCameraByDept(deptId) {
       findCameraByDept(deptId).then(res => {