diff --git a/yanzhu-bigscreen/public/bimImages/1.png b/yanzhu-bigscreen/public/bimImages/1.png
deleted file mode 100644
index ad43a030..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/1.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/2.png b/yanzhu-bigscreen/public/bimImages/2.png
deleted file mode 100644
index 67d50585..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/2.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/3.png b/yanzhu-bigscreen/public/bimImages/3.png
deleted file mode 100644
index cfe8c4d6..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/3.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/4.png b/yanzhu-bigscreen/public/bimImages/4.png
deleted file mode 100644
index da30b944..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/4.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/5.png b/yanzhu-bigscreen/public/bimImages/5.png
deleted file mode 100644
index 7073fa73..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/5.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/pitMonitor.png b/yanzhu-bigscreen/public/bimImages/pitMonitor.png
deleted file mode 100644
index 0ed75985..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/pitMonitor.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/power.png b/yanzhu-bigscreen/public/bimImages/power.png
deleted file mode 100644
index af6da13c..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/power.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/towerMonitor.png b/yanzhu-bigscreen/public/bimImages/towerMonitor.png
deleted file mode 100644
index 12d0093e..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/towerMonitor.png and /dev/null differ
diff --git a/yanzhu-bigscreen/public/bimImages/videoMonitor.png b/yanzhu-bigscreen/public/bimImages/videoMonitor.png
deleted file mode 100644
index 95eea9df..00000000
Binary files a/yanzhu-bigscreen/public/bimImages/videoMonitor.png and /dev/null differ
diff --git a/yanzhu-bigscreen/src/views/bimManage.vue b/yanzhu-bigscreen/src/views/bimManage.vue
index caeb689d..b21430bd 100644
--- a/yanzhu-bigscreen/src/views/bimManage.vue
+++ b/yanzhu-bigscreen/src/views/bimManage.vue
@@ -353,7 +353,7 @@ export default {
devicTypes: [1],
viewPoint: null,
project: null,
- selProject:null,
+ selProject: null,
addLabels: [],
devices: [],
showDevices: [],
@@ -756,8 +756,8 @@ export default {
.listBimModel({
pageNum: 1,
pageSize: 100,
- comId: this.currentComId,
- projectId: this.currentPrjId,
+ comId: this.selProject.comId,
+ projectId: this.selProject.id,
})
.then((d) => {
this.models = d.rows || [];
@@ -999,12 +999,11 @@ export default {
}
.data-content {
-
height: 100%;
.div-row {
height: 33%;
- border: solid 1px #75fbfdaa;
- background-color: #06445b81;
+ border: solid 1px #75fbfdaa;
+ background-color: #06445b81;
.row-title {
background: linear-gradient(0deg, #105696, #c0dafb00, #1765ae);
padding-left: 10px;
@@ -1349,7 +1348,7 @@ export default {
.tool-item {
padding: 10px 20px;
.icon {
- width:30px;
+ width: 30px;
height: 30px;
border-radius: 15px;
.svg-icon {
@@ -1471,7 +1470,6 @@ export default {
font-size: 12px;
}
.photography-list-nodata {
-
.video-play {
width: 60px;
height: 60px;
diff --git a/yanzhu-ui-vue3/public/images/2.png b/yanzhu-ui-vue3/public/images/2.png
deleted file mode 100644
index 67d50585..00000000
Binary files a/yanzhu-ui-vue3/public/images/2.png and /dev/null differ
diff --git a/yanzhu-ui-vue3/public/images/blue.svg b/yanzhu-ui-vue3/public/images/blue.svg
deleted file mode 100755
index 4c8ceeaa..00000000
--- a/yanzhu-ui-vue3/public/images/blue.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/green.svg b/yanzhu-ui-vue3/public/images/green.svg
deleted file mode 100755
index e28989da..00000000
--- a/yanzhu-ui-vue3/public/images/green.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/pitMonitor.png b/yanzhu-ui-vue3/public/images/pitMonitor.png
deleted file mode 100644
index 0ed75985..00000000
Binary files a/yanzhu-ui-vue3/public/images/pitMonitor.png and /dev/null differ
diff --git a/yanzhu-ui-vue3/public/images/pitMonitor.svg b/yanzhu-ui-vue3/public/images/pitMonitor.svg
deleted file mode 100644
index d6f7ee8c..00000000
--- a/yanzhu-ui-vue3/public/images/pitMonitor.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/power.png b/yanzhu-ui-vue3/public/images/power.png
deleted file mode 100644
index af6da13c..00000000
Binary files a/yanzhu-ui-vue3/public/images/power.png and /dev/null differ
diff --git a/yanzhu-ui-vue3/public/images/power.svg b/yanzhu-ui-vue3/public/images/power.svg
deleted file mode 100644
index 45203192..00000000
--- a/yanzhu-ui-vue3/public/images/power.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/red.svg b/yanzhu-ui-vue3/public/images/red.svg
deleted file mode 100755
index f0886756..00000000
--- a/yanzhu-ui-vue3/public/images/red.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/towerMonitor.png b/yanzhu-ui-vue3/public/images/towerMonitor.png
deleted file mode 100644
index 12d0093e..00000000
Binary files a/yanzhu-ui-vue3/public/images/towerMonitor.png and /dev/null differ
diff --git a/yanzhu-ui-vue3/public/images/towerMonitor.svg b/yanzhu-ui-vue3/public/images/towerMonitor.svg
deleted file mode 100644
index 8bb95249..00000000
--- a/yanzhu-ui-vue3/public/images/towerMonitor.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/videoMonitor.png b/yanzhu-ui-vue3/public/images/videoMonitor.png
deleted file mode 100644
index 95eea9df..00000000
Binary files a/yanzhu-ui-vue3/public/images/videoMonitor.png and /dev/null differ
diff --git a/yanzhu-ui-vue3/public/images/videoMonitor.svg b/yanzhu-ui-vue3/public/images/videoMonitor.svg
deleted file mode 100644
index cb698c9a..00000000
--- a/yanzhu-ui-vue3/public/images/videoMonitor.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/public/images/yellow.svg b/yanzhu-ui-vue3/public/images/yellow.svg
deleted file mode 100755
index 0a329666..00000000
--- a/yanzhu-ui-vue3/public/images/yellow.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue b/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue
index fa120041..a2a4305e 100644
--- a/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue
+++ b/yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue
@@ -101,7 +101,6 @@ export default {
},
created() {
this.iconVideo = icons["video"];
- console.log("SandTableSetting", this.iconVideo);
emitter.on("routeChanged", ({ to, from }) => {
if (to.name === "SandTableSetting") {
this.initEngine();
@@ -199,9 +198,9 @@ export default {
.tag-txt{position: absolute;top:30%;left: 50%;transform: translate(-50%, -50%);
text-align: center;color: #ffffff;display: flex;font-size:12px;}
`;
diff --git a/yanzhu-ui-vue3/vite.config.js b/yanzhu-ui-vue3/vite.config.js
index b8e3c6ee..43d9d263 100644
--- a/yanzhu-ui-vue3/vite.config.js
+++ b/yanzhu-ui-vue3/vite.config.js
@@ -45,16 +45,20 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api/, ""),
},
"/statics": {
- target:
- VITE_APP_ENV === "production"
- ? "http://62.234.3.186"
- : `http://localhost:9300`,
+ target: VITE_APP_ENV === "production" ? "http://62.234.3.186" : `http://localhost:9300`,
//target: 'http://62.234.3.186',
changeOrigin: true,
pathRewrite: {
"^/statics": "/",
},
},
+ "/cdn": {
+ target: `http://62.234.3.186`,
+ changeOrigin: true,
+ pathRewrite: {
+ "^/cdn": "/",
+ },
+ },
},
},
//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+ 
- 
+ 
${item.name}