From af3706b7fdd5a46848240303ff1bb95f5a15c1ae Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 19 四月 2024 11:28:23 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/wxdDemo
---
src/components/props/militaryPlot.vue | 56 +++++++++++++-------------------------------------------
src/components/wggl/right/fwxq.vue | 4 ++--
2 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/src/components/props/militaryPlot.vue b/src/components/props/militaryPlot.vue
index b8bc70c..0fdaa89 100644
--- a/src/components/props/militaryPlot.vue
+++ b/src/components/props/militaryPlot.vue
@@ -4,7 +4,7 @@
id="moved2"
@mousedown="moved">
<div class="top">
- <span style="font-weight: bold">鎬佸娍鏍囩粯</span>
+ <span style="font-weight: bold">缃戞牸鏄剧ず</span>
<span class="close"
@click="showtuli">X</span>
</div>
@@ -44,45 +44,17 @@
value2: false,
ishowtuli: false,
scale: 2.13,
+ tileCoordinates: true,
Option: [
{
- name: '绮楃洿绠ご',
- type: 'StraightArrow',
- value: 'polygon',
+ name: '鐡︾墖鍧愭爣',
+ type: '1',
+
+ },{
+ name: '鍦板舰涓夎缃�',
+ type: '2',
+
},
- {
- name: '鐕曞熬鐩寸澶�',
- type: 'SwallowtailArrow',
- value: 'polygon',
- },{
- name: '閽冲嚮绠ご',
- type: 'PincerArrow',
- value: 'polygon',
- },{
- name: '闆嗙粨鍦�',
- type: 'GatheringPlace',
- value: 'polygon',
- },{
- name: '鍦嗚鐭╁舰',
- type: 'RoundedRectangle',
- value: 'polygon',
- },
- {
- name: '鎵囧舰',
- type: 'Sector',
- value: 'polygon',
- },{
- name: '寮撳舰',
- type: 'Bow',
- value: 'polygon',
- },{
- name: '鏀诲嚮绠ご',
- type: 'AttackArrow',
- value: 'polygon',
- },{
- name: '娓呴櫎',
- type: 'Clear',
- }
],
};
@@ -125,13 +97,11 @@
//娓呴櫎绯荤粺鍙扮珯锛岀洃娴嬬珯锛実b
},
setMenuClick (res) {
- if(res.type=='Clear') {
- sgworld.Creator.ClearMilitaryStandard();
- return
+ if(res.type=='1') {
+ window.sgworld.tileCoordinates=!window.sgworld.tileCoordinates;
+ } else if(res.type=='2') {
+ window.sgworld.wireframe=!window.sgworld.wireframe;
}
-
- sgworld.Creator.militaryPlotting(res.type,res.value,(entity) => {
- });
}
},
mounted () {
diff --git a/src/components/wggl/right/fwxq.vue b/src/components/wggl/right/fwxq.vue
index 9efd6b4..88822e9 100644
--- a/src/components/wggl/right/fwxq.vue
+++ b/src/components/wggl/right/fwxq.vue
@@ -109,8 +109,8 @@
],
bot1: [
{ img: require("@/assets/image/test/缁� 163.png") },
- { img: require("@/assets/image/test/缁� 164.png") },
- { img: require("@/assets/image/test/缁� 165.png") },
+ // { img: require("@/assets/image/test/缁� 164.png") },
+ // { img: require("@/assets/image/test/缁� 165.png") },
],
form: {
name: "",
--
Gitblit v1.9.3