whx 3 kuukautta sitten
vanhempi
commit
9a84fb07ba
22 muutettua tiedostoa jossa 30 lisäystä ja 15 poistoa
  1. 7 3
      virgo.wzfrontend/console/src/assets/scss/tips.scss
  2. 3 2
      virgo.wzfrontend/console/src/components/work/bim/operationModels.vue
  3. 12 2
      virgo.wzfrontend/console/src/views/work/space/function.vue
  4. 1 1
      virgo.wzfrontend/src/main/resources/static/console/index.html
  5. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/2416.563480f9.css
  6. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/6349.563480f9.css
  7. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/898.f824ccdc.css
  8. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/9370.f824ccdc.css
  9. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/css/app.42762972.css
  10. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/app.f005fcf5.css
  11. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/2416.0d9ab24a.js
  12. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4224.ebeccab9.js
  13. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5004.d1f5c9b5.js
  14. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5053-legacy.581360ec.js
  15. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/6349-legacy.dd2264ca.js
  16. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8185-legacy.310638b7.js
  17. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/898.2193f945.js
  18. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9370-legacy.2193ed36.js
  19. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.62b81728.js
  20. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.fb568526.js
  21. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app.bef596d4.js
  22. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/app.e1ef601a.js

+ 7 - 3
virgo.wzfrontend/console/src/assets/scss/tips.scss

@@ -447,7 +447,7 @@
 .tips-4 {
 	width: 150px;
 	height: 24px;
-	// background: linear-gradient(90deg, rgba(211, 179, 20, 0) 0%, rgba(161, 140, 35, 0.8) 53%, rgba(211, 179, 20, 0) 100%);
+	// background: linear-gradient(90deg, rgba(15, 70, 255, 0) 0%, rgba(15, 70, 255, 0.6) 53%, rgba(15, 70, 255, 0) 100%);
 	border: 1px solid;
 	border-image: linear-gradient(270deg, rgba(15, 70, 255, 0), rgba(15, 70, 255, 1.0), rgba(15, 70, 255, 0)) 1 1;
 	font-weight: 600;
@@ -455,8 +455,12 @@
 	color: #FFFFFF;
 	text-align: center;
 	line-height: 22px;
-	position: relative;
-
+	position: relative;
+	.name{
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
 	.iconfont {
 		position: absolute;
 		color: #3371FF;

+ 3 - 2
virgo.wzfrontend/console/src/components/work/bim/operationModels.vue

@@ -240,8 +240,9 @@
 							},
 							offsetX: -75,
 							offsetY: -40,
-							html: `	<div class="tips-4">${organization.name}<i class="iconfont huifont-sanjiaojiantou-xia"></i></div>`,
-							id: 'room' + this.roomList[i].roomId
+							html: `	<div class="tips-4"><div class="name">${organization.name}</div><i class="iconfont huifont-sanjiaojiantou-xia"></i></div>`,
+							id: 'room' + this.roomList[i].roomId,
+							visibleDistance: parseInt(this.roomList[i].distance)
 						}, data => {
 							this.showDrap('organizationDetail', organization);
 						})

+ 12 - 2
virgo.wzfrontend/console/src/views/work/space/function.vue

@@ -38,6 +38,12 @@
 											</el-color-picker>
 										</div>
 									</div>
+									<div class="space-function-item">
+										<div class="space-function-label">可见距离</div>
+										<div class="space-function-value">
+											<el-input v-model="form.distance"></el-input>
+										</div>
+									</div>
 									<div class="space-function-button">
 										<el-button size="medium" type="primary" @click="submit">保 存</el-button>
 									</div>
@@ -104,7 +110,8 @@
 				nullType: '',
 				room: {},
 				form: {
-					color: 'rgba(19, 206, 102, 0.8)'
+					color: 'rgba(52, 114, 211, 0.6)',
+					distance: ''
 				},
 				bimViewer: null,
 				positionData: [],
@@ -168,9 +175,11 @@
 						if (res.data.dataValue) {
 							this.roomData = JSON.parse(res.data.dataValue);
 							this.form.color = this.roomData.roomColor;
+							this.form.distance = this.roomData.distance;
 						} else {
 							this.roomData = {};
-							this.form.color = 'rgba(19, 206, 102, 0.8)';
+							this.form.color = 'rgba(52, 114, 211, 0.6)';
+							this.form.distance = '';
 						}
 						this.initRoomBIM();
 					}
@@ -224,6 +233,7 @@
 			submit() {
 				if (!this.roomData.roomId) return this.$message.warning('请设置空间位置');
 				this.roomData['roomColor'] = this.form.color;
+				this.roomData['distance'] = this.form.distance;
 				updateHouse({
 					id: this.room.id,
 					dataValue: JSON.stringify(this.roomData)

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/index.html


virgo.wzfrontend/src/main/resources/static/console/static/css/4224.563480f9.css → virgo.wzfrontend/src/main/resources/static/console/static/css/2416.563480f9.css


virgo.wzfrontend/src/main/resources/static/console/static/css/5053.563480f9.css → virgo.wzfrontend/src/main/resources/static/console/static/css/6349.563480f9.css


virgo.wzfrontend/src/main/resources/static/console/static/css/5004.f824ccdc.css → virgo.wzfrontend/src/main/resources/static/console/static/css/898.f824ccdc.css


virgo.wzfrontend/src/main/resources/static/console/static/css/8185.f824ccdc.css → virgo.wzfrontend/src/main/resources/static/console/static/css/9370.f824ccdc.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/css/app.42762972.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/css/app.f005fcf5.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/2416.0d9ab24a.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4224.ebeccab9.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5004.d1f5c9b5.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5053-legacy.581360ec.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/6349-legacy.dd2264ca.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8185-legacy.310638b7.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/898.2193f945.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/9370-legacy.2193ed36.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.62b81728.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.fb568526.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app.bef596d4.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/app.e1ef601a.js