From cd672e57adbc5e5fa1d3081c6f2e960ed54897df Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 16 Sep 2024 11:59:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=A4=AE?=
=?UTF-8?q?=E8=A7=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 5 +++--
.env.production | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.env.development b/.env.development
index 54f5fa3..66522f9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
-VITE_API_URL = 'http://192.168.34.155:6677'
-# VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677'
+# VITE_API_URL = 'http://192.168.34.155:6677'
+VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677'
+# VITE_API_URL = "http://jxjzw.zhgdyun.com:6678"
VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://182.90.224.147:6688"
diff --git a/.env.production b/.env.production
index 2ab1c0c..a29a3c5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,7 +3,8 @@ NODE_ENV = "production"
# 线上环境接口地址(easymock)
# VITE_API_URL = "http://139.9.66.234:6688"
-VITE_API_URL = "http://jxjzw.zhgdyun.com:6677"
+# VITE_API_URL = "http://jxjzw.zhgdyun.com:6677"
+VITE_API_URL = "http://jxjzw.zhgdyun.com:6678"
# VITE_API_URL = "http://182.90.224.147:9012"
# VITE_API_URL = "http://47.104.132.250:9000"
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
From e4aaad2f78e1f6aaec5b61159b03277396401d9e Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 16 Sep 2024 12:00:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.husky/commit-msg | 4 -
.vscode/extensions.json | 14 --
.vscode/settings.json | 132 -----------
src/views/goverment/largeScreen/index.vue | 263 +++++++++++-----------
4 files changed, 135 insertions(+), 278 deletions(-)
delete mode 100644 .husky/commit-msg
delete mode 100644 .vscode/extensions.json
delete mode 100644 .vscode/settings.json
diff --git a/.husky/commit-msg b/.husky/commit-msg
deleted file mode 100644
index 1a089f4..0000000
--- a/.husky/commit-msg
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit $1
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index 0675eb8..0000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "recommendations": [
- "vue.volar",
- "vue.vscode-typescript-vue-plugin",
- "hollowtree.vue-snippets",
- "dbaeumer.vscode-eslint",
- "stylelint.vscode-stylelint",
- "esbenp.prettier-vscode",
- "editorconfig.editorconfig",
- "streetsidesoftware.code-spell-checker",
- "syler.sass-indented",
- "mikestead.dotenv"
- ]
-}
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 6f43eb9..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "editor.formatOnSave": true,
- "stylelint.enable": true,
- "editor.codeActionsOnSave": {
- "source.fixAll.stylelint": "explicit"
- },
- "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass", "html"],
- "files.eol": "\n",
- "[vue]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[typescript]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[json]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[jsonc]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[javascript]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[typescriptreact]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[scss]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[html]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[markdown]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "[less]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
- "cSpell.words": [
- "acroutes",
- "adcode",
- "Alipay",
- "AMAP",
- "Anglar",
- "antd",
- "apng",
- "Biao",
- "bottomleft",
- "bottomright",
- "breakline",
- "browserslist",
- "cascader",
- "cnpm",
- "commitize",
- "commitlint",
- "contentleft",
- "contentright",
- "CSDN",
- "curveness",
- "daterange",
- "datetimerange",
- "doclock",
- "dragover",
- "easymock",
- "echarts",
- "esbuild",
- "fangda",
- "fastmock",
- "Geeker",
- "Gitee",
- "glgview",
- "hexs",
- "iconfont",
- "Jheng",
- "juejin",
- "liquidfill",
- "liutao",
- "loglevel",
- "longpress",
- "malefemale",
- "Mapchart",
- "nprogress",
- "officedocument",
- "openxmlformats",
- "pageable",
- "Parens",
- "persistedstate",
- "Pinia",
- "pjpeg",
- "Prefixs",
- "protable",
- "singleline",
- "sortablejs",
- "sousuo",
- "spreadsheetml",
- "styl",
- "stylelint",
- "stylelintignore",
- "stylelintrc",
- "suoxiao",
- "sysmbol",
- "timerange",
- "topleft",
- "topright",
- "truetype",
- "Uncapitalize",
- "unplugin",
- "unref",
- "vite",
- "vuedraggable",
- "vueuse",
- "Vuex",
- "wangeditor",
- "Wechat",
- "xianxingdaoyu",
- "xianxingdiqiu",
- "xianxingditu",
- "xianxingfanchuan",
- "xianxingfeiji",
- "xianxinglvhangriji",
- "xianxingtianqiyubao",
- "xianxingxiangjipaizhao",
- "xianxingxiarilengyin",
- "xianxingyoulun",
- "xianxingzijiayou",
- "xiaoxi",
- "yxxx",
- "zhongyingwen",
- "zhuti",
- "zlevel"
- ]
-}
diff --git a/src/views/goverment/largeScreen/index.vue b/src/views/goverment/largeScreen/index.vue
index e893997..40ecce8 100644
--- a/src/views/goverment/largeScreen/index.vue
+++ b/src/views/goverment/largeScreen/index.vue
@@ -573,14 +573,21 @@ const getEquipmentList = async (id: any) => {
if (res.result && res.result.length > 0) {
let arr: any = res.result;
arr.map(async (item: any) => {
+ const img = new URL("@/assets/images/Mars3DImg/icon/camera.svg", import.meta.url).href;
const graphicImg = new mars3d.graphic.DivGraphic({
id: item.monitorId,
position: [+item.lng, +item.lat, +item.alt],
style: {
- html: () => {
- const dom = initVue3Popup(resPointStyle?.codeValue, { data: { name: item.name } });
- return dom;
- },
+ // html: () => {
+ // const dom = initVue3Popup(resPointStyle?.codeValue, { data: { name: item.name } });
+ // return dom;
+ // },
+ html: `
+
+