4.0bug修改

.gitignore

@@ -12,12 +12,6 @@ build/linux-unpacked/
 build/win-unpacked/
 dist/electron/
 # Executables
-*.swf
-*.air
-*.ipa
-*.apk
-*.deb
-*.exe
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
 # information for Eclipse / Flash Builder.

build/builder-debug.yml

@@ -17,8 +17,8 @@ x64:
     - dist/electron/**/*
 nsis:
   script: |-
-    !include "G:\YUANJIE\4.0\node_modules\app-builder-lib\templates\nsis\include\StdUtils.nsh"
+    !include "E:\code\4.0\node_modules\app-builder-lib\templates\nsis\include\StdUtils.nsh"
-    !addincludedir "G:\YUANJIE\4.0\node_modules\app-builder-lib\templates\nsis\include"
+    !addincludedir "E:\code\4.0\node_modules\app-builder-lib\templates\nsis\include"
     !macro _isUpdated _a _b _t _f
       ${StdUtils.TestParameter} $R9 "updated"
       StrCmp "$R9" "true" `${_t}` `${_f}`
@@ -90,11 +90,11 @@ nsis:
       !insertmacro MUI_LANGUAGE "Vietnamese"
     !macroend
 
-    !addincludedir "G:\YUANJIE\4.0\build"
+    !addincludedir "E:\code\4.0\build"
-    !include "G:\YUANJIE\4.0\installer.nsh"
+    !include "E:\code\4.0\installer.nsh"
-    !addplugindir /x86-unicode "C:\Users\YC\AppData\Local\electron-builder\Cache\nsis\nsis-resources-3.4.1\plugins\x86-unicode"
+    !include "C:\Users\Administrator\AppData\Local\Temp\t-takdpJ\0-messages.nsh"
-    !include "C:\Users\YC\AppData\Local\Temp\t-BcnJuD\1-messages.nsh"
+    !include "C:\Users\Administrator\AppData\Local\Temp\t-takdpJ\1-messages.nsh"
-    !include "C:\Users\YC\AppData\Local\Temp\t-BcnJuD\0-messages.nsh"
+    !addplugindir /x86-unicode "C:\Users\Administrator\AppData\Local\electron-builder\Cache\nsis\nsis-resources-3.4.1\plugins\x86-unicode"
 
     Var newStartMenuLink
     Var oldStartMenuLink

build/builder-effective-config.yaml

@@ -12,8 +12,8 @@ extraFiles:
     to: ./ffplay
   - from: ./build/icons/
     to: ./icons
-productName: 便携式应急指挥电子沙盘系统
+productName: 实景三维电子沙盘系统
-appId: org.dzsp_yingjizhihui_offline_Y_save
+appId: org.dzsp_yingjizhihuijunyong_offline_Y_save
 files:
   - filter:
       - dist/electron/**/*
@@ -34,7 +34,7 @@ linux:
   target: deb
   icon: build/icons/81.png
   desktop:
-    Icon: /opt/便携式应急指挥电子沙盘系统/icons/81.png
+    Icon: /opt/实景三维电子沙盘系统/icons/81.png
   executableArgs:
     - '--no-sandbox'
 nsis:

config/app_config.js

@@ -1,7 +1,7 @@
-let name = 'dzsp_yingjizhihui_offline_Y_save'; //dzsp_yingjizhihuibeidou_offline_Y_save  //dzsp_shijingjiangjin_offline_Y_save // dzsp_shijinghaidong_offline_Y_save  //cc ，dzsp_yingjizhihuijunyong_offline_Y_save,dzsp_yingjizhihui_offline_Y_save,dzsp_shijing_offline_Y_save,dzsp_mudanyuan_offline_Y_save，'dzsp_wujingqinwu_offline_Y_save','dzsp_jilingongan_offline_Y_save'
+let name = 'dzsp_yingjizhihuijunyong_offline_Y_save'; //dzsp_yingjizhihuibeidou_offline_Y_save  //dzsp_shijingjiangjin_offline_Y_save // dzsp_shijinghaidong_offline_Y_save  //cc ，dzsp_yingjizhihuijunyong_offline_Y_save,dzsp_yingjizhihui_offline_Y_save,dzsp_shijing_offline_Y_save,dzsp_mudanyuan_offline_Y_save，'dzsp_wujingqinwu_offline_Y_save','dzsp_jilingongan_offline_Y_save'
-let productName = '便携式应急指挥电子沙盘系统'; //便携式应急指挥电子沙盘系统北斗定位+  //实景三维无人机智能巡检系统  // 海东市自然灾害风险普查可视化分析平台 //便携式应急指挥电子沙盘系统 //便携式应急指挥电子沙盘系统（军用版） //新版4.0//"实景三维电子沙盘系统";//"作战目标数字孪生仿真系统", "实景三维电子沙盘系统" ’牡丹园智慧景区管理系统‘，"武警勤务指挥电子沙盘系统”,"吉林省公安厅三维模型展示平台"
+let productName = '实景三维电子沙盘系统'; //便携式应急指挥电子沙盘系统北斗定位+  //实景三维无人机智能巡检系统  // 海东市自然灾害风险普查可视化分析平台 //便携式应急指挥电子沙盘系统 //便携式应急指挥电子沙盘系统（军用版） //新版4.0//"实景三维电子沙盘系统";//"作战目标数字孪生仿真系统", "实景三维电子沙盘系统" ’牡丹园智慧景区管理系统‘，"武警勤务指挥电子沙盘系统”,"吉林省公安厅三维模型展示平台"
-let productName_tw = '可擕式應急指揮電子沙盤系統';
+let productName_tw = '实景三维电子沙盘系统';
-let productName_en = 'Portable emergency command electronic sand table system';
+let productName_en = 'Realistic 3D electronic sand table system';
 let obj = {
   baseApi: "", // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
   PORT: 8099,

installer.nsh

@@ -1,9 +1,9 @@
 !macro preInit
     SetRegView 64
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihui_offline_Y_save"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihui_offline_Y_save"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
     #writeUninstaller $INSTDIR\uninstaller.exe
     SetRegView 32
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihui_offline_Y_save"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihui_offline_Y_save"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuijunyong_offline_Y_save"
 !macroend

package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "dzsp_yingjizhihuibeidou_offline_Y_save",
+  "name": "dzsp_yingjizhihui_offline_Y_save",
   "version": "v4.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "dzsp_yingjizhihuibeidou_offline_Y_save",
+      "name": "dzsp_yingjizhihui_offline_Y_save",
       "version": "v4.0.0",
       "hasInstallScript": true,
       "license": "MIT",

package.json

@@ -1 +1 @@
-{"name":"dzsp_yingjizhihui_offline_Y_save","version":"v4.0.0","author":{"email":"1114042468@qq.com","name":"1114042468@qq.com"},"maintainers":[],"license":"MIT","main":"./dist/electron/main.js","homepage":"./dist/electron/main.js","description":"","private":true,"scripts":{"dev":"cross-env TERGET_ENV=development node .electron-vue/dev-runner.js","build":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder","build:win32":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win  --ia32","build:win64":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win  --x64","build:linux64":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux  --x64","build:arm64":" cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux --arm64","build:mac":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --mac","build:dir":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --dir","build:clean":"cross-env BUILD_TARGET=clean node .electron-vue/build.js","build:web":"cross-env BUILD_TARGET=web node .electron-vue/build.js","pack":"npm run pack:main && npm run pack:renderer","pack:main":"cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js","pack:renderer":"cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js","update:serve":"node server/index.js","dep:upgrade":"yarn upgrade-interactive --latest","postinstall":"electron-builder install-app-deps"},"build":{"extraFiles":[{"from":"./collada2gltf/","to":"./collada2gltf"},{"from":"./convert/","to":"./convert"},{"from":"./yjearth4_0/","to":"./yjearth4_0"},{"from":"./ffplay/","to":"./ffplay"},{"from":"./build/icons/","to":"./icons"}],"productName":"便携式应急指挥电子沙盘系统","appId":"org.dzsp_yingjizhihui_offline_Y_save","directories":{"output":"build"},"files":["dist/electron/**/*"],"dmg":{"contents":[{"x":410,"y":150,"type":"link","path":"/Applications"},{"x":130,"y":150,"type":"file"}]},"mac":{"icon":"build/icons/icon.icns"},"win":{"icon":"build/icons/81.ico"},"linux":{"target":"deb","icon":"build/icons/81.png","desktop":{"Icon":"/opt/便携式应急指挥电子沙盘系统/icons/81.png"},"executableArgs":["--no-sandbox"]},"nsis":{"include":"installer.nsh","oneClick":false,"perMachine":true,"allowToChangeInstallationDirectory":true,"language":"2052"}},"dependencies":{"@amap/amap-jsapi-loader":"^1.0.1","@smallwei/avue":"^2.10.10","archiver":"^5.3.0","axios":"0.17.1","compressing":"^1.5.1","date-fns":"^3.6.0","electron-store":"^8.1.0","electron-wpc":"^2.0.1","element-ui":"^2.15.13","express":"^4.18.2","fbx2gltf":"^0.9.7-p1","file-saver":"^2.0.5","gltf-pipeline":"^4.1.0","ini":"^4.1.2","js-cookie":"^2.2.0","js-md5":"^0.7.3","jszip":"^3.10.1","log4js":"^6.9.1","moment":"^2.30.1","normalize.css":"7.0.0","nprogress":"0.2.0","obj2gltf":"^3.1.6","polyfill-object.fromentries":"^1.0.1","three":"^0.158.0","viewerjs":"^1.11.6","vue":"2.5.17","vue-electron":"^1.0.6","vue-i18n":"8.2.1","vue-router":"3.0.1","vuex":"^3.0.1","xlsx":"^0.18.5"},"devDependencies":{"@babel/core":"^7.24.7","@babel/preset-env":"^7.24.7","babel-core":"^6.25.0","babel-eslint":"^7.2.3","babel-loader":"^7.1.5","babel-plugin-transform-runtime":"^6.23.0","babel-preset-env":"^1.6.0","babel-preset-stage-0":"^6.24.1","babel-register":"^6.24.1","babili-webpack-plugin":"^0.1.2","cfonts":"^1.1.3","chalk":"^2.1.0","copy-webpack-plugin":"^4.0.1","cross-env":"^5.2.1","css-loader":"^0.28.4","del":"^3.0.0","devtron":"^1.4.0","electron":"^13.6.9","electron-builder":"^22.11.7","electron-debug":"^1.4.0","electron-devtools-installer":"^2.2.0","eslint":"^4.4.1","eslint-friendly-formatter":"^3.0.0","eslint-loader":"^1.9.0","eslint-plugin-html":"^3.1.1","extract-text-webpack-plugin":"^3.0.0","file-loader":"^0.11.2","html-webpack-plugin":"^2.30.1","multispinner":"^0.2.1","node-loader":"^0.6.0","sass":"^1.37.0","sass-loader":"^7.3.1","sass-resources-loader":"^2.2.4","style-loader":"^0.18.2","svg-sprite-loader":"3.5.2","url-loader":"^0.5.9","vue-html-loader":"^1.2.4","vue-loader":"^13.0.5","vue-style-loader":"^3.0.1","vue-template-compiler":"2.5.17","webpack":"^3.5.2","webpack-dev-server":"^2.7.1","webpack-hot-middleware":"^2.18.2"}}
+{"name":"dzsp_yingjizhihuijunyong_offline_Y_save","version":"v4.0.0","author":{"email":"1114042468@qq.com","name":"1114042468@qq.com"},"maintainers":[],"license":"MIT","main":"./dist/electron/main.js","homepage":"./dist/electron/main.js","description":"","private":true,"scripts":{"dev":"cross-env TERGET_ENV=development node .electron-vue/dev-runner.js","build":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder","build:win32":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win  --ia32","build:win64":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --win  --x64","build:linux64":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux  --x64","build:arm64":" cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --linux --arm64","build:mac":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --mac","build:dir":"cross-env BUILD_TARGET=clean node .electron-vue/build.js && node .electron-vue/build.js && electron-builder --dir","build:clean":"cross-env BUILD_TARGET=clean node .electron-vue/build.js","build:web":"cross-env BUILD_TARGET=web node .electron-vue/build.js","pack":"npm run pack:main && npm run pack:renderer","pack:main":"cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js","pack:renderer":"cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js","update:serve":"node server/index.js","dep:upgrade":"yarn upgrade-interactive --latest","postinstall":"electron-builder install-app-deps"},"build":{"extraFiles":[{"from":"./collada2gltf/","to":"./collada2gltf"},{"from":"./convert/","to":"./convert"},{"from":"./yjearth4_0/","to":"./yjearth4_0"},{"from":"./ffplay/","to":"./ffplay"},{"from":"./build/icons/","to":"./icons"}],"productName":"实景三维电子沙盘系统","appId":"org.dzsp_yingjizhihuijunyong_offline_Y_save","directories":{"output":"build"},"files":["dist/electron/**/*"],"dmg":{"contents":[{"x":410,"y":150,"type":"link","path":"/Applications"},{"x":130,"y":150,"type":"file"}]},"mac":{"icon":"build/icons/icon.icns"},"win":{"icon":"build/icons/81.ico"},"linux":{"target":"deb","icon":"build/icons/81.png","desktop":{"Icon":"/opt/实景三维电子沙盘系统/icons/81.png"},"executableArgs":["--no-sandbox"]},"nsis":{"include":"installer.nsh","oneClick":false,"perMachine":true,"allowToChangeInstallationDirectory":true,"language":"2052"}},"dependencies":{"@amap/amap-jsapi-loader":"^1.0.1","@smallwei/avue":"^2.10.10","archiver":"^5.3.0","axios":"0.17.1","compressing":"^1.5.1","date-fns":"^3.6.0","electron-store":"^8.1.0","electron-wpc":"^2.0.1","element-ui":"^2.15.13","express":"^4.18.2","fbx2gltf":"^0.9.7-p1","file-saver":"^2.0.5","gltf-pipeline":"^4.1.0","ini":"^4.1.2","js-cookie":"^2.2.0","js-md5":"^0.7.3","jszip":"^3.10.1","log4js":"^6.9.1","moment":"^2.30.1","normalize.css":"7.0.0","nprogress":"0.2.0","obj2gltf":"^3.1.6","polyfill-object.fromentries":"^1.0.1","three":"^0.158.0","viewerjs":"^1.11.6","vue":"2.5.17","vue-electron":"^1.0.6","vue-i18n":"8.2.1","vue-router":"3.0.1","vuex":"^3.0.1","xlsx":"^0.18.5"},"devDependencies":{"@babel/core":"^7.24.7","@babel/preset-env":"^7.24.7","babel-core":"^6.25.0","babel-eslint":"^7.2.3","babel-loader":"^7.1.5","babel-plugin-transform-runtime":"^6.23.0","babel-preset-env":"^1.6.0","babel-preset-stage-0":"^6.24.1","babel-register":"^6.24.1","babili-webpack-plugin":"^0.1.2","cfonts":"^1.1.3","chalk":"^2.1.0","copy-webpack-plugin":"^4.0.1","cross-env":"^5.2.1","css-loader":"^0.28.4","del":"^3.0.0","devtron":"^1.4.0","electron":"^13.6.9","electron-builder":"^22.11.7","electron-debug":"^1.4.0","electron-devtools-installer":"^2.2.0","eslint":"^4.4.1","eslint-friendly-formatter":"^3.0.0","eslint-loader":"^1.9.0","eslint-plugin-html":"^3.1.1","extract-text-webpack-plugin":"^3.0.0","file-loader":"^0.11.2","html-webpack-plugin":"^2.30.1","multispinner":"^0.2.1","node-loader":"^0.6.0","sass":"^1.37.0","sass-loader":"^7.3.1","sass-resources-loader":"^2.2.4","style-loader":"^0.18.2","svg-sprite-loader":"3.5.2","url-loader":"^0.5.9","vue-html-loader":"^1.2.4","vue-loader":"^13.0.5","vue-style-loader":"^3.0.1","vue-template-compiler":"2.5.17","webpack":"^3.5.2","webpack-dev-server":"^2.7.1","webpack-hot-middleware":"^2.18.2"}}

src/renderer/components/LeftMenu/secondMenuFun.js

@@ -995,10 +995,10 @@ const secondMenuFun = {
       //   this.$message.warning("请在图层指挥舱中选中对应图层添加");
       //   return;
       // }
-      $changeComponentShow(".modelBox", true);
+      $changeComponentShow(".modelBoxg", true);
-      $root_home_index.$refs.model.open("rightMenu");
+      $root_home_index.$refs.modelg.open("rightMenu");
-      this.$recvChanel("selectModel", (data) => {
+      this.$recvChanel("selectModelg", (data) => {
-        this.$changeComponentShow(".modelSelectBox", false);
+        this.$changeComponentShow(".modelBoxg", false);
         let url = data.model_id + ".glb";
         console.log("urlurlurlurlurlurl", url);
 
@@ -1189,12 +1189,16 @@ const secondMenuFun = {
         {},
         {
           clickSavePath: (data) => {
+            console.log(1232,data);
+            let is_show = data.repeat == "Infinity" ? true : false;
+            let source_name = data.name; 
             let source_id = this.$md5(new Date().getTime() + "漫游路径");
             let DbOption = {
               source_id,
-              source_name: "漫游路径",
+              source_name: source_name || "漫游路径",
               source_type: "roam",
               p_id: findParentId(this.treeObj),
+              is_show,
               detail: {
                 ...data,
               },

src/renderer/components/Tree/components/rightMenuOption.js

@@ -671,6 +671,7 @@ const rightMenuOption = {
 
               // 更新节点的勾选状态
               this.$parent.treeObj.checkNode(node, data, isShow);
+              
               // 触发check事件来更新数据库
               let source_ids = [node.source_id];
               if (isShow) {

src/renderer/components/myHeaderAll/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="header_top">
     <!-- <svg-icon icon-class="Head" :class-name="['headItem']"></svg-icon> -->
-    <img style="width:100%;" :src="require('@/assets/images/812/' + skinInfo + '/head.png')" alt="" />
+    <img style="width:100%;" :src="require('@/assets/images/shijingjun/' + skinInfo + '/head.png')" alt="" />
     <div class="dateTime">
       <span>{{ date.ymd }}</span>
       <span>{{ $t("headerTitles.week")[date.week] }}</span>

src/renderer/components/myHeaderAll/setTool/setTool.vue

@@ -51,14 +51,14 @@ export default {
       setList: [
         //北斗图标
         // 标准版本
-        {
+        // {
-          id: 0,
+        //   id: 0,
-          index: 0,
+        //   index: 0,
-          icon: "locate",
+        //   icon: "locate",
-          className: "header_public",
+        //   className: "header_public",
-          dbcallback: this.flyTo,
+        //   dbcallback: this.flyTo,
-          callback: this.locate,
+        //   callback: this.locate,
-        },
+        // },
         {
           id: 1,
           index: 1,

src/renderer/components/myHeaderAll/systemPopup/js/utilTools.js

@@ -373,6 +373,11 @@ export default {
       this.$prompt("请输入模型类型", "修改模型类型", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
+        inputValidator: (value) => {
+          // 验证规则：不能为空（不能是纯空白字符），其他内容都允许
+          return /.*\S+.*/.test(value);
+        },
+        inputErrorMessage: '请输入模型类型',
         inputValue: type_name,
       })
         .then(({ value }) => {
@@ -586,6 +591,11 @@ export default {
       this.$prompt("", "修改军标", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
+        inputValidator: (value) => {
+          // 验证规则：不能为空（不能是纯空白字符），其他内容都允许
+          return /.*\S+.*/.test(value);
+        },
+        inputErrorMessage: '内容不能为空',
         inputValue: row.name,
       })
         .then(({ value }) => {
@@ -1305,7 +1315,9 @@ export default {
       add_default({}, (res) => {
         if (res == null) {
           this.$message.success("添加完成,2秒后，将重启系统");
+
           setTimeout(() => {
+            window.clicknum = 0;
             this.$sendElectronChanel("restart");
           }, 2000);
         }

src/renderer/views/dashboard/index.vue

@@ -79,7 +79,7 @@
       <!-- <img src="@/assets/images/81.gif" /> -->
       <!-- <img src="@/assets/images/rotation.gif" /> -->
       <!--      <img src="@/assets/images/地球.gif" />-->
-      <img :src="require('@/assets/images/812/' + skinInfo + '/logo.png')" alt="" />
+      <img :src="require('@/assets/images/shijingjun/' + skinInfo + '/logo.png')" alt="" />
       <!--      <img src="@/assets/images/3c60ff3cd2d9e0547ada43a58fa60c3.png">-->
       <!--      <img src="@/assets/images/aaaaaa.webp">-->
       <!--      <button v-for="item in optionss" @click="addMarker(item)">{{ item.source_name }}</button>-->

src/renderer/views/login/index.vue

@@ -252,7 +252,7 @@ export default {
       selectedService: "接口服务",
       serviceOptions: [
         { name: "接口服务" },
-        { name: "北斗串口" }
+        // { name: "北斗串口" }
       ],
       servVal: "单机",
       gpsVal: "",

static/sdk/3rdparty/ewPlugins.min.js

@@ -810,6 +810,7 @@
             else
                 this.init(o, this.config)
         }
+        this.changeColor = g
         this.close = () => {
           this.pickerFlag = !this.pickerFlag,
           this.picker.style.opacity = 0
@@ -827,39 +828,83 @@
         this.uid = uid
         _this.box.setAttribute("color-box-id", uid)
         function clickEvent(event) {
-          if(!document.contains(_this.box)) {
+            console.log('------------')
-              document.removeEventListener('click', clickEvent);
+          
-          }
-          // 检查点击事件是否发生在核心元素或其子元素之外
-          let boxNode
-          function recursion(node) {
-              if(!node.parentNode) {
-                  boxNode = node
-              }
-              else {
-                  if(node.getAttribute("color-box-id") === uid) {
-                      boxNode = node
-                  }
-                  else {
-                      recursion(node.parentNode)
-                  }
-              }
-          }
-          recursion(event.target)
-          if(!boxNode) {
-              if(_this.pickerFlag) {
-                  _this.close()
-              }
-          }
-          else {
-              if (!boxNode.getAttribute || boxNode.getAttribute("color-box-id") !== uid) {
-                  if(_this.pickerFlag) {
-                      _this.close()
-                  }
-              }
-          }
         }
-        document.addEventListener('click', clickEvent);
+        let mousedownEln
+        let mouseupEln
+        let flag = false
+        function mousedownEvent(event) {
+            flag = false
+            if(!document.contains(_this.box)) {
+                document.removeEventListener('mousedown', mousedownEvent);
+            }
+            // 检查点击事件是否发生在核心元素或其子元素之外
+            let boxNode
+            function recursion(node) {
+                if(!node.parentNode) {
+                    boxNode = node
+                }
+                else {
+                    if(node.getAttribute("color-box-id") === uid) {
+                        boxNode = node
+                    }
+                    else {
+                        recursion(node.parentNode)
+                    }
+                }
+            }
+            recursion(event.target)
+            if(!boxNode) {
+                if(_this.pickerFlag) {
+                    flag = true
+                }
+            }
+            else {
+                if (!boxNode.getAttribute || boxNode.getAttribute("color-box-id") !== uid) {
+                    if(_this.pickerFlag) {
+                        flag = true
+                    }
+                }
+            }
+        }
+        function mouseupEvent(event) {
+            if(!document.contains(_this.box)) {
+                document.removeEventListener('mouseup', mouseupEvent);
+            }
+            // 检查点击事件是否发生在核心元素或其子元素之外
+            let boxNode
+            function recursion(node) {
+                if(!node.parentNode) {
+                    boxNode = node
+                }
+                else {
+                    if(node.getAttribute("color-box-id") === uid) {
+                        boxNode = node
+                    }
+                    else {
+                        recursion(node.parentNode)
+                    }
+                }
+            }
+            recursion(event.target)
+            if(!boxNode) {
+                if(_this.pickerFlag && flag) {
+                    _this.close()
+                }
+            }
+            else {
+                if (!boxNode.getAttribute || boxNode.getAttribute("color-box-id") !== uid) {
+                    if(_this.pickerFlag && flag) {
+                        _this.close()
+                    }
+                }
+            }
+            flag = false
+        }
+        // document.addEventListener('click', clickEvent);
+        document.addEventListener('mousedown', mousedownEvent);
+        document.addEventListener('mouseup', mouseupEvent);
         return this
     }
     function h(e) {

yjearth4_0/static/log/2025-08-27.log

@@ -1,4 +0,0 @@
-2025-08-27 00:15:42.888 [INFO] {24b260d9475d5f1867330d7f0cd9bef1} gps.go:101: 查询串口数据
-2025-08-27 00:15:42.889 [INFO] {80209fda475d5f1868330d7fcadeefb7} gps.go:105: 没有查询到串口数据
-2025-08-27 18:36:00.802 [INFO] {fc09d6d852995f18d3e2fb476b15e7cb} gps.go:101: 查询串口数据
-2025-08-27 18:36:00.803 [INFO] {c846f0d852995f18d4e2fb47be7f14e9} gps.go:105: 没有查询到串口数据

yjearth4_0/static/log/2025-08-28.log

@@ -1,4 +0,0 @@
-2025-08-28 14:28:39.651 [INFO] {346464ee67da5f18feb2560d2f11e5e9} gps.go:101: 查询串口数据
-2025-08-28 14:28:39.652 [INFO] {3c6dabf067da5f18ffb2560d5df92233} gps.go:105: 没有查询到串口数据
-2025-08-28 14:36:04.102 [INFO] {3c7be76bcfda5f188e27a77ae33fd23d} gps.go:101: 查询串口数据
-2025-08-28 14:36:04.103 [INFO] {d8570a6ccfda5f188f27a77ae1cba623} gps.go:105: 没有查询到串口数据

yjearth4_0/static/log/2025-09-10.log

@@ -0,0 +1,38 @@
+2025-09-10 16:03:05.064 [INFO] {00301e661add6318be7aba7bf92573b6} gps.go:101: 查询串口数据
+2025-09-10 16:03:05.065 [INFO] {ece69d661add6318bf7aba7bd69abf9d} gps.go:105: 没有查询到串口数据
+2025-09-10 16:17:31.785 [INFO] {24242833e4dd6318c4a6d14674adaa07} gps.go:101: 查询串口数据
+2025-09-10 16:17:31.786 [INFO] {a0d93733e4dd6318c5a6d14643a73e33} gps.go:105: 没有查询到串口数据
+2025-09-10 16:17:52.860 [INFO] {fc7d4f1be9dd6318dce78f408aa2b37b} gps.go:101: 查询串口数据
+2025-09-10 16:17:52.860 [INFO] {38fb5e1be9dd6318dde78f40f180930a} gps.go:105: 没有查询到串口数据
+2025-09-10 16:18:54.859 [INFO] {249dc18af7dd6318f1b1442933159314} gps.go:101: 查询串口数据
+2025-09-10 16:18:54.860 [INFO] {b0e3d08af7dd6318f2b14429bc861e39} gps.go:105: 没有查询到串口数据
+2025-09-10 16:27:39.065 [INFO] {4cddd69771de631894f5f040d56f4f3f} gps.go:101: 查询串口数据
+2025-09-10 16:27:39.065 [INFO] {48b8e69771de631895f5f0403b72e080} gps.go:105: 没有查询到串口数据
+2025-09-10 16:27:59.119 [INFO] {24fa2c4376de63189c8c66452682ed19} gps.go:101: 查询串口数据
+2025-09-10 16:27:59.120 [INFO] {fc8f3c4376de63189d8c664569c952f9} gps.go:105: 没有查询到串口数据
+2025-09-10 16:29:16.443 [INFO] {1c41034488de6318f3c4b92c98996710} gps.go:101: 查询串口数据
+2025-09-10 16:29:16.443 [INFO] {9c38134488de6318f4c4b92c96e7c214} gps.go:105: 没有查询到串口数据
+2025-09-10 16:29:34.715 [INFO] {b40d1d858cde631838c74f7f978f29f7} gps.go:101: 查询串口数据
+2025-09-10 16:29:34.715 [INFO] {30c32c858cde631839c74f7fd0d3be12} gps.go:105: 没有查询到串口数据
+2025-09-10 17:04:57.371 [INFO] {7cac42bd7ae06318fae5f31eed0febee} gps.go:101: 查询串口数据
+2025-09-10 17:04:57.374 [INFO] {687079bd7ae06318fbe5f31eeb446eb4} gps.go:105: 没有查询到串口数据
+2025-09-10 17:19:35.681 [INFO] {5073a13c47e163183861036fd8e2bc49} gps.go:101: 查询串口数据
+2025-09-10 17:19:35.681 [INFO] {c0a7b13c47e163183961036f141ea175} gps.go:105: 没有查询到串口数据
+2025-09-10 17:19:55.338 [INFO] {384243d04be163189c87271285a4578f} gps.go:101: 查询串口数据
+2025-09-10 17:19:55.338 [INFO] {743654d04be163189d872712d64845c4} gps.go:105: 没有查询到串口数据
+2025-09-10 17:24:30.461 [INFO] {d026ebde8be16318db498027da65f86f} gps.go:101: 查询串口数据
+2025-09-10 17:24:30.462 [INFO] {eca0fade8be16318dc4980276e319b38} gps.go:105: 没有查询到串口数据
+2025-09-10 17:24:33.087 [INFO] {041f687b8ce16318591f1d61eaf5e513} gps.go:101: 查询串口数据
+2025-09-10 17:24:33.087 [INFO] {9ce0777b8ce163185a1f1d61a6b1829c} gps.go:105: 没有查询到串口数据
+2025-09-10 17:24:39.874 [INFO] {fc0afd0f8ee1631891ce2279df05710e} gps.go:101: 查询串口数据
+2025-09-10 17:24:39.875 [INFO] {6ca90c108ee1631892ce2279fd539919} gps.go:105: 没有查询到串口数据
+2025-09-10 17:25:03.469 [INFO] {60a54d8e93e16318ed8377527064bea0} gps.go:101: 查询串口数据
+2025-09-10 17:25:03.469 [INFO] {94665d8e93e16318ee83775224b44330} gps.go:105: 没有查询到串口数据
+2025-09-10 17:25:11.351 [INFO] {8467216495e16318a20b385810bed8a5} gps.go:101: 查询串口数据
+2025-09-10 17:25:11.351 [INFO] {e000316495e16318a30b3858d98b0f7c} gps.go:105: 没有查询到串口数据
+2025-09-10 17:25:29.235 [INFO] {6cac168e99e16318e0c463342e32d9f3} gps.go:101: 查询串口数据
+2025-09-10 17:25:29.235 [INFO] {d443268e99e16318e1c4633486625925} gps.go:105: 没有查询到串口数据
+2025-09-10 17:25:31.735 [INFO] {a022fa229ae163184b1df23de31aff4f} gps.go:101: 查询串口数据
+2025-09-10 17:25:31.736 [INFO] {049b31239ae163184c1df23d851e3075} gps.go:105: 没有查询到串口数据
+2025-09-10 17:35:37.790 [INFO] {f05cd03e27e263183cbe794f62b35b2e} gps.go:101: 查询串口数据
+2025-09-10 17:35:37.791 [INFO] {54fddf3e27e263183dbe794f3b690050} gps.go:105: 没有查询到串口数据