Merge branch 'master' of http://116.63.33.55/git/industry-data-platform into master

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/item-list-table.js

@@ -121,11 +121,13 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 				layer.msg('请选择点位！', {icon: 2})
 				return
 			}
+			console.log(fn.data);
 			layui.dataSettingw.open({
 				data:fn.data.dataSetting,
 				success: function(data, index) {
 					const type = layui.sheetTypew.templateReportType
 					fn.data.dataSetting = data
+					console.log(data);
 					table.reloadData('item-list-table', {
 						data: fn.data.itemList
 					})
@@ -295,8 +297,8 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 								</div>
 							</div>
 							<div class="layui-inline">
-								<button lay-on="data-item-add-btn" type="button" class="layui-btn layui-btn-sm layui-btn-primary ${fn.data.type == 'edit'? '' : 'layui-hide'}">添加点位</button>
-								<button lay-on="data-item-switch-btn" type="button" class="layui-btn layui-btn-sm layui-btn-primary ${fn.data.type == 'edit'? 'layui-hide' : ''}">选择点位</button>
+								<button lay-on="data-item-add-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? '' : 'layui-hide'}">添加点位</button>
+								<button lay-on="data-item-switch-btn" type="button" class="layui-btn layui-btn-sm ${fn.data.type == 'edit'? 'layui-hide' : ''}">选择点位</button>
 								<button lay-on="data-item-setting-btn" type="button" class="layui-btn layui-btn-sm">设置数据条件</button>
 								<button lay-on="data-item-del-btn" type="button" class="layui-btn layui-btn-sm layui-btn-danger"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
 							</div>

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/right-menu.js

@@ -8,12 +8,61 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 	
 	util.on({
 	    saveas: function() {
-			const data = layui.excelUtil.getChartData()
-			setTimeout(() => {
-				layui.excelUtil.showChart()
+			// const data = layui.excelUtil.getChartData()
+			// setTimeout(() => {
+			// 	layui.excelUtil.showChart()
 
-				//layui.excelUtil.downloadExcel('save-excel', 10)
-			}, 1000)
+			// 	//layui.excelUtil.downloadExcel('save-excel', 10)
+			// }, 1000)
+			layer.open({
+				type: 1,
+				title: ['另存为', 'text-align: center;padding-left: 81px;'],
+				area: ['400px', '200px'],
+				btn: ['确定', '取消'],
+				content: `
+					<div class="layui-form layui-row layui-padding-3">
+						<input type="text" class="layui-input" id="report_newname" placeholder="请输入报表名称">
+						</input>
+					</div>
+				`,
+				success: function() {
+					let templateName = $('#template-name').val();
+					$('#report_newname').val('副本_'+templateName);
+				},
+				yes: function(index) {
+					const val = $('#report_newname').val()
+					if (!val) {
+						layer.msg('请输入报表名称！', {icon: 2})
+						return
+					}
+					if (val.length > 20) {
+						layer.msg('模板名称必须在20字以内！', {icon: 2})
+					    return
+					};
+					let params = {
+						templateName: val,
+						templateType: sheetTypew.templateReportType,
+						eventNum: sheetTypew.templateEventReportNum,
+						templateData: JSON.stringify({
+							sheet: luckysheet.getAllSheets()[0],
+							chart: layui.excelUtil.getChartData()
+						}),
+					};
+					layui.api.addTableTemplate(params).then(json => {
+						if (json.code == 200) {
+							layer.msg('保存报表成功！', {icon: 1})
+							window.parent.postMessage({
+								cmd: 'newsave'
+							}, '*')
+						} else {
+							layer.msg(json.msg, {icon: 2})
+						}
+					})
+					
+					layer.close(index)
+				}
+			});
+			
 		},
 		save: function() {
 			if (!$('#template-name').val()) {
@@ -247,12 +296,12 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 	}
 	
 	const view = [
-		/*{
+		{
 		clazz: 'img0',
 		img: 'img/svg/report_saveas.svg',
 		txt: '另存为',
 		event: 'saveas'
-	}, */{
+	}, {
 		clazz: 'img0',
 		img: 'img/svg/report_save.svg',
 		txt: '保存',

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/sheet-util.js

@@ -167,7 +167,7 @@ layui.define(function(exports) {
 				cellMousedown:function(cell,position,sheet,ctx){
 					//console.log('r='+position.r+','+'c='+position.c);
 					//console.log(position.c);
-					console.log(cell);
+					//console.log(cell);
 				},
 				rangePasteAfter:function(range,data){
 					 //console.log('rangePasteAfter')