修改

src/components/GdMap/index.vue

@@ -1,8 +1,7 @@
 <template>
   <div :id="mapid" class="map"></div>
   <div class="changeMap_box" v-if="props.isShow">
-    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况"
+    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况" style="--el-switch-color:#13ce66;--el-switch-off-color:#ff4949;" />
-      style="--el-switch-color: #13ce66; --el-switch-off-color: #ff4949" />
     <!-- <el-carousel type="card" height="75px" :autoplay="false" indicator-position="none" :initial-index="3"  @change="onMapImageChange">
       <el-carousel-item>
         <div class="mapImageItem">
@@ -75,7 +74,7 @@ const props = defineProps({
 });
 try {
   const userInfo = getItem("deptId")[0].deptCode;
-} catch (error) { }
+} catch (error) {}
 let map;
 let mapLayer;
 let mapLayer1;
@@ -89,32 +88,27 @@ onMounted(() => {
 
   map = new EliMap({
     id: props.mapid,
-    crs: "EPSG:4490",
+    crs: "EPSG:3857",
     style: {
       glyphs: "./fonts/{fontstack}/{range}.pbf",
-      center: [94.36057012, 29.64276831],
+      center: [94.36,29.65],
-      zoom: 15
+      zoom: 10
     },
-    minZoom: 7,
+    transformRequest: (url) => {
-    maxZoom: 18,
+      if (url.indexOf("TileMatrix=") != -1) {
+        const arr = url.split("TileMatrix=");
+        const arr1 = arr[1].split("&");
+        const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`;
+
+      }
+    }
   });
+
   window.map = map;
   map.mapboxGLMap.on("load", () => {
-    map.addWMTSLayer(
+     map.addGaudLayer({
-      "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap",
+      url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      {
+    })
-        Service: "getImage",
-        Type: "RGB",
-        ZoomOffset: "0",
-        V: "0.3",
-        Zoom: "{z}",
-        Row: "{y}",
-        Col: "{x}"
-      },
-      {
-        tileSize: 300
-      }
-    );
     zoomTarget.value = map.mapboxGLMap.getZoom();
   });
   mapUtil.value = new MapUtil(map);
@@ -172,7 +166,7 @@ onMounted(() => {
   });
   // 回显线
   emitter.on("echoLine", (res) => {
-    mapUtil.value.createLine(res, res.flag);
+    mapUtil.value.createLine(res);
   });
   //创建边界面（geojson）
   emitter.on("setBoundarys", (res) => {
@@ -203,6 +197,11 @@ onMounted(() => {
     mapUtil.value.diffusionCircle(res);
   });
 
+  // 清除全部覆盖物
+  emitter.on("removeElementAll", () => {
+    mapUtil.value.removeElementAll();
+  });
+
   // 展示盘曲
   emitter.on("showGapText", (obj) => {
     mapUtil.value.gapText(obj);
@@ -301,6 +300,7 @@ onUnmounted(() => {
   emitter.off("diffusionCircle");
   emitter.off("SsCircle");
   emitter.off("ClearssCircle");
+  emitter.off("removeElementAll");
 });
 </script>
 
@@ -323,35 +323,29 @@ onUnmounted(() => {
   right: 398px;
   bottom: 4px;
   z-index: 9;
-
   .mapImageItem {
     border: 1px solid #08aae8;
     background: rgb(9, 26, 70);
-
+    & > img {
-    &>img {
       width: 100%;
       height: 50px;
     }
-
+    & > div {
-    &>div {
       text-align: center;
       position: relative;
       top: -3px;
     }
   }
-
   .zoomTargetBox {
     margin-top: 10px;
     margin-left: 23px;
   }
-
   ::v-deep .el-input-number__decrease,
   ::v-deep .el-input-number__increase {
     background: #133362;
     color: #fff;
     border: none;
   }
-
   ::v-deep .el-input__inner {
     background: #0c1641;
   }

src/components/MyComponents/RichOnly/index.vue

@@ -1,21 +1,12 @@
 <template>
   <div>
-    <el-dialog
+    <el-dialog :title="titleValue" custom-class="qc-dialog" width="1400px" :model-value="modelValue" @close="closed">
-      :title="titleValue"
-      width="1400px"
-      :model-value="modelValue"
-      @close="closed"
-    >
       <el-form :model="listQuery" :inline="true">
         <el-form-item label="所属部门">
           <MOSTY.Department width="100%" clearable v-model="listQuery.ssbmdm" />
         </el-form-item>
         <el-form-item label="圈层名称">
-          <el-input
+          <el-input v-model="listQuery.qcmc" placeholder="请输入圈层名称" clearable />
-            v-model="listQuery.qcmc"
-            placeholder="请输入圈层名称"
-            clearable
-          />
         </el-form-item>
 
         <el-form-item>
@@ -24,64 +15,22 @@
         </el-form-item>
       </el-form>
       <div class="tabBox" style="margin-top: 0px" v-if="modelValue">
-        <el-table
+        <el-table ref="multipleUserRef" @selection-change="handleSelectionChange" :data="tableData" border
-          ref="multipleUserRef"
+          style="width: 100%" :row-key="keyid" height="450">
-          @selection-change="handleSelectionChange"
+          <el-table-column type="selection" width="55" :reserve-selection="true" v-if="props.multiple" />
-          :data="tableData"
-          border
-          style="width: 100%"
-          :row-key="keyid"
-          height="450"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            :reserve-selection="true"
-            v-if="props.multiple"
-          />
           <el-table-column width="55" #default="{ row }" v-else>
             <el-radio v-model="ridioIndex" :label="row.id"></el-radio>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="序号" type="index" align="center" sortable width="80" />
-            label="序号"
+          <el-table-column sortable prop="ssbm" label="所属部门" show-overflow-tooltip align="center"></el-table-column>
-            type="index"
+          <el-table-column sortable prop="qcmc" show-overflow-tooltip label="圈层名称" align="center">
-            align="center"
-            sortable
-            width="80"
-          />
-          <el-table-column
-            sortable
-            prop="ssbm"
-            label="所属部门"
-            show-overflow-tooltip
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="qcmc"
-            show-overflow-tooltip
-            label="圈层名称"
-            align="center"
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column sortable prop="qclx" show-overflow-tooltip label="圈层类型" align="center">
-            sortable
-            prop="qclx"
-            show-overflow-tooltip
-            label="圈层类型"
-            align="center"
-          >
             <template #default="{ row }">
               <dict-tag :options="D_BZ_QCLX" :value="row.qclx" :tag="false" />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column sortable prop="qcjb" show-overflow-tooltip label="圈层等级" align="center">
-            sortable
-            prop="qcjb"
-            show-overflow-tooltip
-            label="圈层等级"
-            align="center"
-          >
             <template #default="{ row }">
               <dict-tag :options="D_BZ_QCDJ" :value="row.qcjb" :tag="false" />
             </template>
@@ -89,16 +38,9 @@
         </el-table>
       </div>
       <div class="fenye" :style="{ top: tableHeight + 'px' }">
-        <el-pagination
+        <el-pagination class="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-          class="pagination"
+          :current-page="listQuery.pageCurrent" :page-sizes="[2, 5, 10, 20]" :page-size="listQuery.pageSize"
-          @size-change="handleSizeChange"
+          layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-          @current-change="handleCurrentChange"
-          :current-page="listQuery.pageCurrent"
-          :page-sizes="[2, 5, 10, 20]"
-          :page-size="listQuery.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        ></el-pagination>
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -270,9 +212,11 @@ watch(
 <style lang="scss" scoped>
 @import "@/assets/css/layout.scss";
 @import "@/assets/css/element-plus.scss";
+
 ::v-deep .el-form--inline {
   padding-left: 0 !important;
 }
+
 ::v-deep .el-radio__label {
   display: none;
 }
@@ -281,7 +225,10 @@ watch(
 .el-dialog {
   // --el-dialog-bg-color: #001238 !important;
 }
-.el-dialog__title {
+
+.qc-dialog {
+  .el-dialog__title {
     color: #fff !important;
+  }
 }
 </style>

src/components/chooseList/chooseTable.vue

@@ -1,15 +1,8 @@
 <template>
-  <el-popover
+  <el-popover popper-class="dinw" :visible="visible" :width="getConfiger.width" :trigger="getConfiger.trigger">
-    popper-class="dinw"
+    <template #reference><span class="deBtn" @click="handleClick">{{
-    :visible="visible"
-    :width="getConfiger.width"
-    :trigger="getConfiger.trigger"
-  >
-    <template #reference
-      ><span class="deBtn" @click="handleClick">{{
       getConfiger.selectName
-      }}</span></template
+    }}</span></template>
-    >
     <div class="flex just-between align-center">
       <span>{{ title }}</span>
       <span @click="visible = false">
@@ -22,133 +15,67 @@
     <div class="tableBox flex" v-if="visible">
       <!-- 左边 -->
       <div class="table">
-        <MyTable
+        <MyTable @chooseData="chooseDataL" :tableData="pageDataL.tableData" :tableColumn="pageDataL.tableColumn"
-          @chooseData="chooseDataL"
+          :tableHeight="common.tableHeight" :key="common.keyCount" :tableConfiger="common.tableConfiger">
-          :tableData="pageDataL.tableData"
-          :tableColumn="pageDataL.tableColumn"
-          :tableHeight="common.tableHeight"
-          :key="common.keyCount"
-          :tableConfiger="common.tableConfiger"
-        >
           <!-- 是否报备 -->
           <template #sfbb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_SF" :value="row.sfbb" :tag="false" />
-              :options="props.dic.D_BZ_SF"
-              :value="row.sfbb"
-              :tag="false"
-            />
           </template>
           <!-- 警种类型 -->
           <template #lx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_RYJZLB" :value="row.lx" :tag="false" />
-              :options="props.dic.D_BZ_RYJZLB"
-              :value="row.lx"
-              :tag="false"
-            />
           </template>
           <!-- 人员类型 -->
           <template #fl="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_RYMFJLB" :value="row.fl" :tag="false" />
-              :options="props.dic.D_BZ_RYMFJLB"
-              :value="row.fl"
-              :tag="false"
-            />
           </template>
           <!-- 设备类型 -->
           <template #pddtlx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_PDDTLX" :value="row.pddtlx" :tag="false" />
-              :options="props.dic.D_BZ_PDDTLX"
-              :value="row.pddtlx"
-              :tag="false"
-            />
           </template>
           <!-- 班次类型 -->
           <template #bcQwBbzl="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_BBZL" :value="row.bcQwBbzl" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_BBZL"
-              :value="row.bcQwBbzl"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 跨越天数 -->
           <template #bcKtsDict="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_BC_KTS" :value="row.bcKtsDict" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_BC_KTS"
-              :value="row.bcKtsDict"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 请选择大类别 -->
           <template #jyjtfwlb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_JYCL_JYJTFWLB" :value="row.jyjtfwlb" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_JYCL_JYJTFWLB"
-              :value="row.jyjtfwlb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 请选择小类别 -->
           <template #jyjtgjlb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_JYCL_JYJTGJLB" :value="row.jyjtgjlb" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_JYCL_JYJTGJLB"
-              :value="row.jyjtgjlb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 设备类型 -->
           <template #sblx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_ZDSB_SBLX" :value="row.sblx" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_ZDSB_SBLX"
-              :value="row.sblx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 终端类别 -->
           <template #sblb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_ZDSB_SBLB" :value="row.sblb" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_ZDSB_SBLB"
-              :value="row.sblb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 器械类型 -->
           <template #qxlx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_JYQX_QXLX" :value="row.qxlx" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_JYQX_QXLX"
-              :value="row.qxlx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 报备种类 -->
           <template #jzQwBbzl="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_BBZL" :value="row.jzQwBbzl" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_BBZL"
-              :value="row.jzQwBbzl"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 巡防区域类别 -->
           <template #xqlb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_XQLB" :value="row.xqlb" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_XQLB"
-              :value="row.xqlb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 巡防区域类型 -->
           <template #xqlx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_XQLX" :value="row.xqlx" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_XQLX"
-              :value="row.xqlx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 警务站类型： -->
           <template #jwzLx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_JWZLX" :value="row.jwzLx" :tag="false"></dict-tag>
-              :options="props.dic.D_BZ_JWZLX"
-              :value="row.jwzLx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 时间段 -->
           <template #sdList="{ row }">
@@ -165,134 +92,69 @@
         </MyTable>
       </div>
       <!-- 切换按钮 -->
-      <div
+      <div class="cnt flex just-center align-center" v-if="!getConfiger.isRadio">
-        class="cnt flex just-center align-center"
-        v-if="!getConfiger.isRadio"
-      >
         <el-button :icon="Back" circle @click="upLeft" />
         <el-button :icon="Right" circle @click="upRight" />
       </div>
       <!-- 右边 -->
       <div class="table" v-if="!getConfiger.isRadio">
-        <MyTable
+        <MyTable @chooseData="chooseDataR" :tableData="pageDataR.tableData" :tableColumn="pageDataR.tableColumn"
-          @chooseData="chooseDataR"
+          :tableHeight="common.tableHeight" :key="common.keyCount" :tableConfiger="common.tableConfiger">
-          :tableData="pageDataR.tableData"
-          :tableColumn="pageDataR.tableColumn"
-          :tableHeight="common.tableHeight"
-          :key="common.keyCount"
-          :tableConfiger="common.tableConfiger"
-        >
           <!-- 是否报备 -->
           <template #sfbb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_SF" :value="row.sfbb" :tag="false" />
-              :options="props.dic.D_BZ_SF"
-              :value="row.sfbb"
-              :tag="false"
-            />
           </template>
           <!-- 警种类型 -->
           <template #lx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_RYJZLB" :value="row.lx" :tag="false" />
-              :options="props.dic.D_BZ_RYJZLB"
-              :value="row.lx"
-              :tag="false"
-            />
           </template>
           <!-- 人员类型 -->
           <template #fl="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_RYMFJLB" :value="row.fl" :tag="false" />
-              :options="props.dic.D_BZ_RYMFJLB"
-              :value="row.fl"
-              :tag="false"
-            />
           </template>
           <!-- 设备类型 -->
           <template #pddtlx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_BZ_PDDTLX" :value="row.pddtlx" :tag="false" />
-              :options="props.dic.D_BZ_PDDTLX"
-              :value="row.pddtlx"
-              :tag="false"
-            />
           </template>
           <!-- 班次类型 -->
           <template #bcQwBbzl="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_BBZL" :value="row.bcQwBbzl" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_BBZL"
-              :value="row.bcQwBbzl"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 跨越天数 -->
           <template #bcKtsDict="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_BC_KTS" :value="row.bcKtsDict" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_BC_KTS"
-              :value="row.bcKtsDict"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 请选择大类别 -->
           <template #jyjtfwlb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_JYCL_JYJTFWLB" :value="row.jyjtfwlb" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_JYCL_JYJTFWLB"
-              :value="row.jyjtfwlb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 请选择小类别 -->
           <template #jyjtgjlb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_JYCL_JYJTGJLB" :value="row.jyjtgjlb" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_JYCL_JYJTGJLB"
-              :value="row.jyjtgjlb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 设备类型 -->
           <template #sblx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_ZDSB_SBLX" :value="row.sblx" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_ZDSB_SBLX"
-              :value="row.sblx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 终端类别 -->
           <template #sblb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_ZDSB_SBLB" :value="row.sblb" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_ZDSB_SBLB"
-              :value="row.sblb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 器械类型 -->
           <template #qxlx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_JCGL_JYQX_QXLX" :value="row.qxlx" :tag="false"></dict-tag>
-              :options="props.dic.D_JCGL_JYQX_QXLX"
-              :value="row.qxlx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 报备种类 -->
           <template #jzQwBbzl="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_BBZL" :value="row.jzQwBbzl" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_BBZL"
-              :value="row.jzQwBbzl"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 巡防区域类别 -->
           <template #xqlb="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_XQLB" :value="row.xqlb" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_XQLB"
-              :value="row.xqlb"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 巡防区域类型 -->
           <template #xqlx="{ row }">
-            <dict-tag
+            <dict-tag :options="props.dic.D_QW_XQLX" :value="row.xqlx" :tag="false"></dict-tag>
-              :options="props.dic.D_QW_XQLX"
-              :value="row.xqlx"
-              :tag="false"
-            ></dict-tag>
           </template>
           <!-- 时间段 -->
           <template #sdList="{ row }">
@@ -310,12 +172,8 @@
       </div>
     </div>
     <div class="footInfoBtn flex just-between align-center">
-      <Pages
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="common.tableHeight"
-        @changeNo="changeNo"
+        :pageConfiger="{ ...listQuery }" />
-        @changeSize="changeSize"
-        :tableHeight="common.tableHeight"
-        :pageConfiger="{ ...listQuery }"
-      />
       <el-button type="primary" @click="submitDate">确定选择</el-button>
     </div>
   </el-popover>
@@ -827,6 +685,8 @@ const submitDate = () => {
   } else {
     if (pageDataR.tableData.length == 0)
       return proxy.$message.warning("请选择数据");
+    console.log( pageDataR.tableData,' pageDataR.tableData');
+    
     emits("update:modelValue", pageDataR.tableData); //多选
     emits("change", pageDataR.tableData);
   }

src/components/video/index.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="videoBoxcnt" v-show="isShowVideo">
+    <div class="videoMain">
+      <div class="close" @click="isShowVideo = false">
+        <el-icon :size="22"><CircleClose /></el-icon>
+      </div>
+      <div class="cnt-box">
+        <!-- <VideoPay :show="true" :src="url" /> -->
+           <VideoPay :sbbh="sbbh"  v-if="sbbh" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ElMessage } from "element-plus";
+// import VideoPay from "@/components/VideoPay/index.vue";
+import VideoPay from "@/components/wsIframe/index"; //iframe播放
+import { dateFormat } from "@/utils/auth";
+import { http } from "@/api/service";
+import emitter from "@/utils/eventBus.js";
+import {
+  ref,
+  onMounted,
+  onUnmounted,
+  reactive,
+  computed,
+  getCurrentInstance
+} from "vue";
+const isShowVideo = ref(false);
+const player = ref(null);
+const { proxy } = getCurrentInstance();
+const sbbh = ref(null);
+const url = ref();
+
+onMounted(() => {
+  emitter.on("openGzyVideo", (res) => {
+    console.log(res,'111111');
+    
+    sbbh.value = res.sbbh;
+    isShowVideo.value=true
+    // getUrl(sbbh.value);
+  });
+});
+onUnmounted(() => {
+  emitter.off("openGzyVideo");
+});
+
+function getUrl(val) {
+  http.previewURLs({ sbbh: val }).then((res) => {
+    let data = JSON.parse(res);
+    if(data.data){
+      isShowVideo.value = true;
+      url.value = data.data.url;
+    }else{
+      isShowVideo.value = false
+      ElMessage.info("暂无数据源");
+    }
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.videoBoxcnt {
+  position: fixed;
+  width: 100%;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.3);
+  z-index: 999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.close {
+  width: 100%;
+  text-align: right;
+  height: 24px;
+}
+.cnt-box {
+  width: 50vw;
+  height: 50vh;
+  background: #fff;
+  // padding: 5px;
+}
+
+.splitBtn {
+  display: inline-block;
+  padding: 4px 14px;
+  border: 1px solid #e5e5e5;
+  border-radius: 4px;
+  margin-left: 4px;
+  margin-bottom: 6px;
+  color: #000;
+}
+.isBtnActive {
+  border: 1px solid #ffcc00;
+}
+</style>
+<style scoped>
+/* @import "~@/components/h5player/static/css/antd.min.css"; */
+.name {
+  width: 60px;
+  display: inline-block;
+  text-align-last: justify;
+  margin-right: 4px;
+}
+</style>

src/views/StationLevel/index.vue

@@ -6,38 +6,27 @@
         <li class="asideItem" v-for="(item, idx) in meun.leftMeun" :key="idx">
           <div class="title">{{ item }}</div>
           <div class="asideCnt" @click="handless">
-            <PeoCollection
+            <PeoCollection :jczId="query.id" v-if="item == '人员数据采集'"></PeoCollection>
-              :jczId="query.id"
+            <PlowStatistics :jczId="query.id" v-if="item == '流入流出统计'"></PlowStatistics>
-              v-if="item == '人员数据采集'"
+            <WarningCount :jczId="query.id" v-if="item == '预警统计'"></WarningCount>
-            ></PeoCollection>
-            <PlowStatistics
-              :jczId="query.id"
-              v-if="item == '流入流出统计'"
-            ></PlowStatistics>
-            <WarningCount
-              :jczId="query.id"
-              v-if="item == '预警统计'"
-            ></WarningCount>
           </div>
         </li>
       </ul>
       <div class="mainBox">
-        <div class="main-top"><VideoMore></VideoMore></div>
+        <div class="main-top">
-        <div class="main-bottom"><VideoFoot></VideoFoot></div>
+          <VideoMore></VideoMore>
+        </div>
+        <div class="main-bottom">
+          <VideoFoot></VideoFoot>
+        </div>
       </div>
       <ul class="asideBox">
         <li class="asideItem" v-for="(item, idx) in meun.rightMeun" :key="idx">
           <div class="title">{{ item }}</div>
           <div class="asideCnt">
             <BeOnDuty :jczId="query.id" v-if="item == '值班备勤'"></BeOnDuty>
-            <CarWarning
+            <CarWarning :jczId="query.id" v-if="item == '车辆预警'"></CarWarning>
-              :jczId="query.id"
+            <PeoWarning :jczId="query.id" v-if="item == '人员预警'"></PeoWarning>
-              v-if="item == '车辆预警'"
-            ></CarWarning>
-            <PeoWarning
-              :jczId="query.id"
-              v-if="item == '人员预警'"
-            ></PeoWarning>
           </div>
         </li>
       </ul>
@@ -71,21 +60,25 @@ const query = computed(() => {
 .homeBox {
   background: #000;
 }
+
 .mainBox_jcz {
   position: absolute;
   top: 65px;
   width: 100%;
   height: calc(100vh - 60px);
   background: #000;
+
   .asideBox {
     width: 420px;
     height: 100%;
+
     .asideItem {
       height: calc(100% / 3);
       background: url("~@/assets/images/bg12.png") no-repeat;
       background-size: 100% 100%;
       padding: 0 10px;
       box-sizing: border-box;
+
       .title {
         height: 50px;
         line-height: 50px;
@@ -96,6 +89,7 @@ const query = computed(() => {
         -webkit-background-clip: text;
         -webkit-text-fill-color: transparent;
       }
+
       .asideCnt {
         height: calc(100% - 50px);
         overflow: hidden;
@@ -103,14 +97,17 @@ const query = computed(() => {
       }
     }
   }
+
   .mainBox {
     flex: 1 0 0;
     margin: 10px;
+
     .main-top {
       background: url("~@/assets/images/bg_13.png") no-repeat;
       background-size: 100% 100%;
       height: 70%;
     }
+
     .main-bottom {
       height: 30%;
       background: url("~@/assets/images/bg_14.png") no-repeat;

src/views/StationLevel/layout/BeOnDuty.vue

@@ -2,18 +2,10 @@
   <div class="warning-container">
     <!-- 标签切换 -->
     <div class="tab-container">
-      <div
+      <div class="tab-item" @click="showchenge(1)" :class="{ active: show == 1 }">
-        class="tab-item"
-        @click="showchenge(1)"
-        :class="{ active: show == 1 }"
-      >
         <div class="tab-content">值班人员</div>
       </div>
-      <div
+      <div class="tab-item" @click="showchenge(2)" :class="{ active: show == 2 }">
-        class="tab-item"
-        @click="showchenge(2)"
-        :class="{ active: show == 2 }"
-      >
         <div class="tab-content">值班装备</div>
       </div>
     </div>
@@ -21,15 +13,11 @@
     <!-- 预警列表 -->
     <div class="warning-list" v-if="show == 2 && warningList">
       <div class="warning-card">
-        <div class="title flex align-center">
+        <div class="title flex align-center white-text">
           <img src="@/assets/images/icon_06.png" alt="" />
           值班装备
         </div>
-        <div
+        <div class="cardItem flex white-text" v-for="(item, index) in warningList.qxList" :key="index">
-          class="cardItem flex"
-          v-for="(item, index) in warningList.qxList"
-          :key="index"
-        >
           <span style="flex: 1">名称：{{ item.qxmc }}</span>
           <span style="flex: 1">数量：{{ item.qxsl }}</span>
         </div>
@@ -37,27 +25,19 @@
 
       <div class="line mt6 mb6"></div>
       <div class="warning-card">
-        <div class="title flex align-center">
+        <div class="title flex align-center white-text">
           <img src="@/assets/images/icon_06.png" alt="" /> 值班车辆
         </div>
-        <div
+        <div class="cardItem white-text" v-for="(item, index) in warningList.clList" :key="index">
-          class="cardItem"
-          v-for="(item, index) in warningList.clList"
-          :key="index"
-        >
           车牌号：{{ item.cph }}
         </div>
       </div>
       <div class="line mt6 mb6"></div>
       <div class="warning-card">
-        <div class="title flex align-center">
+        <div class="title flex align-center white-text">
           <img src="@/assets/images/icon_06.png" alt="" /> 智能设备
         </div>
-        <div
+        <div class="cardItem white-text" v-for="(item, index) in warningList.sbList" :key="index">
-          class="cardItem"
-          v-for="(item, index) in warningList.sbList"
-          :key="index"
-        >
           名称：{{ item.sbmc }}
         </div>
       </div>
@@ -65,19 +45,13 @@
     <Empty :show="warningList == null && show == 2" />
     <div class="warning-list" v-if="show == 1 && warningList">
       <div class="warning-card">
-        <div class="title flex align-center">
+        <div class="title flex align-center white-text">
           <img src="@/assets/images/icon_06.png" alt="" />
           值班人员
         </div>
-        <div
+        <div class="cardItem flex white-text" v-for="(item, index) in warningList.ryList" :key="index">
-          class="cardItem flex"
-          v-for="(item, index) in warningList.ryList"
-          :key="index"
-        >
           <span style="flex: 1">名称：{{ item.ryXm }}</span>
-          <span style="flex: 1"
+          <span style="flex: 1">警种：{{ item.ryMfjlb == "01" ? "民警" : "辅警" }}</span>
-            >警种：{{ item.ryJzlx == "01" ? "民警" : "辅警" }}</span
-          >
         </div>
       </div>
       <div class="line mt6 mb6"></div>
@@ -91,7 +65,7 @@ import { onMounted, ref } from "vue";
 import Empty from "@/components/MyComponents/Empty/index.vue";
 import { jczqueryById } from "@/api/mosty-jcz";
 import emitter from "@/utils/eventBus.js";
-let warningList = ref({ qxList: [], ryList: [], clList: [] ,sbList:[]});
+let warningList = ref({ qxList: [], ryList: [], clList: [], sbList: [] });
 onMounted(() => {
   emitter.on("getjczqueryById", (res) => {
     warningListValue(res)
@@ -116,12 +90,12 @@ const getjczqueryById = () => {
 };
 const warningListValue = (res) => {
   if (res) {
-    warningList.value={}
+    warningList.value = {}
-      warningList.value.qxList =res.qxList&&res.qxList.length>0
+    warningList.value.qxList = res.qxList && res.qxList.length > 0
       ? res.qxList.filter((item) => item.qxsl > 0)
       : [];
-      warningList.value.ryList = res.ryList.length>0 ? res.ryList : [];
+    warningList.value.ryList = res.ryList.length > 0 ? res.ryList : [];
-      warningList.value.clList = res.clList.length>0 ? res.clList : [];
+    warningList.value.clList = res.clList.length > 0 ? res.clList : [];
     warningList.value.sbList = [...res.tcList, ...res.zdList]
     emitter.emit("chengZ", res);
   } else {
@@ -189,6 +163,7 @@ getjczqueryById();
   flex: 1;
   display: flex;
   flex-direction: column;
+
   // justify-content: space-between;
   .cardItem {
     height: 27px;
@@ -200,6 +175,7 @@ getjczqueryById();
     box-sizing: border-box;
   }
 }
+
 .line {
   width: 100%;
   height: 3px;
@@ -210,6 +186,7 @@ getjczqueryById();
 .warning-image {
   width: 100px;
   height: 80px;
+
   img {
     width: 100%;
     height: 100%;
@@ -248,5 +225,7 @@ getjczqueryById();
   font-size: 12px;
   margin-left: 10px;
 }
-
+.white-text{
+  color: #fff;
+}
 </style>

src/views/StationLevel/layout/PeoCollection.vue

@@ -56,6 +56,7 @@ countWay();
   flex: 1;
   text-align: center;
   position: relative;
+  color: #fff;
 }
 
 .stat-number {

src/views/backOfficeSystem/peopleManag/checkpoint/components/editAddForm.vue

@@ -3,146 +3,78 @@
     <div class="head_box">
       <span class="title">{{ pageInfo[pageType].title }}</span>
       <div>
-        <el-button
+        <el-button size="small" type="primary" v-if="['add', 'edit'].includes(pageType)" @click="_onSave">保存</el-button>
-          size="small"
-          type="primary"
-          v-if="['add', 'edit'].includes(pageType)"
-          @click="_onSave"
-          >保存</el-button
-        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="cntinfo">
-      <el-form
+      <el-form ref="formRef" :model="listQuery" :rules="rules" :inline="true" label-position="top">
-        ref="formRef"
-        :model="listQuery"
-        :rules="rules"
-        :inline="true"
-        label-position="top"
-      >
         <el-form-item style="width: 40%" prop="ssbmdm" label="所属部门">
-          <MOSTY.Department
+          <MOSTY.Department width="100%" clearable :disabled="forbidden" v-model="listQuery.ssbmdm"
-            width="100%"
+            :placeholder="listQuery.ssbm ? listQuery.ssbm : '请选择所属部门'" />
-            clearable
-            :disabled="forbidden"
-            v-model="listQuery.ssbmdm"
-            :placeholder="listQuery.ssbm ? listQuery.ssbm : '请选择所属部门'"
-          />
         </el-form-item>
         <el-form-item style="width: 40%" prop="jczmc" label="环林卡口名称">
-          <el-input :disabled="forbidden"
+          <el-input :disabled="forbidden" v-model="listQuery.jczmc" placeholder="请输入环林卡口名称" style="width: 100%"
-            v-model="listQuery.jczmc"
+            clearable />
-            placeholder="请输入环林卡口名称"
-            style="width: 100%"
-            clearable
-          />
         </el-form-item>
 
         <el-form-item style="width: 40%" prop="zqlx" label="执勤类型">
           <el-select :disabled="forbidden" v-model="listQuery.zqlx" placeholder="请选择执勤类型">
-            <el-option
+            <el-option v-for="dict in dict.D_BZ_ZQLX" :key="dict.value" :value="dict.value"
-              v-for="dict in dict.D_BZ_ZQLX"
+              :label="dict.label"></el-option>
-              :key="dict.value"
-              :value="dict.value"
-              :label="dict.label"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="width: 40%" prop="jczlx" label="环林卡口类型">
           <el-select :disabled="forbidden" v-model="listQuery.jczlx" placeholder="请选择环林卡口类型">
-            <el-option
+            <el-option v-for="dict in dict.D_BZ_JCZLX" :key="dict.value" :value="dict.value"
-              v-for="dict in dict.D_BZ_JCZLX"
+              :label="dict.label"></el-option>
-              :key="dict.value"
-              :value="dict.value"
-              :label="dict.label"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="width: 40%" prop="jczjb" label="环林卡口级别">
           <el-select :disabled="forbidden" v-model="listQuery.jczjb" placeholder="请选择环林卡口级别">
-            <el-option
+            <el-option v-for="dict in dict.D_BZ_JCZJB" :key="dict.value" :value="dict.value"
-              v-for="dict in dict.D_BZ_JCZJB"
+              :label="dict.label"></el-option>
-              :key="dict.value"
-              :value="dict.value"
-              :label="dict.label"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="width: 40%" prop="fzr" label="负责人">
-          <el-input :disabled="forbidden"
+          <el-input :disabled="forbidden" v-model="listQuery.fzr" placeholder="请输入负责人" style="width: 100%" clearable />
-            v-model="listQuery.fzr"
-            placeholder="请输入负责人"
-            style="width: 100%"
-            clearable
-          />
         </el-form-item>
         <el-form-item style="width: 40%" prop="lxdh" label="联系电话">
-          <el-input :disabled="forbidden"
+          <el-input :disabled="forbidden" v-model="listQuery.lxdh" placeholder="请输入联系电话" style="width: 100%"
-            v-model="listQuery.lxdh"
+            clearable />
-            placeholder="请输入联系电话"
-            style="width: 100%"
-            clearable
-          />
         </el-form-item>
         <el-form-item style="width: 40%" prop="dllx" label="道路类型">
           <el-select :disabled="forbidden" v-model="listQuery.dllx" placeholder="请选择道路类型">
-            <el-option
+            <el-option v-for="dict in dict.D_BZ_DLLX" :key="dict.value" :value="dict.value"
-              v-for="dict in dict.D_BZ_DLLX"
+              :label="dict.label"></el-option>
-              :key="dict.value"
-              :value="dict.value"
-              :label="dict.label"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="width: 40%" prop="xxdz" label="环林卡口地址">
-          <el-input :disabled="forbidden"
+          <el-input :disabled="forbidden" v-model="listQuery.xxdz" placeholder="请输入环林卡口地址" style="width: 100%"
-            v-model="listQuery.xxdz"
+            clearable />
-            placeholder="请输入环林卡口地址"
-            style="width: 100%"
-            clearable
-          />
         </el-form-item>
         <el-form-item label="示意图(最多3张)" prop="fjid" style="width: 40%">
-          <MOSTY.Upload :disableds="forbidden"
+          <MOSTY.Upload :disableds="forbidden" :isImg="true" width="100%" :limit="3" v-model="listQuery.fjid">
-            :isImg="true"
+          </MOSTY.Upload>
-            width="100%"
-            :limit="3"
-            v-model="listQuery.fjid"
-          ></MOSTY.Upload>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="全景图(正面、侧面、俯视共3张)" prop="qjfjid" style="width: 48%">
-          label="全景图(正面、侧面、俯视共3张)"
+          <MOSTY.Upload :disableds="forbidden" width="100%" :isImg="true" :limit="3" v-model="listQuery.qjfjid">
-          prop="qjfjid"
+          </MOSTY.Upload>
-          style="width: 48%"
-        >
-          <MOSTY.Upload :disableds="forbidden"
-            width="100%"
-            :isImg="true"
-            :limit="3"
-            v-model="listQuery.qjfjid"
-          ></MOSTY.Upload>
         </el-form-item>
         <el-form-item style="width: 85%" prop="jd" label="坐标位置">
           <div class="latlng flex">
-            <el-input :disabled="true"
+            <el-input :disabled="true" v-model="listQuery.jd" clearable placeholder="请选择坐标"
-              v-model="listQuery.jd"
+              style="width: 42%"></el-input>
-              clearable
+            <el-input :disabled="true" v-model="listQuery.wd" clearable placeholder="请选择坐标"
-              placeholder="请选择坐标"
+              style="width: 42%; margin-left: 1%"></el-input>
-              style="width: 42%"
-            ></el-input>
-            <el-input  :disabled="true"
-              v-model="listQuery.wd"
-              clearable
-              placeholder="请选择坐标"
-              style="width: 42%; margin-left: 1%"
-            ></el-input>
 
             <el-button @click="selectLocation" :disabled="forbidden">选择定位</el-button>
           </div>
         </el-form-item>
         <el-form-item style="width: 100%">
-          <div class="mapbox"><GdMap /></div>
+          <div class="mapbox">
+            <GdMap />
+          </div>
         </el-form-item>
       </el-form>
     </div>
@@ -159,7 +91,7 @@ import { ElMessage } from "element-plus";
 const props = defineProps({
   dict: {
     type: Object,
-    default: () => {}
+    default: () => { }
   }
 });
 const rules = reactive({
@@ -229,17 +161,17 @@ onMounted(() => {
   });
 });
 let pageType = ref("add");
-const forbidden=ref(false)
+const forbidden = ref(false)
 // 初始化数据
 const init = (type, row) => {
   pageType.value = type;
   dialogForm.value = true;
   // 根据type和row初始化表单数据
   tabHeightFn();
-  if (type == "edit"||type == "detail") {
+  if (type == "edit" || type == "detail") {
     listQuery.value = { ...row };
     if (type == "detail") {
-      forbidden.value=true
+      forbidden.value = true
     }
     chackLat();
   } else {
@@ -281,7 +213,7 @@ const selectLocation = () => {
 //获取经纬度
 const chackLat = () => {
   const { jd, wd } = listQuery.value;
-  console.log(jd, wd );
+  console.log(jd, wd);
 
   emitter.emit("deletePointArea", "jczMap_Gzy");
   if (jd && wd) {
@@ -296,13 +228,13 @@ const chackLat = () => {
 };
 // 初始化时展示地图图标
 const mapIcon = (val) => {
-console.log(val);
+  console.log(val);
 
 }
 //页面关闭
 const close = () => {
   dialogForm.value = false;
-  forbidden.value=false
+  forbidden.value = false
   listQuery.value = {};
 };
 // 表格高度计算
@@ -317,21 +249,25 @@ defineExpose({ init });
 <style lang="scss" scoped>
 .dialog {
   padding: 20px;
+
   .head_box {
     display: flex;
     justify-content: space-between;
     align-items: center;
     margin-bottom: 20px;
   }
+
   .cntinfo {
     height: calc(100% - 70px);
     overflow: hidden;
     overflow-y: auto;
   }
 }
+
 .my_transfer {
   height: calc(100% - 50px);
   display: flex;
+
   .btn {
     width: 50px;
     display: flex;
@@ -339,58 +275,71 @@ defineExpose({ init });
     justify-content: center;
     margin: 0 10px;
   }
+
   .left {
     margin: 12px;
     flex: 1;
     position: relative;
+
     .tableBox {
       position: absolute;
       width: 100%;
     }
+
     .serch {
       position: relative;
       width: 100%;
+
       // height: 96px;
-      > .el-form--inline {
+      >.el-form--inline {
         display: block;
         width: 100%;
         padding: 0;
-        > .el-form-item--default {
+
+        >.el-form-item--default {
           width: 31%;
         }
       }
     }
+
     .tableBox {
       width: 100%;
     }
   }
+
   .right {
     width: 380px;
     margin: 12px;
   }
 }
+
 .phone {
   width: 95px;
   height: 120px;
+
   .el-image {
     width: 95px;
     max-height: 120px;
   }
 }
+
 ::v-deep .el-upload {
   width: 90px;
   height: 100px;
   border: 1px dashed #000000;
   margin-bottom: 14px;
+
   .el-icon {
     margin-top: 34px;
     font-size: 26px;
   }
+
   .el-image {
     width: 100%;
     height: 100%;
   }
 }
+
 .mapbox {
   width: 1000px;
   padding: 0 10px;

src/views/backOfficeSystem/peopleManag/checkpoint/components/gzyInfo.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="dialogBox" v-if="show">
+    <div class="title">
+      <span>感知源</span><span @click="close" class="close">
+        <el-icon>
+          <Close />
+        </el-icon>
+      </span>
+    </div>
+    <div v-for="(item, index) in info" :key="index + 'gzy'">
+      <div class="infoBox">
+        <div class="content">{{ item.sbmc }}</div>
+        <div class="other">
+          <p>设备编号：{{ item.sbbh }}</p>
+          <p>所属部门：{{ item.ssbm }}</p>
+          <p>厂商名称：{{ item.csmc }}</p>
+        </div>
+        <div class="addressBox">
+          <div>
+            <img src="@/assets/images/dingwei.png" />
+            <span>{{ item.dzmc }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="btn_bom">
+        <button class="dp-default small" @click="chooceItem(item)" style="margin-right: 10px;">选择</button>
+        <button class="dp-default small" @click="openVideo(item)">视频播放</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted, defineEmits } from "vue";
+
+// 左右折叠状态
+import emitter from "@/utils/eventBus.js";
+const show = ref(false);
+const info = ref([]); //警情数据
+const emits = defineEmits(['chooseVideo'])
+onMounted(() => {
+  emitter.on("showGzyInfo", (res) => {
+    console.log(res, 'resresresres')
+    info.value = [res];
+    show.value = true;
+  });
+});
+onUnmounted(() => {
+  emitter.off("showGzyInfo");
+});
+
+function chooceItem(item) {
+  emits('chooseVideo', item)
+}
+
+// 打开视频
+function openVideo(item) {
+  console.log(item, 'item');
+
+  let params = {
+    ...item,
+    splitNum: 1
+  }
+  emitter.emit("openGzyVideo", params)
+}
+//关闭弹窗
+function close() {
+  show.value = false;
+  emitter.emit("showGzy", false);
+  emitter.emit("deletePointArea", "lang");
+}
+</script>
+
+<style lang="scss" scoped>
+.dialogBox {
+  width: 360px;
+  max-height: 78vh;
+  overflow: hidden;
+  overflow-y: auto;
+  padding: 0 12px;
+  position: absolute;
+  top: 30px;
+  left: 10px;
+  background: #052342;
+  z-index: 9;
+  border-radius: 4px;
+
+  .title {
+    height: 38px;
+    line-height: 38px;
+    display: flex;
+    justify-content: space-between;
+    padding: 0;
+
+    .close {
+      font-size: 20px;
+      font-weight: 200;
+      cursor: pointer;
+    }
+  }
+
+  .addressBox {
+    border-top: 1px solid #162f55;
+    margin: 0 10px;
+    line-height: 30px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .infoBox {
+    border: 1px solid #275288;
+    position: relative;
+    margin-bottom: 15px;
+
+    .content {
+      padding: 10px 10px 0 10px;
+      font-size: 14px;
+    }
+
+    .other {
+      margin: 0 10px;
+      padding: 0px;
+      color: #779dcd;
+      list-style: none;
+    }
+  }
+}
+
+.btn_bom {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: 12px;
+
+  span {
+    background: #2c7ee3;
+    border-radius: 4px;
+    padding: 2px 12px;
+    cursor: pointer;
+  }
+
+  span:hover {
+    background: #497dbd;
+    border-radius: 4px;
+    padding: 2px 12px;
+    cursor: pointer;
+  }
+}
+</style>
+<style lang="scss" scoped>
+// @import "@/assets/css/largeScreen.scss";
+
+.infoBox {
+  position: relative;
+  margin-bottom: 15px;
+}
+
+.content {
+  padding: 10px 10px 0 10px;
+  font-size: 14px;
+}
+
+.other {
+  margin: 0 10px;
+  padding: 0px;
+  color: #779dcd;
+  list-style: none;
+
+  p {
+    margin: 5px 0;
+  }
+}
+
+.itemBox {
+  display: flex;
+  justify-content: space-between;
+
+  span {
+    display: inline-block;
+    width: 80%;
+  }
+}
+</style>

src/views/backOfficeSystem/peopleManag/checkpoint/components/perceptionSource.vue

@@ -13,8 +13,9 @@
           <el-input v-model="JczMc" disabled />
         </el-form-item>
         <el-form-item style="width: 40%" label="感知源">
-          <div class="diviput" @click="showJcz = true">
+          <!-- <div class="diviput" @click="showJcz = true"> -->
-            <span v-if="listQuery.sxtList&&listQuery.sxtList.length>0">
+          <div class="diviput">
+            <span v-if="listQuery.sxtList && listQuery.sxtList.length > 0">
               <el-tag closable @close="handleClose(index)" v-for="(item, index) in listQuery.sxtList" :key="index"> {{
                 item.sbmc }} </el-tag>
             </span>
@@ -22,17 +23,27 @@
           </div>
         </el-form-item>
       </el-form>
+      <el-main class="box_sp box_map">
+        <GdMap />
+        <gzy-info @chooseVideo="chooseVideo"></gzy-info>
+      </el-main>
     </div>
   </div>
   <Gzyloder v-model="showJcz" :Single="false" @choosedJcz="GzyMsg" :data="data" />
+  <VideoCnt />
 </template>
 
 <script setup>
+import VideoCnt from "@/components/video/index.vue";
 import { ref, reactive, onMounted } from "vue";
 import Gzyloder from '@/components/loder/Gzyloder.vue'
-import { sxtBatch,JczselectById } from '@/api/mosty-jcz'
+import { sxtBatch, JczselectById } from '@/api/mosty-jcz'
 import { ElMessage } from "element-plus";
-const emit=defineEmits(['getjczgetXfllList'])
+import GdMap from "@/components/GdMap/index.vue";
+import gzyInfo from "./gzyInfo.vue";
+import { ysSxtGetList } from '@/api/yszx.js'
+import emitter from "@/utils/eventBus.js";
+const emit = defineEmits(['getjczgetXfllList'])
 const search = ref(null)
 
 const listQuery = ref({})
@@ -46,12 +57,13 @@ const dialogGzy = ref(false)
 const JczMc = ref()
 // 初始化数据
 const init = (row) => {
+  sxtGetList()
   dialogGzy.value = true;
   listQuery.value.jczid = row.id
   JczMc.value = row.jczmc
-  JczselectById({id:row.id}).then(res => {
+  JczselectById({ id: row.id }).then(res => {
-   if(res){
+    if (res) {
-     listQuery.value.sxtList = res.sxtList?res.sxtList:[];
+      listQuery.value.sxtList = res.sxtList ? res.sxtList : [];
     }
   })
 };
@@ -105,9 +117,13 @@ const pageDatas = reactive({
 //页面关闭
 const close = () => {
   dialogGzy.value = false;
-  listQuery.value={}
+  listQuery.value = {}
 };
-
+// 选择视频
+function chooseVideo(sxt) {
+  console.log(sxt, 'sxt');
+  listQuery.value.sxtList.push(sxt)
+}
 // 表格高度计算
 const tabHeightFn = () => {
   console.log(search.value);
@@ -117,13 +133,23 @@ const tabHeightFn = () => {
     tabHeightFn();
   };
 };
+const sxtGetList = () => {
+  ysSxtGetList().then(res => {
+    emitter.emit("addPointArea", {
+      coords: res,
+      icon: require("@/assets/point/sp.png"),
+      flag: "sp"
+    });
+
+  })
+}
 defineExpose({ init });
 const showJcz = ref(false)
 const GzyMsg = (val) => {
- listQuery.value.sxtList=val
+  listQuery.value.sxtList = val
 }
-const handleClose = (val) => {
+const handleClose = (idx) => {
-  listQuery.value.sxtList.splice(listQuery.value.sxtList.indexOf(val), 1)
+  listQuery.value.sxtList.splice(idx, 1)
 }
 </script>
 
@@ -243,4 +269,19 @@ const handleClose = (val) => {
     color: #b5b5b5;
   }
 }
+
+.box_sp {
+  .sxtz_btn {
+    margin-top: 20px;
+    text-align: right;
+  }
+
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.box_map {
+  position: relative;
+  height: 57vh;
+}
 </style>

src/views/home/components/beonDuty.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="checkpoint-list noScollLine" v-loading="loading">
-    <div
+    <div class="checkpoint-item" v-for="(item, index) in checkpoints" :key="index">
-      class="checkpoint-item"
-      v-for="(item, index) in checkpoints"
-      :key="index"
-    >
       <div class="checkpoint-icon">
         <img src="@/assets/images/bg_11.png" alt="环林卡口" />
       </div>

src/views/home/components/collection.vue

@@ -149,6 +149,7 @@ getcountCrl();
   flex: 1;
   text-align: center;
   position: relative;
+  color: #fff;
 }
 
 .stat-number {

src/views/home/components/entrance.vue

@@ -235,6 +235,7 @@ countWays();
   }
   .bt {
     margin-top: 14px;
+    color: #fff;
 
     .headline {
       width: 70%;

src/views/home/index.vue

@@ -90,7 +90,7 @@ const sxtGetList = () => {
 
   })
 }
-sxtGetList()
+// sxtGetList()
 </script>
 
 <style lang="scss" scoped>

src/views/home/layout/head.vue

@@ -11,12 +11,9 @@
     </div> -->
     <div class="zbbb" v-if="query" @click="show = true">值班报备</div>
   </div>
-  <el-dialog v-model="show" title="Shipping address">
+  <el-dialog v-model="show" width="800px" title="值班报备">
     <div style="height: 50vh; overflow: auto" v-if="show">
-      <zbbb
+      <zbbb :row="row" @close="close" :dic="{
-        :row="row"
-        @close="close"
-        :dic="{
         D_BZ_RYMFJLB,
         D_BZ_JYQXFL,
         D_BZ_XFQDJ,
@@ -24,8 +21,7 @@
         D_BZ_JLLX,
         D_QW_BBZT,
         D_QW_BC_KTS
-        }"
+      }" />
-      />
     </div>
   </el-dialog>
 </template>
@@ -118,12 +114,14 @@ function goPath() {
   background: rgba(0, 0, 0, 0.8);
   z-index: 2;
 }
+
 .home-head-box {
   position: relative;
   width: 100%;
   height: 65px;
   z-index: 2;
   background: #0e1b29;
+
   &::after {
     content: "";
     position: absolute;
@@ -136,6 +134,7 @@ function goPath() {
     background: url("~@/assets/images/home_head.png") no-repeat center center;
     background-size: 100% 100%;
   }
+
   .title {
     font-size: 36px;
     left: 50%;
@@ -147,12 +146,14 @@ function goPath() {
     -webkit-text-fill-color: transparent;
     cursor: pointer;
   }
+
   .time {
     font-family: "DigifaceWide";
     color: #fff;
     left: 25%;
     top: 10px;
   }
+
   .wd {
     right: 25%;
     top: 12px;
@@ -160,6 +161,7 @@ function goPath() {
     font-family: "DigifaceWide";
     color: #fff;
   }
+
   .zbbb {
     position: absolute;
     right: 20px;
@@ -172,6 +174,7 @@ function goPath() {
     font-size: 16px;
     background: url("~@/assets/images/btnbb.png") no-repeat center center;
     background-size: 100% 100%;
+    color: #fff;
     cursor: pointer;
   }
 }

src/views/home/layout/zbbb.vue

@@ -3,22 +3,12 @@
     <div class="flex align-center just-between box">
       <div class="flex align-center">
         报备单位：
-        <MOSTY.Department
+        <MOSTY.Department v-model="listQuery.ssbmdm" placeholder="请选择部门" @getDepValue="changeDep" />
-          v-model="listQuery.ssbmdm"
-          placeholder="请选择部门"
-          @getDepValue="changeDep"
-        />
       </div>
       <!-- v-if="['add', 'edit'].includes(pageType)" -->
       <el-button size="small" type="primary" @click="_onSave" :disabled="loding">保存</el-button>
     </div>
-    <el-form
+    <el-form ref="formRef" class="info" :model="listQuery" :inline="true" :rules="rules">
-      ref="formRef"
-      class="info"
-      :model="listQuery"
-      :inline="true"
-      :rules="rules"
-    >
       <!-- <div class="bblxItem">
         <div class="btItem">环林卡口设置</div>
         <div class="info">
@@ -50,37 +40,18 @@
         <div class="btItem">班次设置</div>
         <div class="info">
           <el-form-item prop="bcKssj" label=" ">
-            <el-time-picker
+            <el-time-picker v-model="listQuery.bcKssj" :disabled="isDetail" placeholder="开始时间" format="HH:mm:ss"
-              v-model="listQuery.bcKssj"
+              value-format="HH:mm:ss" />
-              :disabled="isDetail"
-              placeholder="开始时间"
-              format="HH:mm:ss"
-              value-format="HH:mm:ss"
-            />
           </el-form-item>
           <el-form-item prop="bcKtsDict" label=" ">
-            <el-select
+            <el-select clearable v-model="listQuery.bcKtsDict" placeholder="请选择" style="width: 100%">
-              clearable
+              <el-option v-for="(item, index) in dic.D_QW_BC_KTS" :key="index" :label="item.label"
-              v-model="listQuery.bcKtsDict"
+                :value="item.value"></el-option>
-              placeholder="请选择"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="(item, index) in dic.D_QW_BC_KTS"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item prop="bcJssj" label=" ">
-            <el-time-picker
+            <el-time-picker v-model="listQuery.bcJssj" :disabled="isDetail" format="HH:mm:ss" placeholder="结束时间"
-              v-model="listQuery.bcJssj"
+              value-format="HH:mm:ss" />
-              :disabled="isDetail"
-              format="HH:mm:ss"
-              placeholder="结束时间"
-              value-format="HH:mm:ss"
-            />
           </el-form-item>
         </div>
       </div>
@@ -88,42 +59,21 @@
         <div class="btItem">负责人</div>
         <div class="info">
           <el-form-item>
-            <ChooseTable
+            <ChooseTable :deptment="deptment" @change="handleFzr" v-if="!isDetail" :configer="{
-              :deptment="deptment"
-              @change="handleFzr"
-              v-if="!isDetail"
-              :configer="{
               width: 700,
               lx: 'mj',
               rowKey: 'id',
               isRadio: true
-              }"
+            }" :dic="props.dic" />
-              :dic="props.dic"
-            />
           </el-form-item>
           <el-form-item prop="fzrXm" label=" ">
-            <el-input
+            <el-input readonly v-model="listQuery.fzrXm" placeholder="负责人" clearable />
-              readonly
-              v-model="listQuery.fzrXm"
-              placeholder="负责人"
-              clearable
-            />
           </el-form-item>
           <el-form-item prop="fzrSfzh" label=" ">
-            <el-input
+            <el-input readonly v-model="listQuery.fzrSfzh" placeholder="身份证" clearable />
-              readonly
-              v-model="listQuery.fzrSfzh"
-              placeholder="身份证"
-              clearable
-            />
           </el-form-item>
           <el-form-item prop="fzrLxdh" label=" ">
-            <el-input
+            <el-input readonly v-model="listQuery.fzrLxdh" placeholder="负责人电话" clearable />
-              readonly
-              v-model="listQuery.fzrLxdh"
-              placeholder="负责人电话"
-              clearable
-            />
           </el-form-item>
         </div>
       </div>
@@ -136,17 +86,11 @@
                 <div class="num">
                   {{ mjData ? mjData.length : 0 }}
                 </div>
-                <ChooseTable
+                <ChooseTable :deptment="deptment" v-if="!isDetail" :dic="props.dic" :configer="{
-                  :deptment="deptment"
-                  v-if="!isDetail"
-                  :dic="props.dic"
-                  :configer="{
                   lx: 'mj',
                   rowKey: 'ryid',
                   placement: 'top-start'
-                  }"
+                }" v-model="mjData" />
-                  v-model="mjData"
-                />
                 <div class="peolist">
                   <el-tag type="primary" v-for="item in mjData" :key="item">{{
                     item.jlxm || item.xm
@@ -163,13 +107,8 @@
                 </div>
                 <!-- :deptment="props.dep"
                     :dic="props.dic" -->
-                <ChooseTable
+                <ChooseTable :deptment="deptment" :dic="props.dic" v-if="!isDetail"
-                  :deptment="deptment"
+                  :configer="{ lx: 'fj', placement: 'top-start' }" v-model="fjData" />
-                  :dic="props.dic"
-                  v-if="!isDetail"
-                  :configer="{ lx: 'fj', placement: 'top-start' }"
-                  v-model="fjData"
-                />
                 <div class="peolist">
                   <el-tag type="primary" v-for="item in fjData" :key="item">{{
                     item.jlxm || item.xm
@@ -189,24 +128,13 @@
                 <div class="num">
                   {{ listQuery.zdList ? listQuery.zdList.length : 0 }}
                 </div>
-                <ChooseTable
+                <ChooseTable :dic="props.dic" v-if="!isDetail" :deptment="deptment" :configer="{
-                  :dic="props.dic"
-                  v-if="!isDetail"
-                  :deptment="deptment"
-                  :configer="{
                   lx: 'znzb',
                   rowKey: 'id',
                   placement: 'top-start'
-                  }"
+                }" v-model="listQuery.zdList" />
-                  v-model="listQuery.zdList"
-                />
                 <div class="peolist">
-                  <el-tag
+                  <el-tag type="primary" v-for="item in listQuery.zdList" :key="item">{{ item.sbmc }}</el-tag>
-                    type="primary"
-                    v-for="item in listQuery.zdList"
-                    :key="item"
-                    >{{ item.sbmc }}</el-tag
-                  >
                 </div>
               </div>
             </el-form-item>
@@ -257,24 +185,13 @@
                 <div class="num">
                   {{ listQuery.clList ? listQuery.clList.length : 0 }}
                 </div>
-                <ChooseTable
+                <ChooseTable :deptment="deptment" v-if="!isDetail" :dic="props.dic" :configer="{
-                  :deptment="deptment"
-                  v-if="!isDetail"
-                  :dic="props.dic"
-                  :configer="{
                   lx: 'cl',
                   rowKey: 'id',
                   placement: 'top-start'
-                  }"
+                }" v-model="listQuery.clList" />
-                  v-model="listQuery.clList"
-                />
                 <div class="peolist">
-                  <el-tag
+                  <el-tag type="primary" v-for="item in listQuery.clList" :key="item">{{ item.cph }}</el-tag>
-                    type="primary"
-                    v-for="item in listQuery.clList"
-                    :key="item"
-                    >{{ item.cph }}</el-tag
-                  >
                 </div>
               </div>
             </el-form-item>
@@ -285,11 +202,7 @@
         <div class="btItem">警用器械</div>
         <div class="info">
           <el-form-item>
-            <div
+            <div v-for="(item, index) in listQuery.qxList" :key="index" style="width: 50%; margin-bottom: 10px">
-              v-for="(item, index) in listQuery.qxList"
-              :key="index"
-              style="width: 50%; margin-bottom: 10px"
-            >
               <div class="flex">
                 <div style="width: 30%">{{ item.qxmc }}：</div>
                 <el-input-number v-model="item.qxsl" :step="1" />
@@ -317,13 +230,13 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
   dic: {
     type: Object,
-    default: () => {}
+    default: () => { }
   },
   isDetail: {
     type: Boolean,
     default: false
   },
-  row: { type: Object, default: () => {} }
+  row: { type: Object, default: () => { } }
 });
 const route = useRoute();
 const emit = defineEmits(["close"]);
@@ -352,8 +265,8 @@ const ChegeMj = (val) => {
       xfllld: item.id,
       ryXm: item.xm,
       rysfzh: item.sfzh,
-      ryJzlx: item.fl,
+      ryMfjlb: item.fl,
-      ryMfjilb: item.ryid,
+      ryid:item.ryid,
       ryLxdh: item.lxdh
     };
   });
@@ -365,8 +278,8 @@ const fz = (val) => {
       id: item.xfllld,
       xm: item.ryXm,
       sfzh: item.rysfzh,
-      fl: item.ryJzlx,
+      fl: item.ryMfjlb,
-      ryid: item.ryMfjilb,
+      ryid:item.ryid,
       lxdh: item.ryLxdh
     };
   });
@@ -406,12 +319,12 @@ watch(
   },
   { deep: true, immediate: true }
 );
-const routerList=ref({})
+const routerList = ref({})
 onMounted(() => {
   init();
-  console.log(route.query );
+  console.log(route.query);
 
-  routerList.value=route.query
+  routerList.value = route.query
 });
 // 验证规则
 const rules = ref({
@@ -451,9 +364,8 @@ const rules = ref({
 //保存
 const loding = ref(false);
 const _onSave = () => {
-  formRef.value.validate().then( async() => {
+  formRef.value.validate().then(async () => {
     const data = [...mjData.value, ...fjData.value];
-
     listQuery.value.ryList = ChegeMj(data);
     const time = new Date();
     listQuery.value.bbSjBbrq = timeValidate(time);
@@ -480,23 +392,23 @@ const _onSave = () => {
         listQuery.value.bcKts = 8;
         break;
     }
-  listQuery.value.jczid = routerList.value.id?routerList.value.id:"";
+    listQuery.value.jczid = routerList.value.id ? routerList.value.id : "";
-  listQuery.value.jczmc = routerList.value.name?routerList.value.name:"";
+    listQuery.value.jczmc = routerList.value.name ? routerList.value.name : "";
     if (pageType.value == "add") {
       jczsavel(listQuery.value).then((res) => {
         ElMessage({ message: "新增成功", type: "success" });
         getjczqueryById()
         emit("close");
-    }).finally(()=>{
+      }).finally(() => {
-      loding.value=false
+        loding.value = false
       });
     } else {
       Xfbbupdate(listQuery.value).then((res) => {
         ElMessage({ message: "修改成功", type: "success" });
         getjczqueryById()
         emit("close");
-    }).finally(()=>{
+      }).finally(() => {
-      loding.value=false
+        loding.value = false
       });
     }
 
@@ -505,7 +417,7 @@ const _onSave = () => {
 const getjczqueryById = () => {
   jczqueryById({ jczid: props.jczId }).then((res) => {
     if (res) {
-      emitter.emit("getjczqueryById",res);
+      emitter.emit("getjczqueryById", res);
       //   warningList.value.qxList =res.qxList&&res.qxList.length>0
       //     ? res.qxList.filter((item) => item.qxsl > 0)
       //     : [];
@@ -568,6 +480,7 @@ const changeJCZ = (val) => {
     align-items: center;
     margin-bottom: 20px;
   }
+
   .cntinfo {
     height: calc(100% - 70px);
     overflow: hidden;
@@ -575,12 +488,14 @@ const changeJCZ = (val) => {
     color: #000;
   }
 }
+
 .bblxItem {
   width: 100%;
   line-height: 40px;
   min-height: 40px;
   display: flex;
   color: #000;
+
   .btItem {
     width: 180px;
     padding: 7px 0;
@@ -588,17 +503,20 @@ const changeJCZ = (val) => {
     margin-top: 1px;
     text-align: center;
   }
+
   .info {
     flex: 1;
     background: #0000000a;
     margin-top: 1px;
     padding: 10px;
     box-sizing: border-box;
+
     .gapline {
       height: 1px;
       border-top: 1px dashed #66cbff;
       margin: 4px 0;
     }
+
     .dl-car {
       min-width: 200px;
       display: inline-block;
@@ -607,6 +525,7 @@ const changeJCZ = (val) => {
       padding: 0;
       border-radius: 5px;
       position: relative;
+
       dt {
         display: flex;
         justify-content: space-between;
@@ -621,12 +540,14 @@ const changeJCZ = (val) => {
         height: 30px;
         border-radius: 5px 5px 0 0;
       }
+
       .peo {
         border-bottom: solid 1px #01d608;
         background: #dbf3cf;
         color: #339d00;
       }
     }
+
     .dl-car::before {
       position: absolute;
       content: "";
@@ -637,6 +558,7 @@ const changeJCZ = (val) => {
       background: url("~@/assets/images/peo.png");
     }
   }
+
   .num {
     width: 50px;
     height: 30px;
@@ -647,6 +569,7 @@ const changeJCZ = (val) => {
     border-radius: 4px;
     margin-right: 10px;
   }
+
   .subBtn {
     padding-left: 100px;
     box-sizing: border-box;
@@ -656,9 +579,11 @@ const changeJCZ = (val) => {
 ::v-deep .el-form-item--default {
   margin-bottom: 0;
 }
+
 ::v-deep .el-form-item {
   margin-bottom: 10px;
 }
+
 ::v-deep .el-form--inline .el-form-item {
   margin-right: 20px;
   margin-top: 10px;
@@ -671,10 +596,12 @@ const changeJCZ = (val) => {
   color: #fff;
   cursor: pointer;
 }
+
 .box {
   margin-bottom: 10px;
 }
-::v-deep .el-form-item__label{
+
-padding: 0;
+::v-deep .el-form-item__label {
+  padding: 0;
 }
 </style>

vue.config.js

@@ -4,8 +4,8 @@ function resolve(dir) {
   return path.join(__dirname, dir);
 }
 
-const serverHost = "http://192.168.8.15:8006"
+const serverHost = "http://47.108.232.77:9537";
-// const serverHost = "http://192.168.1.32:8066"
+// const serverHost = "http://192.168.0.231:8006"
 // const serverHost = "http://127.0.0.1:8006"
 module.exports = {
   publicPath: "./",