From dd21cb2e28e5450a5a6309cabc055c29fbababb4 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期五, 09 八月 2024 15:41:04 +0800 Subject: [PATCH] 销售发货看板 --- WebTM/views/看板/销售发货/KB_XSFH.html | 356 +++++++++++++++++++++++++++++++++++++++++++------- WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 6 2 files changed, 308 insertions(+), 54 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user index fced48d..63b6911 100644 --- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user +++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user @@ -18,10 +18,10 @@ <publishTime>01/28/2016 14:22:24</publishTime> </File> <File Include="bin/WebTM.dll"> - <publishTime>08/08/2024 16:00:53</publishTime> + <publishTime>08/09/2024 14:12:34</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>08/08/2024 16:00:53</publishTime> + <publishTime>08/09/2024 14:12:34</publishTime> </File> <File Include="HtmlPage1.html"> <publishTime>04/11/2023 16:34:42</publishTime> @@ -4875,7 +4875,7 @@ <publishTime>08/01/2024 11:12:03</publishTime> </File> <File Include="views/鐪嬫澘/閿�鍞彂璐�/KB_XSFH.html"> - <publishTime>08/07/2024 16:11:14</publishTime> + <publishTime>08/09/2024 15:37:09</publishTime> </File> <File Include="views/绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodAdd.html"> <publishTime>06/13/2024 14:47:29</publishTime> diff --git "a/WebTM/views/\347\234\213\346\235\277/\351\224\200\345\224\256\345\217\221\350\264\247/KB_XSFH.html" "b/WebTM/views/\347\234\213\346\235\277/\351\224\200\345\224\256\345\217\221\350\264\247/KB_XSFH.html" index a75aff3..9fff91b 100644 --- "a/WebTM/views/\347\234\213\346\235\277/\351\224\200\345\224\256\345\217\221\350\264\247/KB_XSFH.html" +++ "b/WebTM/views/\347\234\213\346\235\277/\351\224\200\345\224\256\345\217\221\350\264\247/KB_XSFH.html" @@ -95,7 +95,7 @@ min-height: 1px; padding-right: 0px; padding-left: 0px; - height:45vh; + height:30vh; width:100%; } .col-sm-8 { @@ -111,10 +111,11 @@ } #mychart1, - #mychart2{ + #mychart2, + #mychart3 { width: 100%; border: none; - height: 40vh; + height: 25vh; } #cList { @@ -202,25 +203,29 @@ background: black; background-color: black; } - + /*璁剧疆琛ㄥご瀛椾綋鏍峰紡*/ th .layui-table-cell { - height: 48px; - line-height: 48px; + height: 60px; + line-height: 20px; text-align: center; font-family: 榛戜綋; color: #09d1ea; - font-size: 20px; + font-size: 16px; } /*璁剧疆琛ㄤ綋瀛椾綋鏍峰紡*/ td .layui-table-cell { - height: 32px; - line-height: 32px; + height: 60px; + line-height: 20px; text-align: center; font-family: Arial; color: #a6a8ae; - font-size: 14px; + font-size: 12px; + } + + .layui-table-box tbody tr { + height: 60px; /* 璁剧疆浣犳兂瑕佺殑琛岄珮 */ } /*闅愯棌table婊氬姩鏉★紝浣嗕粛鍙粴鍔�*/ @@ -286,6 +291,9 @@ </div> <!--鍥捐〃--> <div class="col-sm-4 right"> + <div class="col-sm-6"> + <div id="mychart3"></div> + </div> <div class="col-sm-6"> <div id="mychart1"></div> </div> @@ -447,50 +455,75 @@ //, limit: 50 , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず //, limits: [50, 500, 5000, 20000] - , done: function (res, curr, count) { //res涓鸿〃鏍肩殑鎵�鏈夋暟鎹紝curr涓哄綋鍓嶉〉鐮侊紝count涓烘暟鎹�绘潯鏁� - //閬嶅巻琛ㄦ牸鎵�鏈夎 - res.data.forEach(function (item, index) { //杩欓噷item鍜宨ndex鍒嗗埆瀵瑰簲姣忚鐨勬暟鎹拰data-index绱㈠紩鍊� - if (item.杩涘害 == "鏈彂璐�") { - //鑾峰彇绗琲琛屽厓绱� - var tr = $(".layui-table tr[data-index=" + index + "]"); - //tr.css("background", "rgb(249,116,116,0.8)"); + //, done: function (res, curr, count) { //res涓鸿〃鏍肩殑鎵�鏈夋暟鎹紝curr涓哄綋鍓嶉〉鐮侊紝count涓烘暟鎹�绘潯鏁� + // //閬嶅巻琛ㄦ牸鎵�鏈夎 + // res.data.forEach(function (item, index) { //杩欓噷item鍜宨ndex鍒嗗埆瀵瑰簲姣忚鐨勬暟鎹拰data-index绱㈠紩鍊� + // if (item.杩涘害 == "鏈彂璐�") { + // //鑾峰彇绗琲琛屽厓绱� + // var tr = $(".layui-table tr[data-index=" + index + "]"); + // //tr.css("background", "rgb(249,116,116,0.8)"); - //鑾峰彇绗琲琛屽厓绱犱腑鐨勫崟鍏冩牸鍏冪礌鍒楄〃锛岄亶鍘嗗崟鍏冩牸鍏冪礌骞惰缃崟鍏冩牸杈规瀹藉害涓�0 - var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td - for (var i = 0; i < td.length; i++) { - var td_temp = td.eq(i); - var div = td_temp.children("div"); - div.eq(0).css("color", "red"); - } - } else if (item.杩涘害 == "寰呭彂璐�") { - //鑾峰彇绗琲琛屽厓绱� - var tr = $(".layui-table tr[data-index=" + index + "]"); - //tr.css("background", "rgb(249,116,116,0.8)"); + // //鑾峰彇绗琲琛屽厓绱犱腑鐨勫崟鍏冩牸鍏冪礌鍒楄〃锛岄亶鍘嗗崟鍏冩牸鍏冪礌骞惰缃崟鍏冩牸杈规瀹藉害涓�0 + // var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td + // for (var i = 0; i < td.length; i++) { + // var td_temp = td.eq(i); + // var div = td_temp.children("div"); + // div.eq(0).css("color", "red"); + // } + // } else if (item.杩涘害 == "寰呭彂璐�") { + // //鑾峰彇绗琲琛屽厓绱� + // var tr = $(".layui-table tr[data-index=" + index + "]"); + // //tr.css("background", "rgb(249,116,116,0.8)"); - //鑾峰彇绗琲琛屽厓绱犱腑鐨勫崟鍏冩牸鍏冪礌鍒楄〃锛岄亶鍘嗗崟鍏冩牸鍏冪礌骞惰缃崟鍏冩牸杈规瀹藉害涓�0 - var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td - for (var i = 0; i < td.length; i++) { - var td_temp = td.eq(i); - var div = td_temp.children("div"); - div.eq(0).css("color", "yellow"); - } - } else if (item.杩涘害 == "宸插彂璐�") { - //鑾峰彇绗琲琛屽厓绱� - var tr = $(".layui-table tr[data-index=" + index + "]"); - //tr.css("background", "rgb(249,116,116,0.8)"); + // //鑾峰彇绗琲琛屽厓绱犱腑鐨勫崟鍏冩牸鍏冪礌鍒楄〃锛岄亶鍘嗗崟鍏冩牸鍏冪礌骞惰缃崟鍏冩牸杈规瀹藉害涓�0 + // var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td + // for (var i = 0; i < td.length; i++) { + // var td_temp = td.eq(i); + // var div = td_temp.children("div"); + // div.eq(0).css("color", "yellow"); + // } + // } else if (item.杩涘害 == "宸插彂璐�") { + // //鑾峰彇绗琲琛屽厓绱� + // var tr = $(".layui-table tr[data-index=" + index + "]"); + // //tr.css("background", "rgb(249,116,116,0.8)"); - //鑾峰彇绗琲琛屽厓绱犱腑鐨勫崟鍏冩牸鍏冪礌鍒楄〃锛岄亶鍘嗗崟鍏冩牸鍏冪礌骞惰缃崟鍏冩牸杈规瀹藉害涓�0 - var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td - for (var i = 0; i < td.length; i++) { - var td_temp = td.eq(i); - var div = td_temp.children("div"); - div.eq(0).css("color", "green"); - } - } + // //鑾峰彇绗琲琛屽厓绱犱腑鐨勫崟鍏冩牸鍏冪礌鍒楄〃锛岄亶鍘嗗崟鍏冩牸鍏冪礌骞惰缃崟鍏冩牸杈规瀹藉害涓�0 + // var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td + // for (var i = 0; i < td.length; i++) { + // var td_temp = td.eq(i); + // var div = td_temp.children("div"); + // div.eq(0).css("color", "green"); + // } + // } - }) - } + // }) + //} } + + var col = [ + { + field: "鍙戣揣鏃ユ湡", title: "鍙戣揣鏃ユ湡", width: 95, align: 'center', totalRow: true, + templet: function (d) { + return '<div style="height:60px;line-height:20px;white-space: normal;overflow-warp:normal;vertical-align: middle;">' + d.鍙戣揣鏃ユ湡 == null ? "" : layui.util.toDateString(d.鍙戣揣鏃ユ湡, 'yyyy-MM-dd') + '</div>'; + } + }, + { field: "鍙戣揣鍗曞彿", title: "鍙戣揣鍗曞彿", align: 'center', totalRow: true, width: 110 }, + { field: "鐗╂枡浠g爜", title: "鐗╂枡浠g爜", align: 'center', totalRow: true, width: 110 }, + { + field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 190, + templet: function (d) { + return '<div style="height:60px;line-height:12px;font-size:10;white-space: normal;overflow-warp:normal;vertical-align: middle;">' + d.鐗╂枡鍚嶇О + '</div>'; + } + }, + { field: "搴撳瓨", title: "搴撳瓨", align: 'center', totalRow: true, width: 70 }, + { field: "搴斿彂鏁伴噺", title: "搴斿彂", align: 'center', totalRow: true, width: 70 }, + { field: "瀹炲彂鏁伴噺", title: "瀹炲彂", align: 'center', totalRow: true, width: 70 }, + { field: "鏀惰揣浠撳簱", title: "鏀惰揣浠撳簱", align: 'center', totalRow: true, width: 120 }, + { field: "杩涘害", title: "杩涘害", align: 'center', totalRow: true, width: 100 }, + ] + + option.cols = [col]; + option1.cols = [col]; } //#endregion @@ -551,10 +584,10 @@ } //涓鸿〃鏍兼覆鏌撳弬鏁拌缃垪鏁版嵁銆佽鏁版嵁 - option.cols = [col]; + //option.cols = [col]; option.data = data_1; - option1.cols = [col]; + //option1.cols = [col]; option1.data = data_2; //娓叉煋琛ㄦ牸 @@ -672,6 +705,9 @@ var data2 = dataList[3]; set_Graphics_mychart2(data2); + + var data3 = dataList[4]; + set_Graphics_mychart3(data3); } //#endregion @@ -1048,6 +1084,224 @@ } ////#endregion //#endregion + + //#region 鍔犺浇鍥捐〃3 + function set_Graphics_mychart3(data) { + //#region 銆愭煴鐘跺浘銆� + var app = {}; + var chartDom = document.getElementById('mychart3'); + var myChart = echarts.init(chartDom); + var option_mychart; + + //#region [鏌辩姸鍥惧竷灞�鏍峰紡] + const posList = [ + 'left', + 'right', + 'top', + 'bottom', + 'inside', + 'insideTop', + 'insideLeft', + 'insideRight', + 'insideBottom', + 'insideTopLeft', + 'insideTopRight', + 'insideBottomLeft', + 'insideBottomRight' + ]; + app.configParameters = { + rotate: { + min: -90, + max: 90 + }, + align: { + options: { + left: 'left', + center: 'center', + right: 'right' + } + }, + verticalAlign: { + options: { + top: 'top', + middle: 'middle', + bottom: 'bottom' + } + }, + position: { + options: posList.reduce(function (map, pos) { + map[pos] = pos; + return map; + }, {}) + }, + distance: { + min: 0, + max: 100 + } + }; + app.config = { + rotate: 90, + align: 'left', + verticalAlign: 'middle', + position: 'insideBottom', + distance: 15, + onChange: function () { + const labelOption = { + rotate: app.config.rotate, + align: app.config.align, + verticalAlign: app.config.verticalAlign, + position: app.config.position, + distance: app.config.distance + }; + myChart.setOption({ + series: [ + { + label: labelOption + }, + { + label: labelOption + }, + { + label: labelOption + }, + { + label: labelOption + } + ] + }); + } + }; + const labelOption = { + show: true, + position: 'top', + textStyle: { + //color: '#333', // 鏍囩瀛椾綋棰滆壊 + fontSize: 8, // 鏍囩瀛椾綋澶у皬 + //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖 + //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋 + //fontFamily: 'Arial' // 鏍囩瀛椾綋 + } + }; + const labelOption1 = { + show: true, + position: 'right', + textStyle: { + //color: '#333', // 鏍囩瀛椾綋棰滆壊 + fontSize: 8, // 鏍囩瀛椾綋澶у皬 + //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖 + //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋 + //fontFamily: 'Arial' // 鏍囩瀛椾綋 + } + } + //#endregion + + //鏌辩姸鍥剧粦瀹氭暟鎹� + var HMaterNameList = [];//x杞达細鐗╂枡鍒楄〃 + var HQtyList = []; //y杞达細鏁伴噺鍒楄〃 + var HQtyList1 = []; //y杞达細鏁伴噺鍒楄〃 + for (let i = 0; i < data.length; i++) { + HMaterNameList.push(data[i].鏃ユ湡); + HQtyList.push(data[i].鍙戣揣鍗曟暟); + HQtyList1.push(data[i].鍑哄簱鍗曟暟); + } + + option_mychart = { + title: { + text: '杩戜竷澶╁彂璐ч�氱煡鍗曚笌閿�鍞嚭搴撳崟瀵规瘮', + subtext: '' + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + legend: { + data: ["鍗曟暟"] + , show: false + }, + //toolbox: { //宸ュ叿鏍� + // show: true, + // orient: 'vertical', + // left: 'right', + // top: 'center', + // feature: { + // mark: { show: true }, + // dataView: { show: true, readOnly: false }, + // magicType: { show: true, type: ['line', 'bar', 'stack'] }, + // restore: { show: true }, + // saveAsImage: { show: true } + // } + //}, + grid: + { + left: '5%', + right: '5%', + bottom: '10%', + //top: '10%', + containLabel: true + }, + xAxis: [ //璁剧疆x杞村潗鏍� + { + type: 'category', + axisTick: { show: true }, + data: HMaterNameList, + axisLabel: { + formatter: function (value) { + var temp = ""; + var temp_len = 5; + for (var i = 0; i < value.length; i = i + temp_len) { + if (i + temp_len <= value.length) { + temp += '\n' + value.slice(i, i + temp_len) + } else { + temp += '\n' + value.slice(i); + } + } + + return temp; + + // 浣跨敤 '\n' 瀹炵幇鎹㈣ + //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value; + }, + width: 30 // 璁剧疆鍒诲害鏍囩鐨勫搴︼紝瓒呰繃杩欎釜瀹藉害浼氳嚜鍔ㄦ崲琛� + } + } + ], + yAxis: [ //璁剧疆y杞存暟鎹被鍨� + { + type: 'value' + } + ], + series: [ //璁剧疆y杞存暟鎹� + { + name: '鍙戣揣鍗曟暟', + type: 'bar', + barWidth: 10, + barGap: 0, + label: labelOption, + emphasis: { + focus: 'series' + }, + data: HQtyList + }, + { + name: '鍑哄簱鍗曟暟', + type: 'bar', + barWidth: 10, + barGap: 0, + label: labelOption1, + emphasis: { + focus: 'series' + }, + data: HQtyList1 + } + ] + }; + option_mychart && myChart.setOption(option_mychart); + //#endregion + } + ////#endregion + //#endregion }); </script> </body> -- Gitblit v1.9.1