Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.vue

@@ -62,7 +62,7 @@
               <ListVideoNameIcon :dataStyle="option.dataStyle" />
             </div>
             <div class="leftDivVideoListIcontitle">
-              <span>{{ item.jkdmckjg }}</span>
+              <span>{{ item.name }}</span>
             </div>
           </div>
         </div>
@@ -163,6 +163,7 @@
         </div>
       </div>
     </div>
+
   </div>
 </template>
 
@@ -196,6 +197,9 @@
   } from './svg/index';
   import { MonitorHK, MonitorLC, MonitorTX, MonitorQX } from './video/index';
   import Axios from 'axios';
+  import { getAppEnvConfig } from '@/utils/env'
+
+  var { VITE_GLOB_API_URL } = getAppEnvConfig();
 
   const { createMessage } = useMessage();
 
@@ -224,16 +228,26 @@
   const searchValue = ref('');
 
   async function getMonitorList(){
-      let res = await Axios.get("http://221.2.83.254:9001/api/YingJiJu/LoadCameraInfo?county=%E8%B4%B9%E5%8E%BF&pageIndex=1&pageSize=999");
-      let result = res.data.data
-      return result;
+      const querys = {
+        page:1,
+        limit:999
+      };
+
+      return Axios({
+          method: "get",
+          url: VITE_GLOB_API_URL + '/api/FireManagement/GetCameraInfoPageList',
+          params: querys,
+          headers: {
+              'X-Token': localStorage.getItem("X-Token")
+          }
+      })
   }
 
   const dataListAfterSearch = ref(option.dataset[0].value);
 
 
   getMonitorList().then(res=>{
-    dataListAfterSearch.value = res;
+    dataListAfterSearch.value = res.data.result.items;
   })
 
 
@@ -388,7 +402,7 @@
     
     // 不显示已有视频
     if (
-      option.videoList.some((li: any) => li.title == item.jkdmckjg) &&
+      option.videoList.some((li: any) => li.title == item.name) &&
       option.videoList.some((li: any) => li.videourl == item.videourl)
     ) {
       createMessage.warning('点击的视频【' + item.title + '】已展示!');
@@ -646,7 +660,8 @@
           .leftDivVideoListIcontitle {
             width: v-bind('`${option.dataStyle.leftListWidth_Title}px`');
             height: v-bind('`${option.dataStyle.leftListAloneHeight}px`');
-
+            background: #15251c;
+            border-bottom: 2px solid #3baf64;
             span {
               height: v-bind('`${option.dataStyle.leftListAloneHeight}px`');
               margin-left: 15px;

src/views/demo/fire/fireclueinfo/Detail.vue

@@ -7,50 +7,31 @@
         <a-divider orientation="left">基本信息</a-divider>
 
         <a-descriptions bordered class="mt-4" :column="2" size="small">
-          <a-descriptions-item label="线索名称"> 
-            {{ detailInfo.name }}
-          </a-descriptions-item>
-          <a-descriptions-item label="功能分类"> 
-            {{ detailInfo.model }}
-          </a-descriptions-item>
-          <a-descriptions-item label="线索分类"> 
-            {{ detailInfo.cameraType }}
+          
+          <a-descriptions-item label="线索编号"> 
+            {{ detailInfo.clueNo }}
           </a-descriptions-item>
           <a-descriptions-item label="线索状态"> 
-            {{ detailInfo.status }}
+            {{ detailInfo.state }}
           </a-descriptions-item>
-          <a-descriptions-item label="设备厂商"> 
-            {{ detailInfo.manufacturer }}
+          <a-descriptions-item label="线索描述"> 
+            {{ detailInfo.describe }}
           </a-descriptions-item>
-          <a-descriptions-item label="设备序列号"> 
-            {{ detailInfo.serialNumber }}
+          <a-descriptions-item label="线索地址"> 
+            {{ detailInfo.address }}
           </a-descriptions-item>
-          <a-descriptions-item label="设备通道"> 
-            {{ detailInfo.channel }}
+          <a-descriptions-item label="线索来源"> 
+            {{ detailInfo.sourceType }}
           </a-descriptions-item>
-          <a-descriptions-item label="平台IP"> 
-            {{ detailInfo.ip }}
+          <a-descriptions-item label="严重程度"> 
+            {{ detailInfo.degreeType }}
           </a-descriptions-item>
-          <a-descriptions-item label="平台端口"> 
-            {{ detailInfo.port }}
+          <a-descriptions-item label="上报人员"> 
+            {{ detailInfo.reportPerson }}
           </a-descriptions-item>
-          <a-descriptions-item label="APPKey"> 
-            {{ detailInfo.appKey }}
+          <a-descriptions-item label="上报时间"> 
+            {{ detailInfo.reportTime }}
           </a-descriptions-item>
-          <a-descriptions-item label="APPSecret"> 
-            {{ detailInfo.appSecret }}
-          </a-descriptions-item>
-          
-          <a-descriptions-item label="线索位置"> 
-            {{ detailInfo.lng }} , {{ detailInfo.lat }}
-          </a-descriptions-item>
-          <a-descriptions-item label="更新时间"> 
-            {{ detailInfo.updateTime }}
-          </a-descriptions-item>
-          <a-descriptions-item label="原始路径"> 
-            {{ detailInfo.regionPathName }}
-          </a-descriptions-item>
-          
         </a-descriptions>
       </a-col>
 

src/views/demo/fire/firecluetask/Detail.vue

@@ -1,55 +1,41 @@
 <template>
   <div class="p-4">
-    <a-row :gutter="60">
+    <a-row :gutter="40">
 
-      <a-col :span="12">
+      <a-col :span="14">
 
         <a-divider orientation="left">基本信息</a-divider>
 
-        <a-descriptions bordered class="mt-4" :column="2">
+        <a-descriptions bordered class="mt-4" :column="2" size="small">
+          
           <a-descriptions-item label="任务编号"> 
             {{ detailInfo.clueNo }}
           </a-descriptions-item>
-          <a-descriptions-item label="任务名称"> 
-            {{ detailInfo.describe }}
+          <a-descriptions-item label="任务描述"> 
+            {{ detailInfo.content }}
           </a-descriptions-item>
-          <a-descriptions-item label="功能分类"> 
-            {{ detailInfo.model }}
-          </a-descriptions-item>
-          <a-descriptions-item label="任务状态"> 
-            {{ detailInfo.state }}
-          </a-descriptions-item>
-          <a-descriptions-item label="任务"> 
-            {{ detailInfo.manufacturer }}
-          </a-descriptions-item>
-          <a-descriptions-item label="任务名称"> 
-            {{ detailInfo.serialNumber }}
-          </a-descriptions-item>
-          <a-descriptions-item label="任务名称"> 
-            {{ detailInfo.channel }}
-          </a-descriptions-item>
-          <a-descriptions-item label="任务位置"> 
+          <a-descriptions-item label="任务地址"> 
             {{ detailInfo.address }}
           </a-descriptions-item>
           <a-descriptions-item label="任务来源"> 
             {{ detailInfo.sourceType }}
           </a-descriptions-item>
-          <a-descriptions-item label="任务程度"> 
-            {{ detailInfo.regionPathName }}
+          <a-descriptions-item label="任务状态"> 
+            {{ detailInfo.state }}
           </a-descriptions-item>
-          <a-descriptions-item label="上报人员"> 
-            {{ detailInfo.reportPerson }}
+          <a-descriptions-item label="下发人员"> 
+            {{ detailInfo.taskUser }}
           </a-descriptions-item>
-          <a-descriptions-item label="上报时间"> 
-            {{ detailInfo.reportTime }}
+          <a-descriptions-item label="下发时间"> 
+            {{ detailInfo.taskTime }}
           </a-descriptions-item>
         </a-descriptions>
       </a-col>
 
-      <a-col :span="12">
+      <a-col :span="10">
         <a-divider orientation="left">位置信息</a-divider>
         <div class="map-container">
-
+          <Map :position="[detailInfo.lng,detailInfo.lat]"></Map>
         </div>
       </a-col>
     </a-row>
@@ -57,9 +43,8 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { defaultValue } from 'mars3d-cesium';
-  import { ref,defineProps } from 'vue';
-  import * as mars3d from 'mars3d'
+  import { ref,defineProps,watch } from 'vue';
+  import Map from '../components/Map.vue';
 
   const props = defineProps({
     detailInfo:{
@@ -68,10 +53,21 @@
     }
   });
 
+
   const detailInfo: any = ref({});
 
   detailInfo.value = props.detailInfo;
 
+  watch(
+    ()=>props.detailInfo,
+    (newVal,oldVal)=>{
+      detailInfo.value = newVal;
+    }
+  )
+  
+
+
+  console.log("detailInfo.value",detailInfo.value);
   const dataSource = ref([]);
   const columns = ref([
     {

src/views/demo/fire/firecluetask/index.vue

@@ -29,10 +29,13 @@
     </a-modal>
     <a-modal
       v-model:visible="detailModelVisible"
+      :get-container="getContainer"
       title="线索信息"
-      wrap-class-name="full-modal"
+      wrap-class-name="modal"
       width="80%"
       :footer="null"
+      :mask="true"  
+      :keyboard="false"
       >
         <Detail :detailInfo="detailInfo" @close="closeDetail" />
       </a-modal>