Merge remote-tracking branch 'origin/master'

industry-system/industry-da/src/main/resources/static/reportSheet/css/desig.css

@@ -123,4 +123,9 @@ body {
 .table-img {
 	max-width: 50px !important;
 	max-height: 50px !important;
+}
+.main-item-close {
+	position: absolute;
+	right: -13px;
+	top: -13px;
 }

industry-system/industry-da/src/main/resources/static/reportSheet/design.html

@@ -59,7 +59,7 @@
 						<div class="layui-form" style="width: 90%;margin-left: 5%;">
 							<div class="layui-form-item">
 								<div class="layui-input-group">
-									<input id="searchItem" type="text" placeholder="带任意后置内容" class="layui-input">
+									<input id="searchItem" type="text" placeholder="点位名称" class="layui-input">
 									<div onclick="sceneView.searchItem(this)" class="layui-input-split layui-input-suffix" style="cursor: pointer;">
 										<i class="layui-icon layui-icon-search"></i>
 									</div>

industry-system/industry-da/src/main/resources/static/reportSheet/js/design.js

@@ -123,7 +123,8 @@ function dragEnd(event) {
 	let id = 'id_' + new Date().getTime()
 	$('#content').before(`<span id="${id}" class="main-item" title="${txt}" style="position: absolute;
 				top:${y}px;left:${x}px;" data-itemid="${itemId}"><span class="main-item-name" 
-				style="${pageData.isShowItemName == 1 ? '' : 'display:none;'}">${txt}</span></span>`)
+				style="${pageData.isShowItemName == 1 ? '' : 'display:none;'}">${txt}</span>
+				<i onclick="sceneView.closeItem(this)" class="layui-icon layui-icon-error main-item-close" style="display:none;"></i></span>`)
 	$("#" + id).draggable({
 		cursor: "grabbing",
 		drag: function(event, ui) {
@@ -143,6 +144,19 @@ const sceneView = {
 	init: function() {
 		const form = layui.form
 		const _this = this
+		$('#draggable').on('click', '.main-item', function(e) {
+			$('.main-item').css({'border': ''})
+			$('.main-item-close').css({'display': 'none'})
+			$(this).css({'border': '1px solid #333'})
+			$(this).find('.main-item-close').css({'display': ''})
+		})
+		$('.right').on('click', function(e) {
+			if ($(e.target).hasClass('main-item') || $(e.target).hasClass('main-item-name') || $(e.target).hasClass('main-item-close')) {
+				return
+			}
+			$('.main-item').css({'border': ''})
+			$('.main-item-close').css({'display': 'none'})
+		})
 		form.on('select(switch-scene)', function(data) {
 			for (let i = 0; i < pageData.sceneData.length; i++) {
 				if (pageData.sceneData[i].id == data.value) {
@@ -329,7 +343,7 @@ const sceneView = {
 					for (let i = 0; i < json.data.length; i++) {
 						html += `<li class="item-li">
 							<span ondragstart="dragStart(event)" draggable="true" ondragend="dragEnd(event)" 
-							data-itemid="${json.data[i].itemId}">${json.data[i].itemName || ''}</span>
+							data-itemid="${json.data[i].itemId}">${(json.data[i].describe || json.data[i].itemName) || ''}</span>
 						</li>`
 					}
 					$('.item-ul').append(html)
@@ -394,7 +408,8 @@ const sceneView = {
 								for (let j = 0; j < data.length; j++) {
 									$('#content').before(`<span id="id_${j}" class="main-item" title="${data[j].name}" style="position: absolute;
 										top:${data[j].top};left:${data[j].left};" data-itemid="${data[j].itemId}"><span class="main-item-name" 
-										style="${pageData.isShowItemName == 1 ? '' : 'display:none;'}">${data[j].name}</span></span>`)
+										style="${pageData.isShowItemName == 1 ? '' : 'display:none;'}">${data[j].name}</span>
+										<i onclick="sceneView.closeItem(this)" class="layui-icon layui-icon-error main-item-close" style="display:none;"></i> </span>`)
 									$("#id_" + j).draggable({
 										cursor: "grabbing",
 										drag: function(event, ui) {
@@ -413,6 +428,9 @@ const sceneView = {
 				}
 			}
 		})
+	},
+	closeItem: function(that) {
+		$(that).parent().remove()
 	}
 }
 
@@ -708,7 +726,7 @@ const sceneTable = {
 		layer.open({
 			type: 1,
 			title: '场景管理',
-			area: ['700px', '500px'],
+			area: ['80%', '70%'],
 			btn: ['关闭'],
 			content: this.view(),
 			success: function() {
@@ -740,7 +758,8 @@ const sceneTable = {
 					templet: '#scene-table-img'
 				}, {
 					title: '操作',
-					templet: '#scene-table-tool'
+					templet: '#scene-table-tool',
+					width: 200
 				}]
 			],
 			parseData: function(res) {
@@ -752,7 +771,7 @@ const sceneTable = {
 			},
 			defaultToolbar: [],
 			toolbar: '#scene-table-btn',
-			height: 380
+			height: 500
 		});
 	},
 	delSceneByIdApi: function(id, callback) {