diff --git a/.env.dikongganzhi b/.env.dikongganzhi
index c4c7d78..52b9474 100644
--- a/.env.dikongganzhi
+++ b/.env.dikongganzhi
@@ -12,13 +12,13 @@ VITE_BUILD_COMPRESS = 'none'
# Basic interface address SPA
# 低空数智
-VITE_GLOB_API_URL=https://ssl.hopetrytech.com:6034
+VITE_GLOB_API_URL = https://wrj.wisestcity.com:6034
-VITE_GLOB_INFO_IMAGE_URL=https://ssl.hopetrytech.com:6034
+VITE_GLOB_INFO_IMAGE_URL = https://wrj.wisestcity.com:6034
# File upload address， optional
# It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=https://ssl.hopetrytech.com:6034
+VITE_GLOB_UPLOAD_URL= https://wrj.wisestcity.com:6034
# Interface prefix
@@ -36,18 +36,14 @@ VITE_GLOB_APP_TECHINICAL_SUPPORT = 技术⽀持：山东慧创信息科技有
VITE_GLOB_APP_VERSIONS = 系统版本：V1.0
-VITE_GLOB_YINGXIANG_SERVER = http://192.168.31.205:8080/geoserver/ne/wms?service=WMS&version=1.1.0&request=GetMap&layers=ne:linyitif&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE
-
-VITE_GLOB_FILE_PREVIEW = http://120.222.154.7:6081
-
+VITE_GLOB_FILE_PREVIEW = http://120.220.31.120:6080
VITE_GLOB_MEDIALIBRARY_IMAGE_URL = http://175.27.168.120:6013/test/
VITE_GLOB_APP_HEADER_TITLE = 天网慧眼平台
-VITE_GLOB_PY_URL = http://123.132.248.154:9309
-# VITE_GLOB_PY_URL = http://192.168.10.131:9309
-VITE_GLOB_PY_WS_URL = ws://192.168.10.131:9309
+VITE_GLOB_PY_URL = http://123.132.248.154:1987
+VITE_GLOB_PY_WS_URL = ws://123.132.248.154:1987
VITE_GLOB_MQTT_URL = wrj.wisestcity.com
VITE_GLOB_MQTT_PORT = 6010
diff --git a/.env.production b/.env.production
index c24b8d1..b76242a 100644
--- a/.env.production
+++ b/.env.production
@@ -39,8 +39,6 @@ VITE_GLOB_APP_TECHINICAL_SUPPORT = 技术⽀持：山东慧创信息科技有
VITE_GLOB_APP_VERSIONS = 系统版本：V1.0
-VITE_GLOB_YINGXIANG_SERVER = http://192.168.31.205:8080/geoserver/ne/wms?service=WMS&version=1.1.0&request=GetMap&layers=ne:linyitif&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE
-
VITE_GLOB_FILE_PREVIEW = http://120.222.154.7:6081
VITE_GLOB_MEDIALIBRARY_IMAGE_URL = http://175.27.168.120:6013/test/
diff --git a/src/views/demo/resourcemanagement/ailist/AddAlgorithmModal.vue b/src/views/demo/resourcemanagement/ailist/AddAlgorithmModal.vue
index 45f5c9e..25150b0 100644
--- a/src/views/demo/resourcemanagement/ailist/AddAlgorithmModal.vue
+++ b/src/views/demo/resourcemanagement/ailist/AddAlgorithmModal.vue
@@ -328,20 +328,26 @@
return new Promise((resolve) => setTimeout(resolve, ms));
};
function hexToRgb(color) {
- // 移除#符号并转换为小写
- if (color.length === 4) {
- let extendedColor = '#';
- for (let i = 1; i < color.length; i++) {
- extendedColor += color.charAt(i) + color.charAt(i);
+ let arr;
+ if (!color) {
+ arr = [0, 0, 0];
+ } else {
+ // 移除#符号并转换为小写
+ if (color.length === 4) {
+ let extendedColor = '#';
+ for (let i = 1; i < color.length; i++) {
+ extendedColor += color.charAt(i) + color.charAt(i);
+ }
+ color = extendedColor;
}
- color = extendedColor;
+ const values = {
+ r: parseInt(color.substr(1, 2), 16),
+ g: parseInt(color.substr(3, 2), 16),
+ b: parseInt(color.substr(5, 2), 16),
+ };
+ arr = [values.r, values.g, values.b];
}
- const values = {
- r: parseInt(color.substr(1, 2), 16),
- g: parseInt(color.substr(3, 2), 16),
- b: parseInt(color.substr(5, 2), 16),
- };
- let arr = [values.r, values.g, values.b];
+
return arr;
}
function rgb2hex(sRGB) {
diff --git a/src/views/demo/workmanagement/monitoring/index.vue b/src/views/demo/workmanagement/monitoring/index.vue
index 8320ba2..dc91398 100644
--- a/src/views/demo/workmanagement/monitoring/index.vue
+++ b/src/views/demo/workmanagement/monitoring/index.vue
@@ -111,7 +111,7 @@
-
-
@@ -186,6 +186,7 @@
classtype5: '',
items: [false, false, false, false],
});
+ const videoHeight = ref('73vh');
function selecttype(item, fnum, clo) {
selectVal.value = fnum;
state.items = [];
@@ -194,6 +195,17 @@
}
state.fornum = fnum;
state.clonum = clo;
+ switch (fnum) {
+ case 1:
+ videoHeight.value = '73vh';
+ break;
+ case 4:
+ videoHeight.value = '38vh';
+ break;
+ case 9:
+ videoHeight.value = '25vh';
+ break;
+ }
if (item === 'classtype1') {
state.classtype1 = 'primary';
state.classtype2 = '';
@@ -585,10 +597,8 @@
}
}
.video-content {
- flex: 1;
background: #0f0f13;
position: relative;
- min-height: 150px;
video {
height: 100%;
}
diff --git a/src/views/demo/workmanagement/uavmonitoring/gps.vue b/src/views/demo/workmanagement/uavmonitoring/gps.vue
index 14ea65f..bc8159f 100644
--- a/src/views/demo/workmanagement/uavmonitoring/gps.vue
+++ b/src/views/demo/workmanagement/uavmonitoring/gps.vue
@@ -195,9 +195,9 @@
margin-top: 10px;
}
.video-content {
- flex: 1;
background: #0f0f13;
position: relative;
+ height: 50vh;
video {
height: 100%;
}
diff --git a/src/views/demo/workmanagement/uavmonitoring/index.vue b/src/views/demo/workmanagement/uavmonitoring/index.vue
index af6097d..22ed6d3 100644
--- a/src/views/demo/workmanagement/uavmonitoring/index.vue
+++ b/src/views/demo/workmanagement/uavmonitoring/index.vue
@@ -105,7 +105,7 @@
-
-
@@ -193,6 +193,7 @@
classtype5: '',
items: [false, false, false, false],
});
+ const videoHeight = ref('73vh');
function selecttype(item, fnum, clo) {
selectVal.value = fnum;
state.items = [];
@@ -201,6 +202,17 @@
}
state.fornum = fnum;
state.clonum = clo;
+ switch (fnum) {
+ case 1:
+ videoHeight.value = '73vh';
+ break;
+ case 4:
+ videoHeight.value = '38vh';
+ break;
+ case 9:
+ videoHeight.value = '25vh';
+ break;
+ }
if (item === 'classtype1') {
state.classtype1 = 'primary';
state.classtype2 = '';
@@ -339,15 +351,18 @@
return;
}
if (element.uavType == 'GDY') {
+ console.log('固定翼');
+ console.log(streamingVisible.value);
+ console.log(currentlySn.value.uavSn);
if (streamingVisible.value && currentlySn.value.uavSn == element.uavSn) {
return createMessage.warning('已请求，请稍后');
} else {
- if (element.uavSn == '123HSDJASLDJKEJSKSUWJS') {
- fixedWing(element);
- createMessage.warning('正在开启' + element.uavName + ',请稍后');
- } else {
- createMessage.error('当前设备不在线');
- }
+ // if (element.uavSn == '123HSDJASLDJKEJSKSUWJS') {
+ fixedWing(element);
+ createMessage.warning('正在开启' + element.uavName + ',请稍后');
+ // } else {
+ // createMessage.error('当前设备不在线');
+ // }
}
} else {
if (element.uavStatus == 1) {
@@ -741,7 +756,6 @@
}
}
.video-content {
- flex: 1;
background: #0f0f13;
position: relative;
min-height: 150px;
diff --git a/vite.config.ts.timestamp-1773111267881-253e9d443a977.mjs b/vite.config.ts.timestamp-1773111267881-253e9d443a977.mjs
new file mode 100644
index 0000000..2a6cf68
--- /dev/null
+++ b/vite.config.ts.timestamp-1773111267881-253e9d443a977.mjs
@@ -0,0 +1,67 @@
+// vite.config.ts
+import { defineApplicationConfig } from "file:///E:/%E6%96%B0%E6%9E%B6%E6%9E%84%E9%A1%B9%E7%9B%AE/%E4%BD%8E%E7%A9%BA%E6%84%9F%E7%9F%A5%E5%B9%B3%E5%8F%B0/DiKongGanZhiPingTai/internal/vite-config/dist/index.mjs";
+import { mars3dPlugin } from "file:///E:/%E6%96%B0%E6%9E%B6%E6%9E%84%E9%A1%B9%E7%9B%AE/%E4%BD%8E%E7%A9%BA%E6%84%9F%E7%9F%A5%E5%B9%B3%E5%8F%B0/DiKongGanZhiPingTai/node_modules/.pnpm/vite-plugin-mars3d@3.1.3_rollup@2.79.2/node_modules/vite-plugin-mars3d/dist/index.js";
+var vite_config_default = defineApplicationConfig({
+ overrides: {
+ optimizeDeps: {
+ include: [
+ "echarts/core",
+ "echarts/charts",
+ "echarts/components",
+ "echarts/renderers",
+ "qrcode",
+ "@iconify/iconify",
+ "ant-design-vue/es/locale/zh_CN",
+ "ant-design-vue/es/locale/en_US",
+ "@/../lib/vform/designer.umd.js"
+ ]
+ },
+ build: {
+ /* 其他build生产打包配置省略 */
+ //...
+ target: "esnext",
+ commonjsOptions: {
+ include: [/node_modules|lib/, /node_modules|packages/]
+ //这里记得把lib目录加进来，否则生产打包会报错！！
+ }
+ },
+ server: {
+ proxy: {
+ "/basic-api": {
+ target: "http://localhost:3000",
+ changeOrigin: true,
+ ws: true,
+ rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
+ // only https
+ // secure: false
+ },
+ "/upload": {
+ target: "http://localhost:3300/upload",
+ changeOrigin: true,
+ ws: true,
+ rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
+ }
+ },
+ warmup: {
+ clientFiles: ["./index.html", "./src/{views,components}/*"]
+ }
+ },
+ define: {
+ "process.env": {
+ BASE_URL: "/"
+ }
+ },
+ css: {
+ preprocessorOptions: {
+ less: {
+ javascriptEnabled: true
+ }
+ }
+ },
+ plugins: [mars3dPlugin()]
+ }
+});
+export {
+ vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxcdTY1QjBcdTY3QjZcdTY3ODRcdTk4NzlcdTc2RUVcXFxcXHU0RjRFXHU3QTdBXHU2MTFGXHU3N0U1XHU1RTczXHU1M0YwXFxcXERpS29uZ0dhblpoaVBpbmdUYWlcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkU6XFxcXFx1NjVCMFx1NjdCNlx1Njc4NFx1OTg3OVx1NzZFRVxcXFxcdTRGNEVcdTdBN0FcdTYxMUZcdTc3RTVcdTVFNzNcdTUzRjBcXFxcRGlLb25nR2FuWmhpUGluZ1RhaVxcXFx2aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vRTovJUU2JTk2JUIwJUU2JTlFJUI2JUU2JTlFJTg0JUU5JUExJUI5JUU3JTlCJUFFLyVFNCVCRCU4RSVFNyVBOSVCQSVFNiU4NCU5RiVFNyU5RiVBNSVFNSVCOSVCMyVFNSU4RiVCMC9EaUtvbmdHYW5aaGlQaW5nVGFpL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5pbXBvcnQgeyBtYXJzM2RQbHVnaW4gfSBmcm9tICd2aXRlLXBsdWdpbi1tYXJzM2QnO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVBcHBsaWNhdGlvbkNvbmZpZyh7XG4gIG92ZXJyaWRlczoge1xuICAgIG9wdGltaXplRGVwczoge1xuICAgICAgaW5jbHVkZTogW1xuICAgICAgICAnZWNoYXJ0cy9jb3JlJyxcbiAgICAgICAgJ2VjaGFydHMvY2hhcnRzJyxcbiAgICAgICAgJ2VjaGFydHMvY29tcG9uZW50cycsXG4gICAgICAgICdlY2hhcnRzL3JlbmRlcmVycycsXG4gICAgICAgICdxcmNvZGUnLFxuICAgICAgICAnQGljb25pZnkvaWNvbmlmeScsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvemhfQ04nLFxuICAgICAgICAnYW50LWRlc2lnbi12dWUvZXMvbG9jYWxlL2VuX1VTJyxcbiAgICAgICAgJ0AvLi4vbGliL3Zmb3JtL2Rlc2lnbmVyLnVtZC5qcycsXG4gICAgICBdLFxuICAgIH0sXG4gICAgYnVpbGQ6IHtcbiAgICAgIC8qIFx1NTE3Nlx1NEVENmJ1aWxkXHU3NTFGXHU0RUE3XHU2MjUzXHU1MzA1XHU5MTREXHU3RjZFXHU3NzAxXHU3NTY1ICovXG4gICAgICAvLy4uLlxuICAgICAgdGFyZ2V0OiAnZXNuZXh0JyxcbiAgICAgIGNvbW1vbmpzT3B0aW9uczoge1xuICAgICAgICBpbmNsdWRlOiBbL25vZGVfbW9kdWxlc3xsaWIvLCAvbm9kZV9tb2R1bGVzfHBhY2thZ2VzL10sIC8vXHU4RkQ5XHU5MUNDXHU4QkIwXHU1Rjk3XHU2MjhBbGliXHU3NkVFXHU1RjU1XHU1MkEwXHU4RkRCXHU2NzY1XHVGRjBDXHU1NDI2XHU1MjE5XHU3NTFGXHU0RUE3XHU2MjUzXHU1MzA1XHU0RjFBXHU2MkE1XHU5NTE5XHVGRjAxXHVGRjAxXG4gICAgICB9LFxuICAgIH0sXG4gICAgc2VydmVyOiB7XG4gICAgICBwcm94eToge1xuICAgICAgICAnL2Jhc2ljLWFwaSc6IHtcbiAgICAgICAgICB0YXJnZXQ6ICdodHRwOi8vbG9jYWxob3N0OjMwMDAnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vYmFzaWMtYXBpYCksICcnKSxcbiAgICAgICAgICAvLyBvbmx5IGh0dHBzXG4gICAgICAgICAgLy8gc2VjdXJlOiBmYWxzZVxuICAgICAgICB9LFxuICAgICAgICAnL3VwbG9hZCc6IHtcbiAgICAgICAgICB0YXJnZXQ6ICdodHRwOi8vbG9jYWxob3N0OjMzMDAvdXBsb2FkJyxcbiAgICAgICAgICBjaGFuZ2VPcmlnaW46IHRydWUsXG4gICAgICAgICAgd3M6IHRydWUsXG4gICAgICAgICAgcmV3cml0ZTogKHBhdGgpID0+IHBhdGgucmVwbGFjZShuZXcgUmVnRXhwKGBeL3VwbG9hZGApLCAnJyksXG4gICAgICAgIH0sXG4gICAgICB9LFxuICAgICAgd2FybXVwOiB7XG4gICAgICAgIGNsaWVudEZpbGVzOiBbJy4vaW5kZXguaHRtbCcsICcuL3NyYy97dmlld3MsY29tcG9uZW50c30vKiddLFxuICAgICAgfSxcbiAgICB9LFxuICAgIGRlZmluZToge1xuICAgICAgJ3Byb2Nlc3MuZW52Jzoge1xuICAgICAgICBCQVNFX1VSTDogJy8nLFxuICAgICAgfSxcbiAgICB9LFxuICAgIGNzczoge1xuICAgICAgcHJlcHJvY2Vzc29yT3B0aW9uczoge1xuICAgICAgICBsZXNzOiB7XG4gICAgICAgICAgamF2YXNjcmlwdEVuYWJsZWQ6IHRydWUsXG4gICAgICAgIH0sXG4gICAgICB9LFxuICAgIH0sXG4gICAgcGx1Z2luczogW21hcnMzZFBsdWdpbigpXSxcbiAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUEyWCxTQUFTLCtCQUErQjtBQUNuYSxTQUFTLG9CQUFvQjtBQUU3QixJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsT0FBTztBQUFBO0FBQUE7QUFBQSxNQUdMLFFBQVE7QUFBQSxNQUNSLGlCQUFpQjtBQUFBLFFBQ2YsU0FBUyxDQUFDLG9CQUFvQix1QkFBdUI7QUFBQTtBQUFBLE1BQ3ZEO0FBQUEsSUFDRjtBQUFBLElBQ0EsUUFBUTtBQUFBLE1BQ04sT0FBTztBQUFBLFFBQ0wsY0FBYztBQUFBLFVBQ1osUUFBUTtBQUFBLFVBQ1IsY0FBYztBQUFBLFVBQ2QsSUFBSTtBQUFBLFVBQ0osU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLElBQUksT0FBTyxhQUFhLEdBQUcsRUFBRTtBQUFBO0FBQUE7QUFBQSxRQUcvRDtBQUFBLFFBQ0EsV0FBVztBQUFBLFVBQ1QsUUFBUTtBQUFBLFVBQ1IsY0FBYztBQUFBLFVBQ2QsSUFBSTtBQUFBLFVBQ0osU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLElBQUksT0FBTyxVQUFVLEdBQUcsRUFBRTtBQUFBLFFBQzVEO0FBQUEsTUFDRjtBQUFBLE1BQ0EsUUFBUTtBQUFBLFFBQ04sYUFBYSxDQUFDLGdCQUFnQiw0QkFBNEI7QUFBQSxNQUM1RDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLGVBQWU7QUFBQSxRQUNiLFVBQVU7QUFBQSxNQUNaO0FBQUEsSUFDRjtBQUFBLElBQ0EsS0FBSztBQUFBLE1BQ0gscUJBQXFCO0FBQUEsUUFDbkIsTUFBTTtBQUFBLFVBQ0osbUJBQW1CO0FBQUEsUUFDckI7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsU0FBUyxDQUFDLGFBQWEsQ0FBQztBQUFBLEVBQzFCO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K