优化

src/components/Map/editMap.vue

@@ -134,7 +134,7 @@ const setDataList = (data) => {
 
 const initMap = () => {
     window._AMapSecurityConfig = {
-        securityJsCode: '8e920f73eb2e6880a92ea6662eefc476',
+        securityJsCode: 'e584dd2f7e1828096d0841b425231692',
     }
     AMapLoader.load({
         key: "88d0fc14bcd5921a4e5a09ef1a3ab31a", // 申请好的Web端开发者Key，首次调用 load 时必填

src/components/Map/index.vue

@@ -98,7 +98,7 @@
 
     const initMap = () => {
         window._AMapSecurityConfig = {
-            securityJsCode: '8e920f73eb2e6880a92ea6662eefc476',
+            securityJsCode: 'e584dd2f7e1828096d0841b425231692',
         }
         AMapLoader.load({
             key: "88d0fc14bcd5921a4e5a09ef1a3ab31a", // 申请好的Web端开发者Key，首次调用 load 时必填

src/components/Map/map.vue

@@ -96,10 +96,10 @@ const setDataList = (data) => {
 
 const initMap = () => {
     window._AMapSecurityConfig = {
-        securityJsCode: 'b16e0ff6d065a3b8a87e6c448e982ca4',
+        securityJsCode: 'e584dd2f7e1828096d0841b425231692',
     }
     AMapLoader.load({
-        key: "c60c1af6d4f39c5220f3ad36298a8830", // 申请好的Web端开发者Key，首次调用 load 时必填
+        key: "88d0fc14bcd5921a4e5a09ef1a3ab31a", // 申请好的Web端开发者Key，首次调用 load 时必填
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         // plugins:[''], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
     }).then((AMap) => {

src/components/Map/videoMap.vue

@@ -110,10 +110,10 @@
 
     const initMap = () => {
         window._AMapSecurityConfig = {
-            securityJsCode: 'b16e0ff6d065a3b8a87e6c448e982ca4',
+            securityJsCode: 'e584dd2f7e1828096d0841b425231692',
         }
         AMapLoader.load({
-            key: "c60c1af6d4f39c5220f3ad36298a8830", // 申请好的Web端开发者Key，首次调用 load 时必填
+            key: "88d0fc14bcd5921a4e5a09ef1a3ab31a", // 申请好的Web端开发者Key，首次调用 load 时必填
             version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
             // plugins:[''], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
         }).then(async (AMap) => {

src/views/statics/index.vue

@@ -6,17 +6,14 @@
         <div class="card-header">
           <div style="display: flex; flex-direction: row">
             <div style="width: 4px; height: 19px; opacity: 1; background: #409eff"></div>
-            <span
-              style="
+            <span style="
                 font-family: PingFang SC;
                 font-size: 14px;
                 font-weight: normal;
                 line-height: 19px;
                 height: 19px;
                 margin-left: 5px;
-              "
-              >车辆列表</span
-            >
+              ">车辆列表</span>
           </div>
         </div>
         <div style="margin-top: 20px; padding-left: 10px">
@@ -29,30 +26,16 @@
             placeholder="请选择归属部门"
             check-strictly
           /> -->
-          <el-input
-            style="margin-top: 10px"
-            v-model="filterText"
-            placeholder="输入关键字"
-          />
+          <el-input style="margin-top: 10px" v-model="filterText" placeholder="输入关键字" />
           <div style="max-height: 80vh; overflow-y: scroll">
-            <lay-tree
-              :data="data"
-              ref="treeRef"
-              :tail-node-icon="false"
-              :onlyIconControl="true"
-              :default-expand-all="true"
-              v-model:selectedKey="keys"
-              :searchNodeMethod="filterNode"
-              @node-click="treeclick"
-            >
+            <lay-tree :data="data" ref="treeRef" :tail-node-icon="false" :onlyIconControl="true"
+              :default-expand-all="true" v-model:selectedKey="keys" :searchNodeMethod="filterNode"
+              @node-click="treeclick">
               <template #title="{ data }">
                 <div>
                   <span>{{ data.title }}</span>
-                  <el-tag
-                    v-if="data.time != undefined"
-                    style="margin-left: 20px"
-                    :type="data.time == '在线' ? 'success' : 'danger'"
-                  >
+                  <el-tag v-if="data.time != undefined" style="margin-left: 20px"
+                    :type="data.time == '在线' ? 'success' : 'danger'">
                     {{ data.time }}
                   </el-tag>
                 </div>
@@ -98,27 +81,24 @@
         <div class="card-header">
           <div style="display: flex; flex-direction: row; position: relative">
             <div style="width: 4px; height: 19px; opacity: 1; background: #409eff"></div>
-            <span
-              style="
+            <span style="
                 font-family: PingFang SC;
                 font-size: 14px;
                 font-weight: normal;
                 line-height: 19px;
                 height: 19px;
                 margin-left: 5px;
-              "
-              >车辆视频</span
-            >
+              ">车辆视频</span>
             <span style="margin-left: 30px; font-size: 14px">{{
               currentdata?.label
-            }}</span>
+              }}</span>
             <div style="margin-top: 20px"></div>
           </div>
         </div>
-        <ArrowRightBold v-if="videoList.length > 1 && videoIndex == 0" style="width: 20px; height: 20px; margin-left: 800px"
-          @click="playVideo(1)"></ArrowRightBold>
-        <ArrowLeftBold v-if="videoList.length > 1  && videoIndex == 1" style="width: 20px; height: 20px; margin-left: 800px"
-          @click="playVideo(0)"></ArrowLeftBold>
+        <ArrowRightBold v-if="videoList.length > 1 && videoIndex == 0"
+          style="width: 20px; height: 20px; margin-left: 800px" @click="playVideo(1)"></ArrowRightBold>
+        <ArrowLeftBold v-if="videoList.length > 1  && videoIndex == 1"
+          style="width: 20px; height: 20px; margin-left: 800px" @click="playVideo(0)"></ArrowLeftBold>
         <div id="container" style="margin-top: 20px; width: 100%; height: 80vh"></div>
       </div>
     </div>
@@ -126,137 +106,139 @@
 </template>
 
 <script setup>
-import { listCarInfo } from "@/api/carInfo";
-import moment from "moment";
-import api from "@/api/system/user";
+  import { listCarInfo } from "@/api/carInfo";
+  import moment from "moment";
+  import api from "@/api/system/user";
 
-const carlist = ref([]);
-const carData = ref([]);
+  const carlist = ref([]);
+  const carData = ref([]);
 
-const showTree = ref(true);
+  const showTree = ref(true);
 
-const filterText = ref("");
-const treeRef = ref(null);
+  const filterText = ref("");
+  const treeRef = ref(null);
 
-const deptOptions = ref([]);
+  const deptOptions = ref([]);
 
-const deptId = ref([]);
-const keys = ref();
-const videoList = ref([]);
-const videoIndex =ref(0)
+  const deptId = ref([]);
+  const keys = ref();
+  const videoList = ref([]);
+  const videoIndex = ref(0)
 
-const gettreeheight = () => {
-  return document.body.clientHeight - 300;
-};
+  const gettreeheight = () => {
+    return document.body.clientHeight - 300;
+  };
 
-const getTreeSelect = async () => {
-  const res = await api.deptTreeSelect();
-  console.log(res);
-  deptOptions.value = res.data;
-};
+  const getTreeSelect = async () => {
+    const res = await api.deptTreeSelect();
+    deptOptions.value = res.data;
+    console.log(deptOptions.value)
+  };
 
-const initData = async () => {
-  getTreeSelect();
-  listCarInfo({ pageSize: 1000000 }).then((res) => {
-    carData.value = carlist.value = res.rows.filter((i) => {
-      var hsin = false;
-      if (i.deviceInfos) {
-        JSON.parse(i.deviceInfos).forEach((item) => {
-          if (item.type == "camera") {
-            hsin = true;
-            return true;
-          }
-        });
+  const initData = async () => {
+    getTreeSelect();
+    listCarInfo({ pageSize: 1000000 }).then((res) => {
+      carData.value = carlist.value = res.rows.filter((i) => {
+        var hsin = false;
+        if (i.deviceInfos) {
+          JSON.parse(i.deviceInfos).forEach((item) => {
+            if (item.type == "camera") {
+              hsin = true;
+              return true;
+            }
+          });
+        }
+        return hsin;
+      });
+
+      var keyp = [100];
+      var index = 0;
+      var all = 0;
+      var zx = 0;
+      var depts = [];
+      if (deptOptions.value[0].children == undefined) {
+        depts = deptOptions.value;
+      } else {
+        depts = deptOptions.value[0].children;
       }
-      return hsin;
-    });
+      depts.forEach((p) => {
+        console.log(p.id)
+        console.log( carlist.value
+            .filter((i) => JSON.parse(i.ext1).deptId == p.id))
+        p["children"] = (p.children ?? []).concat(
+          carlist.value
+            .filter((i) => JSON.parse(i.ext1).deptId == p.id)
+            .map((i) => {
+              keyp.push(p.id);
+              let ll =
+                i.lastCountTime == null
+                  ? "离线"
+                  : moment().unix() - moment(i.lastCountTime).unix() > 60 * 5
+                    ? "离线"
+                    : "在线";
+              if (ll == "在线") {
+                zx++;
+              }
+              all++;
+              return {
+                id: `car_${++index}`,
+                title: i.carNum,
+                deviceInfos: i.deviceInfos,
+                time: ll,
+              };
+            })
+        );
+        p["title"] =
+          p.label +
+          ` [ ${p["children"].filter((i) => i.time && i.time.indexOf("在线") != -1).length}/${p["children"].length
+          }]`;
+      });
+      deptOptions.value[0]["title"] = deptOptions.value[0]["label"] + ` [ ${zx}/${all}]`;
+      data.value = deptOptions.value;
+      keys.value = keyp;
+      setTimeout(() => {
+        // treeRef.value.setExpandedKeys(keys.value);
+      }, 10000);
 
-    var keyp = [100];
-    var index = 0;
-    var all = 0;
-    var zx = 0;
-    var depts = [];
-    if (deptOptions.value[0].children == undefined) {
-      depts = deptOptions.value;
-    } else {
-      depts = deptOptions.value[0].children;
-    }
-    depts.forEach((p) => {
-      p["children"] = (p.children ?? []).concat(
-        carlist.value
-          .filter((i) => JSON.parse(i.ext1).deptId == p.id)
-          .map((i) => {
-            keyp.push(p.id);
-            let ll =
-              i.lastCountTime == null
-                ? "离线"
-                : moment().unix() - moment(i.lastCountTime).unix() > 60 * 5
-                ? "离线"
-                : "在线";
-            if (ll == "在线") {
-              zx++;
-            }
-            all++;
-            return {
-              id: `car_${++index}`,
-              title: i.carNum,
-              deviceInfos: i.deviceInfos,
-              time: ll,
-            };
-          })
-      );
-      p["title"] =
-        p.label +
-        ` [ ${p["children"].filter((i) => i.time.indexOf("在线") != -1).length}/${
-          p["children"].length
-        }]`;
+      // carlist.value = res.rows.filter(i => {
+      //   var hsin = false;
+      //   if (i.deviceInfos) {
+      //     JSON.parse(i.deviceInfos).forEach(item => {
+      //       if (item.type == "camera") {
+      //         hsin = true;
+      //         return true;
+      //       }
+      //     })
+      //   }
+      //   return hsin
+
+      // });
     });
-    deptOptions.value[0]["title"] = deptOptions.value[0]["label"] + ` [ ${zx}/${all}]`;
-    data.value = deptOptions.value;
-    keys.value = keyp;
-    setTimeout(() => {
-      treeRef.value.setExpandedKeys(keys.value);
-    }, 10000);
+  };
 
-    // carlist.value = res.rows.filter(i => {
-    //   var hsin = false;
-    //   if (i.deviceInfos) {
-    //     JSON.parse(i.deviceInfos).forEach(item => {
-    //       if (item.type == "camera") {
-    //         hsin = true;
-    //         return true;
-    //       }
-    //     })
-    //   }
-    //   return hsin
+  const defaultProps = {
+    children: "children",
+    label: "label",
+    value: "id",
+  };
+  const treeIndent = ref(40);
 
-    // });
+  watch(filterText, (val) => {
+    if (treeRef.value) {
+      treeRef.value.filter(val);
+    }
   });
-};
-
-const defaultProps = {
-  children: "children",
-  label: "label",
-  value: "id",
-};
-const treeIndent = ref(40);
 
-watch(filterText, (val) => {
-  if (treeRef.value) {
-    treeRef.value.filter(val);
-  }
-});
+  const currenturl = ref("");
 
-const currenturl = ref("");
-
-const filterNode = (node, value) => {
-  if (node.id == 1) return true;
-  return node.title.indexOf(value) != -1;
-};
+  const filterNode = (node, value) => {
+    if (node.id == 1) return true;
+    return node.title.indexOf(value) != -1;
+  };
 
-const currentdata = ref(null);
+  const currentdata = ref(null);
 
-const treeclick = (data, node) => {
+  const treeclick = (data, node) => {
     videoList.value = []
     if (data.deviceInfos) {
       // JSON.parse(data.deviceInfos).forEach((item) => {
@@ -285,57 +267,57 @@ const treeclick = (data, node) => {
   }
 
 
-const data = ref([]);
-var jessibuca = null;
-onMounted(() => {
-  initData();
-  // getTreeSelect();
-  var $container = document.getElementById("container");
-  jessibuca = new Jessibuca({
-    container: $container,
-    videoBuffer: 0.2, // 缓存时长
-    isResize: false,
-    text: "",
-    decoder: "/jess/decoder.js",
-    loadingText: "",
-    useMSE: false,
-    debug: true,
-    showBandwidth: true, // 显示网速
-    operateBtns: {
-      fullscreen: true,
-      screenshot: false,
-      play: true,
-      audio: false,
-      recorder: false,
-    },
-    forceNoOffscreen: true,
-    isNotMute: false,
+  const data = ref([]);
+  var jessibuca = null;
+  onMounted(() => {
+    initData();
+    // getTreeSelect();
+    var $container = document.getElementById("container");
+    jessibuca = new Jessibuca({
+      container: $container,
+      videoBuffer: 0.2, // 缓存时长
+      isResize: false,
+      text: "",
+      decoder: "/jess/decoder.js",
+      loadingText: "",
+      useMSE: false,
+      debug: true,
+      showBandwidth: true, // 显示网速
+      operateBtns: {
+        fullscreen: true,
+        screenshot: false,
+        play: true,
+        audio: false,
+        recorder: false,
+      },
+      forceNoOffscreen: true,
+      isNotMute: false,
+    });
+    // if (treeRef.value) {
+    //   setTimeout(() => {
+    //     treeRef.value.expandNode(treeRef.value.getNode(1))
+    //   }, 100);
+    //   getSites();
+    //   initData();
+    //   // treeRef.value.expandNode(treeRef.value.getNode(1))
+    // }
   });
-  // if (treeRef.value) {
-  //   setTimeout(() => {
-  //     treeRef.value.expandNode(treeRef.value.getNode(1))
-  //   }, 100);
-  //   getSites();
-  //   initData();
-  //   // treeRef.value.expandNode(treeRef.value.getNode(1))
-  // }
-});
 </script>
 
 <style lang="scss" scoped>
-#container {
-  background: rgba(13, 14, 27, 0.7);
-  width: 50vw;
-  height: 398px;
-}
+  #container {
+    background: rgba(13, 14, 27, 0.7);
+    width: 50vw;
+    height: 398px;
+  }
 
-.card-header {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
+  .card-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
 
-.boxunused {
-  background: #3333332d;
-}
-</style>
+  .boxunused {
+    background: #3333332d;
+  }
+</style>

src/views/statics/passengerFlow.vue

@@ -29,6 +29,7 @@
                     <el-select
                       v-model="queryParams.carNum"
                       placeholder="请选择车辆"
+                      filterable 
                       style="width: 120px"
                     >
                       <el-option

src/views/system/expressStatics/index.vue

@@ -52,6 +52,7 @@
         <!-- <el-table-column label="" align="center" prop="id" v-if="true" /> -->
         <el-table-column label="用户" align="center" prop="userId">
           <template #default="scope">
+            <span>{{ scope.row }}</span>
             <span>{{ getUserName(scope.row) }}</span>
           </template>
         </el-table-column>
@@ -219,8 +220,8 @@ const getList = async () => {
 
 const getUserList = async () => {
   const res = await api.listUser(userParams.value);
-  console.log(res);
   userList.value = res.rows;
+  console.log(userList.value)
   getList();
 };
 

src/views/upbag/index.vue

@@ -97,7 +97,7 @@
     </el-card>
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="bagFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="bagFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="快递柜编号" prop="deviceId">
            <el-select v-model="form.deviceId" placeholder="请选择快递柜编号">
             <el-option v-for="item in Object.values(sitelist)" :key="item.deviceId" :label="item.dictLabel" :value="item.deviceId" />

src/views/yunying/videoKdg/index.vue

@@ -78,7 +78,7 @@
                     </div>
                 </div>
                 <div class="example-pagination-block" v-if="total > 0">
-                    <el-pagination layout="prev, pager, next" :total="total" :current-page="CurrentPage"
+                    <el-pagination layout="prev, pager, next" :total="total" :current-page="CurrentPage" :page-size="9"
                         @current-change="pageChange" />
                 </div>
             </div>
@@ -214,6 +214,7 @@
     const videoInit = (data, node) => {
         console.log(data)
         var siteList = data.data.sites.split(",")
+        console.log(siteList)
         var deviceList = [];
         siteListArry.value = [];
         console.log(sites.value)
@@ -236,6 +237,7 @@
             }
         }
         deviceData.value = deviceList
+        console.log(deviceList)
         total.value = deviceList.length
         CurrentPage.value = 1
         const videoList = []