增加图标

industry-admin/src/components/CommonTable/index.vue

@@ -15,7 +15,7 @@
                 </slot>
                 <slot v-if="(item.type == 'img') && item.formatter">
                   <img v-if="item.formatter(scope.row).imgtype==0" src='@/assets/images/time.png' height="16" width="16" style="margin-bottom: -3px;margin-right: 10px" />
-                  <img v-else-if="item.formatter(scope.row).imgtype==1" src='@/assets/images/change.png' height="16" width="16" style="margin-bottom: -3px;margin-right: 10px" />
+                  <img v-else-if="item.formatter(scope.row).imgtype==1" src='@/assets/images/change.jpg' height="16" width="16" style="margin-bottom: -3px;margin-right: 10px" />
                   <img v-else="item.formatter(scope.row).imgtype==2" src='@/assets/images/cond.png' height="16" width="16" style="margin-bottom: -3px;margin-right: 10px" />
                   <span>{{ item.formatter(scope.row).text }}</span>
                 </slot>

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

@@ -4,6 +4,7 @@ layui.use(use.index, function() {
 window.onload = function() {
 	window.addEventListener('message', function(e) {
 		const json = e.data;
+		console.log(json);
 		if (json.cmd == 'init') {
 			localStorage.setItem('url', json.data.url)
 			localStorage.setItem('token', json.data.token)

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

@@ -188,7 +188,6 @@ layui.define(function(exports) {
 							
 						}
 					}
-					//console.log(cellsData)
 					luckysheet.setRangeValue(cellsData, {range: {
 						row: [json.r, json.r + cellsData.length - 1],
 						column: [json.c, json.c + cellsData[0].length - 1],
@@ -231,7 +230,6 @@ layui.define(function(exports) {
 					const cs = json.cs || 0
 					let cellsData = _this.plugCell(json)
 					let cdata = {}
-					//console.log(json)
 					for (let i = 0; i < row; i++) {
 						let ri = rs > 0 ? (i == 0 ? 0 : i * rs) : i
 						for (let j = 0; j < column; j++) {
@@ -338,7 +336,6 @@ layui.define(function(exports) {
 							
 						}
 					}
-					//console.log(cellsData)
 					luckysheet.setRangeValue(cellsData, {range: {
 						row: [json.r, json.r + cellsData.length - 1],
 						column: [json.c, json.c + cellsData[0].length - 1],

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

@@ -63,7 +63,7 @@ layui.define(function(exports) {
 			let copyRange = null;
 			const $ = layui.jquery
 			const option = $.extend(true, {}, sheetOption)
-			option.container = ''
+			option.container = 'luckysheet'
 			const templateReportType = layui.sheetTypew.templateReportType
 			if ((templateReportType == 2 || templateReportType == 5) && !edit) {
 				option.row = parseInt(layui.sheetTypew.templateEventReportNum) + 50
@@ -140,7 +140,7 @@ layui.define(function(exports) {
 					// }
 				},
 				cellMousedown:function(cell,position,sheet,ctx){
-					//console.log(position.r);
+					//console.log('r='+position.r+','+'c='+position.c);
 					//console.log(position.c);
 					//console.log(cell);
 				},