TV.kanbanUI.git

			@@ -27,9 +27,9 @@
			margin-top: -75px;
			margin-right: 5px;
			color: #09d1ea;


			}


			.clock {
			font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
			font-size: 20px;
			@@ -39,16 +39,16 @@
			margin-top: -75px;
			margin-right: 5px;
			color: #09d1ea;


			}


			.clock #Date {
			text-align: center;
			text-shadow: 0 0 0px #00c6ff;




			}


			.clock ul {
			width: 450px;
			margin: 0 auto;
			@@ -58,7 +58,7 @@
			margin-left: 15px;
			position: relative;
			}


			.clock ul li {
			display: inline;
			font-size: 24px;
			@@ -66,14 +66,14 @@
			font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
			text-shadow: 0 0 0px #00c6ff;
			}


			body {
			padding-left: 50px;
			padding-right: 50px;
			}


			.title {


			font-size: 44px;
			font-family: PingFangSC;
			font-weight: 500;
			@@ -82,14 +82,14 @@
			background: url(img/img_little_new.png) center no-repeat;
			margin-bottom: 30px;
			}


			.col-sm-12 {
			position: relative;
			min-height: 1px;
			padding-right: 0px;
			padding-left: 0px;
			}


			.col-sm-8,
			.col-sm-6,
			.col-sm-4,
			@@ -98,7 +98,7 @@
			/* border: 1px solid #00c6ff; */
			height: 450px;
			}


			#cTitle {
			width: 50px;
			height: 450px;
			@@ -107,7 +107,7 @@
			color: #00c6ff;
			border: 1px solid #333
			}


			.col-sm-12,
			.col-sm-2,
			.col-sm-3,
			@@ -119,7 +119,7 @@
			padding-right: 0px;
			padding-left: 0px;
			}


			#mychart1,
			#mychart2,
			#mychart3,
			@@ -129,27 +129,27 @@
			border: none;
			height: 450px;
			}


			#cList {
			margin: 0% auto;
			color: #00c6ff;
			}


			#cList li {
			margin: 26px auto;
			}


			#cList0 {
			height: 450px;
			width: 3%;
			/* border: 1px solid #00c6ff; */
			float: left;
			}


			#cList1 {
			float: left;
			}


			#cList1 li {
			float: left;
			height: 450px;
			@@ -159,27 +159,27 @@
			text-align: center;
			/display: flex;/
			}


			#cList1 li span {
			/文字居中/
			display: inline-block;
			height: 100%;
			/文字居中/


			/文字竖排/
			writing-mode: vertical-lr;
			/从左向右从右向左是 writing-mode: vertical-rl;/
			writing-mode: tb-lr;
			/IE浏览器的从左向右从右向左是 writing-mode: tb-rl；/
			}


			#cList2 {
			height: 450px;
			width: 97%;
			/* border: 1px solid #00c6ff; */
			float: left;
			}


			table tr td {
			text-align: center;
			vertical-align: middle !important;
			@@ -191,7 +191,7 @@
			font-family: Arial;
			border: none;
			}


			.table>caption+thead>tr:first-child>td,
			.table>caption+thead>tr:first-child>th,
			.table>colgroup+thead>tr:first-child>td,
			@@ -200,16 +200,16 @@
			.table>thead:first-child>tr:first-child>th {
			background-color: #000;
			color: #3bff72;


			}


			.fixed-table-container tbody td .th-inner,
			.fixed-table-container thead th .th-inner {
			font-size: 15px;
			color: #09d1ea;
			padding: 20px 0 15px 0;
			}


			#tb_order tr td {
			text-align: center;
			height: 32px;
			@@ -221,44 +221,44 @@
			/* border: 1px solid #464646; */
			border: none;
			}


			.bootstrap-table .table {
			border-radius: none
			}


			th {
			background-color: transparent !important;
			}


			td {
			background-color: transparent;
			}


			tr {
			background-color: transparent
			}


			#tb_order tr:nth-child(even) {
			background: #080c1c;
			}


			.fixed-table-container tbody td .th-inner,
			.fixed-table-container thead th .th-inner {
			text-align: left;
			}


			.progress {
			background-color: darkblue;
			}


			#tb_order tr:nth-child(even) {
			background: #000000;
			}


			.pull-right {
			display: none;
			}


			.col-sm-3 {
			width: 20%;
			}
			@@ -288,15 +288,15 @@
			var ss = date1.getSeconds();
			var dayNames = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
			var Stamp = new Date();




			$('#Date').html(year + " 年" + " " + monthNames[month] + ' ' + day + " 日  " + ' ' + dayNames[Stamp.getDay()]);
			$("#hours").html((hh < 10 ? ("0" + hh) : hh));
			$("#min").html((mm < 10 ? ("0" + mm) : mm));
			$("#sec").html((ss < 10 ? ("0" + ss) : ss));


			}, 1000);


			});
			$(function () {
			var mychart1 = echarts.init(document.getElementById('mychart1'));
			@@ -322,7 +322,7 @@
			myChart5.resize();
			}
			})


			function Chart(mychart1, mychart2, mychart3, mychart4, mychart5) {
			$.ajax({
			url: "http://localhost:12298/api/loaddata/LineData",
			@@ -334,7 +334,7 @@
			$.each(data.data[0], function (index, val) {
			hours.push(val.hour + '点');
			hoursqty.push(parseFloat(val.Count).toFixed(2));


			});
			if (data.data[1].length > 0) {
			$("#OrderQty").html(parseFloat(data.data[1][0].qty).toFixed(2)); //总订单
			@@ -350,29 +350,29 @@
			$("#OrderWork").html(data.data[2][0].FBILLNO);//当前订单
			$("#PartName").html(data.data[2][0].FNAME); //当前物料名称
			$("#PartSpec").html(data.data[2][0].FSPECIFICATION);//当前物料规格


			}
			CloseProgress = parseFloat(data.data[1][1].qty / data.data[1][0].qty).toFixed(2); //完成率


			//今日全部流水线产量对比
			$.each(data.data[3], function (index, val) {
			LineName.push(val.FNAME);
			LineOrderQty.push(parseFloat(val.qty).toFixed(2));
			LineOrderCloseQty.push(parseFloat(val.inqty).toFixed(2));


			});


			//本周分析
			Week = parseFloat(25000 / data.data[4][0].weekqty).toFixed(2);
			//本月分析
			Month = parseFloat(20000 / data.data[4][2].weekqty).toFixed(2);
			},
			error: function (data) {


			}
			})




			option1 = {
			tooltip: {
			trigger: 'item',
			@@ -445,31 +445,31 @@
			}
			},
			series: [
			{
			name: '小时产能',
			data: hoursqty, //时间点值
			type: 'line',
			smooth: true,
			itemStyle: {
			normal: {
			color: 'orange',
			lineStyle: {
			width: 4, //设置线条粗细
			shadowColor: 'rgba(255, 94, 91,.1)',
			shadowOffsetX: 3,
			shadowOffsetY: 5,
			}
			},
			{
			name: '小时产能',
			data: hoursqty, //时间点值
			type: 'line',
			smooth: true,
			itemStyle: {
			normal: {
			color: 'orange',
			lineStyle: {
			width: 4, //设置线条粗细
			shadowColor: 'rgba(255, 94, 91,.1)',
			shadowOffsetX: 3,
			shadowOffsetY: 5,
			}
			},
			textStyle: {
			fontFamily: "微软雅黑"
			}
			},
			textStyle: {
			fontFamily: "微软雅黑"
			}
			},
			]
			}


			const colorList = ['#47A2FF ', '#FBD444']


			option2 = {
			title: {
			text: '总完工率',
			@@ -498,29 +498,29 @@
			},
			color: colorList,
			series: [
			{
			name: '占比',
			type: 'pie',
			radius: [50, 80],
			center: ['50%', '50%'],
			label: {
			show: false
			},
			labelLine: {
			show: true
			},
			itemStyle: {
			borderWidth: 3,
			borderColor: '#000000'
			},
			data: [
			{ name: '总完工率', value: CloseProgress },
			{ name: '未完工率', value: 1 - CloseProgress }
			],
			}
			{
			name: '占比',
			type: 'pie',
			radius: [50, 80],
			center: ['50%', '50%'],
			label: {
			show: false
			},
			labelLine: {
			show: true
			},
			itemStyle: {
			borderWidth: 3,
			borderColor: '#000000'
			},
			data: [
			{ name: '总完工率', value: CloseProgress },
			{ name: '未完工率', value: 1 - CloseProgress }
			],
			}
			]
			};


			option3 = {
			title: {
			text: '今日全部流水线产量对比',
			@@ -534,7 +534,7 @@
			},
			color: ['#5b9bd5', '#ed7d31', '#a9d18e', '#ffc000'],
			tooltip: {


			},
			grid: {
			left: '3%',
			@@ -550,98 +550,98 @@
			fontSize: 16,
			fontFamily: "微软雅黑"
			}


			},
			xAxis: [
			{
			type: 'category',
			data: LineName,
			axisTick: {
			alignWithLabel: true
			},

			axisLine: {
			show: true,
			lineStyle: {
			color: '#00c6ff',
			type: 'solid', //设置网格线类型 dotted：虚线 solid:实线
			width: 1, //隐藏y轴
			}
			},
			axisLabel: {
			show: true,
			textStyle: {
			color: '#00c6ff', //坐标值得具体的颜色
			fontSize: '16'
			}
			{
			type: 'category',
			data: LineName,
			axisTick: {
			alignWithLabel: true
			},

			axisLine: {
			show: true,
			lineStyle: {
			color: '#00c6ff',
			type: 'solid', //设置网格线类型 dotted：虚线 solid:实线
			width: 1, //隐藏y轴
			}
			},
			axisLabel: {
			show: true,
			textStyle: {
			color: '#00c6ff', //坐标值得具体的颜色
			fontSize: '16'
			}
			}
			}
			],
			yAxis: [
			{
			type: 'value',
			axisLine: {
			show: false,

			{
			type: 'value',
			axisLine: {
			show: false,

			},
			splitLine: { //网格线
			lineStyle: {
			color: '#00c6ff',

			},
			splitLine: { //网格线
			lineStyle: {
			color: '#00c6ff',

			},
			show: true //隐藏或显示
			},
			axisLabel: {
			textStyle: {
			color: '#00c6ff', //坐标值得具体的颜色
			fontSize: '16'
			}
			show: true //隐藏或显示
			},
			axisLabel: {
			textStyle: {
			color: '#00c6ff', //坐标值得具体的颜色
			fontSize: '16'
			}
			}
			}
			],
			series: [
			{
			name: '任务数',
			type: 'bar',
			data: LineOrderQty
			},
			{
			name: '完成数',
			type: 'bar',
			data: LineOrderCloseQty
			}
			{
			name: '任务数',
			type: 'bar',
			data: LineOrderQty
			},
			{
			name: '完成数',
			type: 'bar',
			data: LineOrderCloseQty
			}
			]
			};


			option4 = {
			title: [
			{
			text: '达成率',
			subtext: Week * 100 + '%',
			textStyle: {
			fontSize: 16,
			color: '#999',
			lineHeight: 20
			},
			subtextStyle: {
			fontSize: 28,
			color: '#00c6ff'
			},
			textAlign: 'center',
			left: '50%',
			top: '70%'
			{
			text: '达成率',
			subtext: Week * 100 + '%',
			textStyle: {
			fontSize: 16,
			color: '#999',
			lineHeight: 20
			},
			{
			show: true,
			text: '本周分析',
			textStyle: {
			color: '#00c6ff',
			fontSize: '16',
			},
			textAlign: 'center',
			left: '50%',
			top: '5%'
			}
			subtextStyle: {
			fontSize: 28,
			color: '#00c6ff'
			},
			textAlign: 'center',
			left: '50%',
			top: '70%'
			},
			{
			show: true,
			text: '本周分析',
			textStyle: {
			color: '#00c6ff',
			fontSize: '16',
			},
			textAlign: 'center',
			left: '50%',
			top: '5%'
			}
			],
			tooltip: {
			trigger: 'item',
			@@ -653,58 +653,58 @@
			},
			color: colorList,
			series: [
			{
			name: '姓名',
			type: 'pie',
			radius: [50, 80],
			center: ['50%', '50%'],
			label: {
			show: false
			},
			labelLine: {
			show: true
			},
			itemStyle: {
			borderWidth: 3,
			borderColor: '#000000'
			},
			data: [
			{ name: '达成率', value: Week },
			{ name: '未达成率', value: 1 - Week }
			],
			}
			{
			name: '姓名',
			type: 'pie',
			radius: [50, 80],
			center: ['50%', '50%'],
			label: {
			show: false
			},
			labelLine: {
			show: true
			},
			itemStyle: {
			borderWidth: 3,
			borderColor: '#000000'
			},
			data: [
			{ name: '达成率', value: Week },
			{ name: '未达成率', value: 1 - Week }
			],
			}
			]
			};


			option5 = {
			title: [
			{
			text: '达成率',
			subtext: Month * 100 + '%',
			textStyle: {
			fontSize: 16,
			color: '#999',
			lineHeight: 20
			},
			subtextStyle: {
			fontSize: 28,
			color: '#00c6ff'
			},
			textAlign: 'center',
			left: '50%',
			top: '70%'
			{
			text: '达成率',
			subtext: Month * 100 + '%',
			textStyle: {
			fontSize: 16,
			color: '#999',
			lineHeight: 20
			},
			{
			show: true,
			text: '本月分析',
			textStyle: {
			color: '#00c6ff',
			fontSize: '16',
			},
			textAlign: 'center',
			left: '50%',
			top: '5%'
			}
			subtextStyle: {
			fontSize: 28,
			color: '#00c6ff'
			},
			textAlign: 'center',
			left: '50%',
			top: '70%'
			},
			{
			show: true,
			text: '本月分析',
			textStyle: {
			color: '#00c6ff',
			fontSize: '16',
			},
			textAlign: 'center',
			left: '50%',
			top: '5%'
			}
			],
			tooltip: {
			trigger: 'item',
			@@ -716,38 +716,38 @@
			},
			color: colorList,
			series: [
			{
			name: '姓名',
			type: 'pie',
			radius: [50, 80],
			center: ['50%', '50%'],
			label: {
			show: false
			},
			labelLine: {
			show: true
			},
			itemStyle: {
			borderWidth: 3,
			borderColor: '#000000'
			},
			data: [
			{ name: '达成率', value: Month },
			{ name: '未达成率', value: 1 - Month }
			],
			}
			{
			name: '姓名',
			type: 'pie',
			radius: [50, 80],
			center: ['50%', '50%'],
			label: {
			show: false
			},
			labelLine: {
			show: true
			},
			itemStyle: {
			borderWidth: 3,
			borderColor: '#000000'
			},
			data: [
			{ name: '达成率', value: Month },
			{ name: '未达成率', value: 1 - Month }
			],
			}
			]
			};




			mychart1.setOption(option1);
			mychart2.setOption(option2);
			mychart3.setOption(option3);
			mychart4.setOption(option4);
			mychart5.setOption(option5);


			}


			function DataTable() {
			$('#tb_order').bootstrapTable({
			url: 'http://localhost:12298/api/loaddata/LineTableData',
			@@ -771,69 +771,69 @@
			uniqueId: "ID", //每一行的唯一标识，一般为主键列
			cardView: false, //是否显示详细视图
			detailView: false, //是否显示父子表


			columns: [
			{ field: 'FBILLNO', title: '生产订单号', align: "left" },
			{ field: 'FNUMBER', title: '产品编码', align: "left" },
			{ field: 'FNAME', title: '产品名称', align: "left" },
			{
			field: 'FQTY', title: '任务数量', align: "left", width: 100, formatter: function (value, row, index) {
			return parseFloat(value).toFixed(2);
			}
			},
			{
			field: 'FRepQuaAuxQty', title: '完成数量', align: "left", width: 100, formatter: function (value, row, index) {
			return parseFloat(value).toFixed(2);
			}
			},
			{
			field: 'FSTOCKINQUAAUXQTY', title: '入库数量', align: "left", width: 100, formatter: function (value, row, index) {
			return parseFloat(value).toFixed(2);
			}
			},
			{
			field: 'FSTATUS', title: '状态', align: "left", width: 100, formatter: function (value, row, index) {
			switch (value) {
			case '1':
			return "计划";
			break;
			case '2':
			return "计划确认";
			break;
			case '3':
			return "下达";
			break;
			case '4':
			return "开工";
			break;
			case '5':
			return "完工";
			break;
			case '6':
			return "结案";
			default:

			}
			}
			},
			{
			field: 'Progress', title: '进度', align: "left", formatter: function (value, row, index) {
			var res = 100 * row.FRepQuaAuxQty / row.FQTY;
			//return ["<div class='progress'> <div class='progress-bar' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width:" + res.toFixed(2) + "%'>" + res.toFixed(2) + "</div> </div>"];
			return "<div class='w40 div_co pw'><div class='PA' style='text-align:right;color:#4b2dba;float:right;height:20px;line-height:25px'>" + res.toFixed(2) + "%</div><div class='progress' style='margin-top:4px;'><div class='progress-bar progress-diy-info' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width:" + res.toFixed(2) + "%';text-align:center;'></div></div></div>";
			{ field: 'FBILLNO', title: '生产订单号', align: "left" },
			{ field: 'FNUMBER', title: '产品编码', align: "left" },
			{ field: 'FNAME', title: '产品名称', align: "left" },
			{
			field: 'FQTY', title: '任务数量', align: "left", width: 100, formatter: function (value, row, index) {
			return parseFloat(value).toFixed(2);
			}
			},
			{
			field: 'FRepQuaAuxQty', title: '完成数量', align: "left", width: 100, formatter: function (value, row, index) {
			return parseFloat(value).toFixed(2);
			}
			},
			{
			field: 'FSTOCKINQUAAUXQTY', title: '入库数量', align: "left", width: 100, formatter: function (value, row, index) {
			return parseFloat(value).toFixed(2);
			}
			},
			{
			field: 'FSTATUS', title: '状态', align: "left", width: 100, formatter: function (value, row, index) {
			switch (value) {
			case '1':
			return "计划";
			break;
			case '2':
			return "计划确认";
			break;
			case '3':
			return "下达";
			break;
			case '4':
			return "开工";
			break;
			case '5':
			return "完工";
			break;
			case '6':
			return "结案";
			default:

			}
			}
			},
			{
			field: 'Progress', title: '进度', align: "left", formatter: function (value, row, index) {
			var res = 100 * row.FRepQuaAuxQty / row.FQTY;
			//return ["<div class='progress'> <div class='progress-bar' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width:" + res.toFixed(2) + "%'>" + res.toFixed(2) + "</div> </div>"];
			return "<div class='w40 div_co pw'><div class='PA' style='text-align:right;color:#4b2dba;float:right;height:20px;line-height:25px'>" + res.toFixed(2) + "%</div><div class='progress' style='margin-top:4px;'><div class='progress-bar progress-diy-info' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width:" + res.toFixed(2) + "%';text-align:center;'></div></div></div>";
			}
			}
			],
			onClickRow: function (row, $element) {


			},
			onCheck: function (row, $element) {


			},
			onLoadSuccess: function (row) {
			var a = $('#tb_order').bootstrapTable('getSelections');
			}


			})
			}
			//得到查询的参数
			@@ -860,7 +860,7 @@
			<li id="point">:</li>
			<li id="sec"> </li>
			</ul>


			</div>
			<div class="col-sm-8">
			<div class="col-sm-7">
			@@ -868,7 +868,7 @@
			</div>
			<div class="col-sm-3">
			<ul id="cList">
			<li>本线状态：<span id="LineStus">执行中</span></li>
			<li>本线状态：<span id="LineStus">执行中aa</span></li>
			<li>总订单：<span id="OrderQty">0</span></li>
			<li>已入库：<span id="OrderInQty">0</span></li>
			<li>返工数：<span id="FGQty">0</span></li>
			@@ -877,9 +877,9 @@
			<li>当前物料名称：<span id="PartName"></span></li>
			<li>当前规格：<span id="PartSpec"></span></li>
			<li>今日总汇报：<span id="SumDay">0</span></li>






			</ul>
			</div>
			<div class="col-sm-2">