Merge branch 'Lh_CIM_DCF' of http://218.59.194.82:12990/JT-LHYT/JT-CIM-LHYT into Lh_CIM_DCF

src/views/Map3d/components/ImageLayerSplit.vue

@@ -669,10 +669,10 @@
 						res.value = res;
 						res.label = res.layername;
 
-						if (res.layername === "牟平中心城") {
+						if (res.layername === "配水间") {
 							_self.leftValue = res;
 						}
-						if (res.layername === "牟平区") {
+						if (res.layername === "联合站") {
 							_self.rightValue = res;
 						}
 

src/views/Map3d/components/ViewerSplitScreen.vue

@@ -197,7 +197,10 @@
 				//二三维标绘
 				jt3dLeft.DrawTools = new this.jt3dSDK.DrawTools(jt3dLeft._viewer);
 				//军事标绘
-				jt3dLeft.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3dLeft._viewer);
+				jt3dLeft.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
+					viewer: jt3dLeft._viewer,
+					Cesium: Cesium,
+				});
 
 				//天空盒子
 				jt3dLeft.SceneEffects = {};
@@ -205,6 +208,7 @@
 
 				//线对象
 				jt3dLeft.PolylineObject = new this.jt3dSDK.PolylineObject(jt3dLeft._viewer);
+				jt3dLeft.WallObject = new this.jt3dSDK.WallObject(jt3dLeft._viewer);
 
 				//比例尺、指南针
 				this.$parent.$parent.$refs.refNavigation.initNavigation(jt3dLeft);

src/views/Map3d/components/drawEdit.vue

@@ -27,6 +27,16 @@
 			</el-select>
 			<el-button type="danger" :icon="Delete" style="margin-top: 8rem;width: 30%;" @click="removeAll()">清除</el-button>
 		</div>
+		<div v-show="value=='点标绘类'">
+			<el-row :gutter="20" style="margin-left: 0rem; margin-right: 0rem">
+				<el-col v-for="(item,index) in point" :span="8" @click="createDrawPoint(item.drawType,index)">
+					<el-avatar shape="circle" :size="70" :class="currentIndex===index?'selectStyle':'defaultStyle'">
+						<i :class="[item.icon,currentIndex===index?'selectFontStyle':'']" />
+					</el-avatar>
+					<div style="margin-top: 5rem; font-size: 14rem;" :class="currentIndex===index?'selectFontStyle':''">{{item.label}}</div>
+				</el-col>
+			</el-row>
+		</div>
 		<div v-show="value=='二维平面类'">
 			<el-row :gutter="20" style="margin-left: 0rem; margin-right: 0rem">
 				<el-col v-for="(item,index) in towDimension" :span="8" @click="createGraphics(item.drawType,index)">
@@ -71,8 +81,47 @@
 		data() {
 			return {
 				currentIndex: -1,
-				value: "二维平面类",
+				value: "点标绘类",
+				point: [{
+						label: '小模型',
+						drawType: 'model',
+						number: 1,
+						icon: 'iconfont icon-jihedi'
+					}, {
+						label: '文字',
+						drawType: 'label',
+						number: 2,
+						icon: 'iconfont icon-jihedi'
+					},
+					{
+						label: '点',
+						drawType: 'point',
+						number: 3,
+						icon: 'iconfont icon-jihedi'
+					},
+					{
+						label: '点及文字',
+						drawType: 'point2Label',
+						number: 4,
+						icon: 'iconfont icon-jihedi'
+					},
+					{
+						label: '广告牌',
+						drawType: 'billboard',
+						number: 5,
+						icon: 'iconfont icon-jihedi'
+					},
+					{
+						label: '广告牌及文字',
+						drawType: 'billboard2Label',
+						number: 6,
+						icon: 'iconfont icon-jihedi'
+					}
+				],
 				options: [{
+						value: '点标绘类',
+						label: '点标绘类',
+					},{
 						value: '二维平面类',
 						label: '二维平面类',
 					},
@@ -180,21 +229,33 @@
 				],
 				militaryPlotting: [{
 						label: '直线箭头',
-						drawType: 'straightArrow',
+						drawType: 'DrawStraightArrow',
 						number: 1,
 						icon: 'iconfont icon-zhijiantou'
 					},
 					{
 						label: '攻击箭头',
-						drawType: 'attackArrow',
+						drawType: 'DrawAttackArrow',
 						number: 2,
 						icon: 'iconfont icon-tujifangxiang'
 					},
 					{
 						label: '钳击箭头',
-						drawType: 'pincerArrow',
+						drawType: 'DrawPincerArrow',
 						number: 3,
 						icon: 'iconfont icon-qianji'
+					},
+					{
+						label: '集结地',
+						drawType: 'DrawGatheringPlace',
+						number: 4,
+						icon: 'iconfont icon-qianji'
+					},
+					{
+						label: '闭合曲面',
+						drawType: 'DrawClosedCurve',
+						number: 5,
+						icon: 'iconfont icon-qianji'
 					}
 				]
 			}
@@ -233,12 +294,13 @@
 				/* 创建监听 */
 				jt3d.DrawMilitaryPlot.onEditProperty = {};
 				// 开始绘制
-				jt3d.DrawMilitaryPlot.draw(type, {
-					onComplete(cPoint, gPoint) {
-						// _self.$parent.$parent.param = param;
-						// _self.$parent.$parent.showDialog = true;
-					}
-				});
+				jt3d.DrawMilitaryPlot.drawActivate(type);
+				// jt3d.DrawMilitaryPlot.draw(type, {
+				// 	onComplete(cPoint, gPoint) {
+				// 		// _self.$parent.$parent.param = param;
+				// 		// _self.$parent.$parent.showDialog = true;
+				// 	}
+				// });
 			},
 			//创建二维标会和三维标会
 			createGraphics(type, index) {
@@ -262,6 +324,30 @@
 						console.log('错误原因', message)
 					}
 				});
+			},
+			
+			//创建点类标绘
+			createDrawPoint(type, index) {
+				let _self = this;
+				this.currentIndex = index;
+			
+				//移除左键单击事件
+				if (jt3d.handlerLeftClick) {
+					jt3d.handlerLeftClick.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+				}
+			
+				/* 创建监听 */
+				jt3d.DrawPointEdit.onEditProperty = {};
+				// 开始绘制
+				jt3d.DrawPointEdit.draw(type, {
+					isEdit: true,
+					onComplete(cPoint, gPoint) {
+			
+					},
+					onError(message) {
+						console.log('错误原因', message)
+					}
+				});
 			}
 
 		},

src/views/Map3d/components/map.vue

@@ -221,10 +221,11 @@
 					isRetainDrawPoint: true, //绘制完成是否保留绘制点
 					iconType: 'blue',
 				});
-				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
-				// 	viewer: jt3d._viewer,
-				// 	Cesium: Cesium,
-				// });
+				jt3d.DrawPointEdit = new this.jt3dSDK.DrawPoint(jt3d._viewer);
+				jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
+					viewer: jt3d._viewer,
+					Cesium: Cesium,
+				});
 				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
 
 				jt3d.LocateUtil = new this.jt3dSDK.LocateUtil(jt3d._viewer);

src/views/Map3d/components/mapNavigate.vue

@@ -59,7 +59,7 @@
 				currentIndex: -1,
 				isindex: 0, //判断选中第几个标题
 				cityList: [{ //tab数组展示列表
-					label: '牟平',
+					label: '金海采油厂',
 					number: 0,
 					dj: 1
 				}],
@@ -255,21 +255,53 @@
 
 				this.dj = 1
 				this.ALLlist = []
-				this.$http.get("/getTableList", {
-					tableName: "map_region",
-					sqlWhere: "dj = 1",
-					orderByField: ''
-				}).then(res => {
-					res.data.forEach(
-						item => {
-							console.log('街道信息', item)
-							this.ALLlist.push({
-								label: item.regionname,
-								regioncode: item.regioncode,
-								dj: 1
-							})
-						}
-					)
+				// this.$http.get("/getTableList", {
+				// 	tableName: "map_region",
+				// 	sqlWhere: "dj = 1",
+				// 	orderByField: ''
+				// }).then(res => {
+				// 	res.data.forEach(
+				// 		item => {
+				// 			console.log('街道信息', item)
+				// 			this.ALLlist.push({
+				// 				label: item.regionname,
+				// 				regioncode: item.regioncode,
+				// 				dj: 1
+				// 			})
+							
+				// 		}
+				// 	)
+				// })
+				
+				this.ALLlist.push({
+					label: "管理一区",
+					regioncode: "1",
+					dj: 1
+				})
+				this.ALLlist.push({
+					label: "管理二区",
+					regioncode: "1",
+					dj: 1
+				})
+				this.ALLlist.push({
+					label: "管理三区",
+					regioncode: "1",
+					dj: 1
+				})
+				this.ALLlist.push({
+					label: "管理四区",
+					regioncode: "1",
+					dj: 1
+				})
+				this.ALLlist.push({
+					label: "管理五区",
+					regioncode: "1",
+					dj: 1
+				})
+				this.ALLlist.push({
+					label: "管理六区",
+					regioncode: "1",
+					dj: 1
 				})
 
 			}

src/views/Map3d/components/measure.vue

@@ -159,7 +159,7 @@
 							}
 
 							// popup = new  _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], position, "位置信息", html,40);
-							popup = new _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], cPoint, "位置信息", html, -30);
+							popup = new _self.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], cPoint, "位置信息", html, 30);
 						}
 					},
 					onError(message) {

src/views/Map3d/components/query-keyword.vue

@@ -39,11 +39,11 @@
 				<ul>
 					<li v-for="(item, i) in resultCompleteData" :key="i" class="query-result__item" @click.stop="flyTo(item)">
 						<div class="query-result__context">
-							<p class="query-result-text" :title="item.name">
+							<p class="query-result-text" :title="item.jh">
 								<span class="query-result-text_num">{{ i + 1 }}</span>
-								{{ item.name }}
+								{{ item.jh }}
 							</p>
-							<p class="query-result-sub">{{ item.label }}</p>
+							<p class="query-result-sub">{{ item.dwmc }}</p>
 						</div>
 						<p class="query-result__more">
 							<el-icon>
@@ -141,8 +141,8 @@
 			getSearchData(queryString) {
 				let _self = this;
 				_self.$http.get('/getTableList', {
-					tableName: 'base_sys_role',
-					sqlWhere: " label like '%" + queryString + "%'",
+					tableName: 'yy_yj',
+					sqlWhere: " jh like '%" + queryString + "%'",
 					orderByField: ''
 				}).then(res => {
 					console.log('从服务端搜索数据', res.data)
@@ -156,7 +156,7 @@
 		mounted() {
 			let _self = this;
 			_self.$http.get('/getTableList', {
-				tableName: 'base_sys_role',
+				tableName: 'yy_yj',
 				sqlWhere: '',
 				orderByField: ''
 			}).then(res => {