解决冲突

2025-12-05 10:12:13 +08:00
parent 5d8263c973 20a3b8d2b1
commit b7fd4642b4
203 changed files with 83842 additions and 1196 deletions
--- a/src/views/home/components/CarWarning.vue
+++ b/src/views/home/components/CarWarning.vue
@ -1,8 +1,18 @@
 <template>
-  <div class="waning-cards noScollLine" v-infinite-scroll="rollingLoading" v-loading="loading">
-    <div class="warning-card" v-for="(item, index) in warningList.data" :key="index">
+  <div
+    class="waning-cards noScollLine"
+    v-infinite-scroll="rollingLoading"
+    v-loading="loading"
+  >
+    <div
+      class="warning-card"
+      v-for="(item, index) in warningList.data"
+      :key="index"
+         @click="plotThetrajectory(item.yjRysfzh)"
+    >
      <div class="warning-image">
-        <img :src="item.yjTp" alt="预警图片" />
+        <img :src="item.yjTp" alt="预警图片" v-if="item.yjTp&&!item.yjTp.includes('baidu')" />
+          <img src="@/assets/images/car.png" alt="预警图片" v-else/>
      </div>
      <div class="warning-info">
        <div class="info-item">
@ -30,8 +40,9 @@

 <script setup>
 import { reactive, ref, getCurrentInstance } from "vue";
-import { jczgetPageList } from "@/api/mosty-jcz.js";
+import { jczgetPageList,tbYjxxGsgj } from "@/api/mosty-jcz.js";
 import Empty from "@/components/MyComponents/Empty/index.vue";
+import emitter from "@/utils/eventBus.js";
 const props = defineProps({
  jczId: {
    type: String,
@ -74,6 +85,100 @@ const rollingLoading = () => {
    getPageList();
  }
 };
+// 轨迹上图
+const plotThetrajectory = (val) => {
+
+  tbYjxxGsgj({
+    startTime: null,
+    endTime: null,
+    yjRysfzh: val
+  }).then(res => {
+    console.log(res);
+    if (res && res[0].list.length > 0) {
+      let coords = res[0].list.map(item => {
+        return [item.jd, item.wd]
+      })
+      // const coords = [
+      //   [
+      //     94.3695802486277983689433312974870204925537109375,
+      //     29.659805088901098457654370577074587345123291015625
+      //   ],
+      //   [
+      //     94.369054723455093380835023708641529083251953125,
+      //     29.66032233866609857386720250360667705535888671875
+      //   ],
+      //   [
+      //     94.3684916577901020673380116932094097137451171875,
+      //     29.660979382630298317735650925897061824798583984375
+      //   ],
+      //   [
+      //     94.3683415069466065006054122932255268096923828125,
+      //     29.660755708570601285600787377916276454925537109375
+      //   ],
+      //   [
+      //     94.3675662718153063224235665984451770782470703125,
+      //     29.659987675165101705943015986122190952301025390625
+      //   ],
+      //   [
+      //     94.366890606904092919648974202573299407958984375,
+      //     29.659353928438999759009675472043454647064208984375
+      //   ],
+      //   [
+      //     94.3656729217579055557507672347128391265869140625,
+      //     29.6582345740253998656044132076203823089599609375
+      //   ],
+      //   [
+      //     94.3646650204280064144768402911722660064697265625,
+      //     29.657336173164399184543071896769106388092041015625
+      //   ],
+      //   [
+      //     94.364147680070203705327003262937068939208984375,
+      //     29.6567231392728984928908175788819789886474609375
+      //   ],
+      //   [
+      //     94.3636436022359958997185458429157733917236328125,
+      //     29.65662527779360146951148635707795619964599609375
+      //   ],
+      //   [
+      //     94.362367320062702447103220038115978240966796875,
+      //     29.6567138191363000032652053050696849822998046875
+      //   ],
+      //   [
+      //     94.3614396063849056872641085647046566009521484375,
+      //     29.656713819753800720491199172101914882659912109375
+      //   ],
+      //   [
+      //     94.3603242001151016893345513381063938140869140625,
+      //     29.65673712009380125209645484574139118194580078125
+      //   ],
+      //   [
+      //     94.358962121621999585840967483818531036376953125,
+      //     29.65674177535930056137658539228141307830810546875
+      //   ],
+      //   [
+      //     94.3576684689077040957272402010858058929443359375,
+      //     29.65681167375640114869383978657424449920654296875
+      //   ],
+      //   [
+      //     94.3564404495050013110812869854271411895751953125,
+      //     29.65685827438640131958891288377344608306884765625
+      //   ],
+      //   [
+      //     94.3547512464013067301493720151484012603759765625,
+      //     29.656946809372101370172458700835704803466796875
+      //   ]
+      // ]
+      emitter.emit('drawLineAnimation', {
+        type: "solid",
+        coords: coords,
+        isclear: true,
+        flag: "yjLine"
+      })
+    } else {
+      ElMessage({ message: '暂无轨迹数据', type: 'warning' });
+    }
+  })
+}
 getPageList();
 </script>

@ -96,7 +201,7 @@ getPageList();
 }

 .warning-image {
-  width: 100px;
+  width: 60px;
  height: 80px;

  img {
--- a/src/views/home/components/PeoWarning.vue
+++ b/src/views/home/components/PeoWarning.vue
@ -8,9 +8,11 @@
      class="warning-card"
      v-for="(item, index) in warningList.data"
      :key="index"
+      @click="plotThetrajectory(item.yjRysfzh)"
    >
      <div class="warning-image">
-        <img :src="item.yjTp" alt="预警图片" />
+        <img :src="item.yjTp" alt="预警图片" v-if="item.yjTp&&!item.yjTp.includes('baidu')" />
+          <img src="@/assets/images/default_male.png" alt="预警图片" v-else/>
      </div>
      <div class="warning-info">
        <div class="info-item">
@ -46,9 +48,11 @@

 <script setup>
 import { reactive, ref, getCurrentInstance } from "vue";
-import { jczgetPageList } from "@/api/mosty-jcz.js";
+import { jczgetPageList,tbYjxxGsgj } from "@/api/mosty-jcz.js";
 import { IdCard } from "@/utils/dict.js";
+import {ElMessage} from 'element-plus'
 import Empty from "@/components/MyComponents/Empty/index.vue";
+import emitter from "@/utils/eventBus.js";
 const props = defineProps({
  jczId: {
    type: String,
@ -91,6 +95,101 @@ const rollingLoading = () => {
    getPageList();
  }
 };
+
+// 轨迹上图
+const plotThetrajectory = (val) => {
+
+  tbYjxxGsgj({
+    startTime: null,
+    endTime: null,
+    yjRysfzh: val
+  }).then(res => {
+    console.log(res);
+    if (res && res[0].list.length > 0) {
+      let coords = res[0].list.map(item => {
+        return [item.jd, item.wd]
+      })
+      // const coords = [
+      //   [
+      //     94.3695802486277983689433312974870204925537109375,
+      //     29.659805088901098457654370577074587345123291015625
+      //   ],
+      //   [
+      //     94.369054723455093380835023708641529083251953125,
+      //     29.66032233866609857386720250360667705535888671875
+      //   ],
+      //   [
+      //     94.3684916577901020673380116932094097137451171875,
+      //     29.660979382630298317735650925897061824798583984375
+      //   ],
+      //   [
+      //     94.3683415069466065006054122932255268096923828125,
+      //     29.660755708570601285600787377916276454925537109375
+      //   ],
+      //   [
+      //     94.3675662718153063224235665984451770782470703125,
+      //     29.659987675165101705943015986122190952301025390625
+      //   ],
+      //   [
+      //     94.366890606904092919648974202573299407958984375,
+      //     29.659353928438999759009675472043454647064208984375
+      //   ],
+      //   [
+      //     94.3656729217579055557507672347128391265869140625,
+      //     29.6582345740253998656044132076203823089599609375
+      //   ],
+      //   [
+      //     94.3646650204280064144768402911722660064697265625,
+      //     29.657336173164399184543071896769106388092041015625
+      //   ],
+      //   [
+      //     94.364147680070203705327003262937068939208984375,
+      //     29.6567231392728984928908175788819789886474609375
+      //   ],
+      //   [
+      //     94.3636436022359958997185458429157733917236328125,
+      //     29.65662527779360146951148635707795619964599609375
+      //   ],
+      //   [
+      //     94.362367320062702447103220038115978240966796875,
+      //     29.6567138191363000032652053050696849822998046875
+      //   ],
+      //   [
+      //     94.3614396063849056872641085647046566009521484375,
+      //     29.656713819753800720491199172101914882659912109375
+      //   ],
+      //   [
+      //     94.3603242001151016893345513381063938140869140625,
+      //     29.65673712009380125209645484574139118194580078125
+      //   ],
+      //   [
+      //     94.358962121621999585840967483818531036376953125,
+      //     29.65674177535930056137658539228141307830810546875
+      //   ],
+      //   [
+      //     94.3576684689077040957272402010858058929443359375,
+      //     29.65681167375640114869383978657424449920654296875
+      //   ],
+      //   [
+      //     94.3564404495050013110812869854271411895751953125,
+      //     29.65685827438640131958891288377344608306884765625
+      //   ],
+      //   [
+      //     94.3547512464013067301493720151484012603759765625,
+      //     29.656946809372101370172458700835704803466796875
+      //   ]
+      // ]
+      emitter.emit('drawLineAnimation', {
+        type: "solid",
+        coords: coords,
+        isclear: true,
+        flag: "yjLine"
+      })
+    } else {
+      ElMessage({ message: '暂无轨迹数据', type: 'warning' });
+    }
+  })
+}
 getPageList();
 </script>

@ -113,7 +212,7 @@ getPageList();
 }

 .warning-image {
-  width: 100px;
+  width: 60px;
  height: 80px;
  img {
    width: 100%;
--- a/src/views/home/components/collection.vue
+++ b/src/views/home/components/collection.vue
@ -123,7 +123,7 @@ getcountCrl();
  font-size: 18px;
  position: relative;
  padding-left: 12px;
-  background: linear-gradient(0deg, #59a6f4 0%, #ffffff 90%);
+  background: linear-gradient(0deg, #59a6f4 0%, #ffffff 100%);
  -webkit-background-clip: text;
  -webkit-text-fill-color: transparent;
 }
--- a/src/views/home/components/entrance.vue
+++ b/src/views/home/components/entrance.vue
@ -4,74 +4,108 @@
      <img src="@/assets/images/tc/close.png" alt="" srcset="" />
    </div>
    <div class="flex just-between align-center bt">
-      <div class="headline">{{ BbMag?.jczmc }}</div>
-      <div class="headbut" style="" @click="enterLevel">进入检查站</div>
+      <div class="headline">{{ JczData.jczmc }}</div>
+      <div class="headbut" @click="enterLevel">进入检查站</div>
    </div>
-    <div class="flex just-between content">
-      <div class="contentLeft">
-        <div class="flex">
-          <div class="leftImg">
-            <img src="@/assets/images/tc/zbld.png" alt="" srcset="" />
+    <el-tabs v-model="activeName" class="demo-tabs" type="border-card" @tab-click="handleClick">
+      <el-tab-pane label="检查站信息" name="检查站信息">
+        <div class="flex just-between content">
+          <div class="contentLeft">
+            <div class="flex">
+              <div class="leftImg">
+                <img src="@/assets/images/tc/zbld.png" alt="" srcset="" />
+              </div>
+              <div class="leftMag">
+                <div class="ld">值班领导</div>
+                <div class="name" v-if="BbMag.fzrXm">{{ BbMag?.fzrXm }}</div>
+                <div class="name" v-else>暂无报备数据</div>
+              </div>
+            </div>
+            <div class="flex">
+              <div class="leftImg">
+                <img src="@/assets/images/tc/zbld.png" alt="" srcset="" />
+              </div>
+              <div class="leftMag">
+                <div class="ld">联系电话</div>
+                <div class="name" v-if="BbMag.fzrXm">{{ BbMag?.fzrLxdh }}</div>
+                <div class="name" v-else>暂无报备数据</div>
+              </div>
+            </div>
+            <div class="dutyList flex just-between align-center">
+              <div class="dutyImg">
+                <img src="@/assets/images/tc/zbfj.png" alt="" srcset="" />
+              </div>
+              <div class="occupation">
+                值班民警：<span class="number">{{ BbMag.mjsl ? BbMag.mjsl : 0 }}</span>
+              </div>
+            </div>
+            <div class="dutyList flex just-between align-center">
+              <div class="dutyImg">
+                <img src="@/assets/images/tc/zbfj.png" alt="" srcset="" />
+              </div>
+              <div class="occupation">
+                值班辅警：<span class="number">{{ BbMag.fjsl ? BbMag.fjsl : 0 }}</span>
+              </div>
+            </div>
          </div>
-          <div class="leftMag">
-            <div class="ld">值班领导</div>
-            <div class="name">{{ BbMag?.fzrXm }}</div>
+          <div class="contentRight">
+            <div class="flex align-center right just-between" v-for="(item, index) in ArrList" :key="index">
+              <div>{{ item.name }}</div>
+              <div class="number">
+                <span>{{ item.count }}</span>
+              </div>
+            </div>
          </div>
        </div>
-        <div class="flex">
-          <div class="leftImg">
-            <img src="@/assets/images/tc/zbld.png" alt="" srcset="" />
+      </el-tab-pane>
+      <el-tab-pane label="感知源" name="感知源">
+        <div class="flex just-between content ">
+          <div class="contentLeft">
+            <div class="box">
+               <div class="section-title">
+                 入林感知源
+               </div>
+               <div v-for="(item,index) in gzyList.RlGzy" class="flex just-between modesl" :key="index">
+                   <div class="info-container">
+                     <div>{{ item.sbmc }}</div>
+                     <div>{{item .sbbh }}</div>
+                   </div>
+                  <div @click="openVideo(item)">播放</div>
+              </div>
+            </div>
          </div>
-          <div class="leftMag">
-            <div class="ld">联系电话</div>
-            <div class="name">{{ BbMag?.fzrLxdh }}</div>
+          <div class="contentRight">
+            <div class="box">
+               <div class="section-title">
+                 出林感知源
+               </div>
+                <div v-for="(item,index) in gzyList.ClGzy" class="flex just-between modesl" :key="index">
+                   <div class="info-container">
+                     <div>{{ item.sbmc }}</div>
+                     <div>{{item .sbbh }}</div>
+                   </div>
+                  <div @click="openVideo(item)">播放</div>
+              </div>
+            </div>
          </div>
        </div>
-        <div class="dutyList flex just-between align-center">
-          <div class="dutyImg">
-            <img src="@/assets/images/tc/zbfj.png" alt="" srcset="" />
-          </div>
-          <div class="occupation">
-            值班民警：<span class="number">{{ BbMag.mjsl?BbMag.mjsl:0 }}</span>
-          </div>
-        </div>
-        <!-- <div class="dutyList flex just-between align-center">
-          <div class="dutyImg">
-            <img src="@/assets/images/tc/zbfj.png" alt="" srcset="" />
-          </div>
-          <div class="occupation">
-            值班武警：<span class="number">{{ BbMag?.ryList.length }}</span>
-          </div>
-        </div> -->
-        <div class="dutyList flex just-between align-center">
-          <div class="dutyImg">
-            <img src="@/assets/images/tc/zbfj.png" alt="" srcset="" />
-          </div>
-          <div class="occupation">
-            值班辅警：<span class="number">{{ BbMag.fjsl?BbMag.fjsl:0 }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="contentRight">
-        <div class="flex align-center right just-between" v-for="(item, index) in ArrList" :key="index">
-          <div>{{ item.name }}</div>
-          <div class="number">
-            <span>{{ item.count }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </el-tab-pane>
+    </el-tabs>
+
  </div>
+  <VideoCnt/>
 </template>

 <script setup>
 import { ref, reactive } from "vue";
+import VideoCnt from "@/components/video/index.vue";
 import emitter from "@/utils/eventBus.js";
 import {
  jczqueryById,
  jczCountWay,
  jczgetcountCrl,
-  jczGzrycountCrl
+  jczGzrycountCrl,
+  JczselectById
 } from "@/api/mosty-jcz";
 import { useRouter } from "vue-router";
 const props = defineProps({
@ -85,15 +119,17 @@ const BbMag = ref({ ryList: [] });
 const getjczqueryByIdFeign = () => {
  jczqueryById({ jczid: props.JczData.id }).then((res) => {
    BbMag.value = res;
-    if (res.ryList) {
+    if (res && res.ryList) {
      BbMag.value.mjsl = res.ryList.filter((el) => {
        return el.ryMfjlb == '01'
      }).length
      BbMag.value.fjsl = res.ryList.filter((el) => {
        return el.ryMfjlb == '02'
      }).length
+    } else {
+      BbMag.value = {}
    }
-    
+
  });
 };
 getjczqueryByIdFeign();
@ -106,6 +142,34 @@ const enterLevel = () => {
  });
  window.open(hrefs.href, "_blank");
 };
+
+
+
+const activeName = ref('检查站信息')
+const gzyList = ref({
+  RlGzy: [],
+  ClGzy: [],
+})
+function openVideo(item) {
+  let params = {
+    ...item,
+    splitNum: 1
+  }
+  console.log(params);
+
+  emitter.emit("openGzyVideo", params)
+}
+const getJczselectById=()=>{
+  JczselectById({ id: props.JczData.id }).then((res) => {
+    gzyList.value.RlGzy=res.sxtList?res.sxtList.filter(item => item.gzyfx=='01'):[]
+    gzyList.value.ClGzy=res.sxtList?res.sxtList.filter(item => item.gzyfx=='02'):[]
+  });
+}
+getJczselectById()
+const handleClick = (val) => {
+
+
+}
 const cloes = () => {
  emitter.emit("showJcz");
 };
@ -221,10 +285,12 @@ countWays();
 <style scoped lang="scss">
 .entrance {
  position: absolute;
-  width: 596px;
-  height: 471px;
-  background: url("~@/assets/images/tc/bg.png");
-  z-index: 9999;
+  width: 700px;
+  height: 570px;
+
+  background: url("~@/assets/images/tc/bg.png") no-repeat;
+  background-size: 100%;
+  z-index: 99;
  top: 50%;
  left: 50%;
  transform: translate(-50%, -50%);
@ -270,6 +336,7 @@ countWays();
  .content {
    width: 100%;
    margin-top: 10px;
+    color: #fff;

    .contentLeft {
      width: 50%;
@ -337,6 +404,93 @@ countWays();
        }
      }
    }
+
+    .box {
+      overflow: auto;
+      height: 400px;
+    }
+
+    // 标题样式
+    .section-title {
+      padding: 10px 15px;
+      background: rgba(17, 94, 201, 0.3);
+      color: #fff;
+      font-size: 16px;
+      font-weight: bold;
+      border-left: 3px solid #02fafb;
+      margin-bottom: 10px;
+    }
+
+    // 感知源头列表样式
+    .flex.modesl {
+      padding: 10px 15px;
+      border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+      transition: background-color 0.3s;
+
+      &:hover {
+        background-color: rgba(17, 94, 201, 0.2);
+      }
+
+      // 信息容器样式
+      .info-container {
+        width: calc(100% - 60px);
+        .ld,
+        div {
+          color: #fff;
+          font-size: 16px;
+          margin-bottom: 5px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        div:last-child {
+          color: #02fafb;
+          font-size: 14px;
+          margin-bottom: 0;
+        }
+      }
+
+      // 播放按钮样式
+      > div:last-child {
+        background: url("~@/assets/images/streetBi/wxz.png") no-repeat;
+        background-size: 100% 100%;
+        padding: 5px 15px;
+        cursor: pointer;
+        transition: transform 0.2s;
+        font-size: 14px;
+        height: 30px;
+        line-height: 20px;
+        text-align: center;
+        min-width: 50px;
+        &:hover {
+          transform: scale(1.05);
+        }
+      }
+    }    }
+  }
+
+.demo-tabs {
+  padding: 0 15px;
+}
+
+::v-deep .el-tabs--border-card {
+  background-color: #ffffff00;
+  border: none;
+
+  .el-tabs__header {
+    background-color: #ffffff00;
+    border-color: #3b68c3;
+
+    .el-tabs__item {
+      color: #fff;
+    }
+  }
+
+  .el-tabs__item.is-active {
+    background-color: #115ec9;
+    color: #fff;
+    border-color: transparent;
  }
 }
 </style>
--- a/src/views/home/components/warning.vue
+++ b/src/views/home/components/warning.vue
@ -22,7 +22,9 @@
        :key="index"
      >
        <div class="warning-image">
-          <img :src="item.yjTp" alt="预警图片" />
+          <img :src="item.yjTp" alt="预警图片" v-if="item.yjTp" />
+          <img src="@/assets/images/car.png" alt="预警图片" v-else-if="linkQuery.yjLx == 2" />
+          <img src="@/assets/images/default_male.png" alt="预警图片" v-else/>
        </div>
        <div class="warning-info">
          <div class="info-item" v-if="linkQuery.yjLx == 2">