dkyChenJiang.git

			@@ -85,7 +85,7 @@
			padding: 0 40px;
			align-content: center;
			}
			.ilblock span{
			.ilblock>span{
			display: block;
			line-height: 30px;
			}
			@@ -150,19 +150,18 @@
			</div>

			<div style="flex:6;" class="ilblock">
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			协调中
			<span style="float: right">
			{{indexDataCount.projectStatus0}}
			</span>
			<span style="float: right">{{indexDataCount.projectStatus0}}</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->

			</span>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			待开工
			<span style="float: right">{{indexDataCount.projectStatus1}}</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
			</span>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			进行中
			<span style="float: right">{{indexDataCount.projectStatus2}}</span>
			<!-- <li class="el-icon-caret-top" style="color: #409eff">-->
			@@ -186,11 +185,11 @@
			</div>

			<div style="flex:6;" class="ilblock">
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			总进尺 <span style="float: right">{{indexDataCount.footageCount}}m</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
			</span>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			已完成 <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
			</span>
			@@ -215,12 +214,12 @@
			<div>

			</div>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			已安装 <span style="float: right">0</span>
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			已安装 <span style="float: right">{{indexDataCount.cameraCount}}</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
			</span>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			未安装 <span style="float: right">68</span>
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			未安装 <span style="float: right">{{indexDataCount.cameraCountNaN}}</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
			</span>
			</div>
			@@ -241,15 +240,15 @@
			</div>

			<div style="flex:6;" class="ilblock">
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			施工资料 <span style="float: right">0</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
			</span>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			安全资料 <span style="float: right">0</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
			</span>
			<span style="color:rgba(0,0,0,.65);font-size: 15px;">
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			质量资料 <span style="float: right">0</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
			</span>
			@@ -264,26 +263,29 @@
			<div style="height: 200px;width: 100%;">
			<h3>材料统计</h3>
			<el-col :span="10" style="height: 200px;">
			<template>
			<el-table :data="tubLogs" border size="small" style="width: 100%"
			:header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
			:row-class-name="tableRowClassName">
			<!-- <el-table-column prop="code" label="序号"></el-table-column>-->
			<el-table-column prop="tubName" label="名称"></el-table-column>
			<el-table-column prop="inboundNumber" label="入库数量"></el-table-column>
			<el-table-column prop="outboundNumber" label="出库数量"></el-table-column>
			<el-table-column prop="unit" label="单位"></el-table-column>
			<div style="margin-top: 15px">
			<template>
			<el-table :data="tubLogs" border size="small" style="width: 100%"
			:header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
			:row-class-name="tableRowClassName">
			<!-- <el-table-column prop="code" label="序号"></el-table-column>-->
			<el-table-column prop="tubName" label="名称"></el-table-column>
			<el-table-column prop="inboundNumber" label="入库数量"></el-table-column>
			<el-table-column prop="outboundNumber" label="出库数量"></el-table-column>
			<el-table-column prop="unit" label="单位"></el-table-column>

			</el-table>
			</template>
			</el-table>
			</template>
			</div>
			</el-col>
			<el-col :span="14" style="height: 200px;">
			<div id="column-chart" style="height: 180px; width: 100%;"></div>
			</el-col>
			</div>
			</el-card>

			<el-card class="box-card" style="margin-top: 20px;">
			<div id="map_div" style="width: 100%;height: 550px;"></div>
			<div id="map_div" style="width: 100%;height: 550px;margin-top: -5px"></div>
			</el-card>

			</el-col>
			@@ -292,7 +294,7 @@
			<el-card class="box-card">
			<div style="height: 200px;width: 100%">
			<div style="width: 100%;height: 20px;">
			<h3>项目总体进度2(%)</h3>
			<h3>项目总体进度(%)</h3>
			</div>
			<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
			</div>
			@@ -371,35 +373,101 @@
			}

			function tubLogs() {
			let url = ctx + "/system/tubLogData";

			const chart = echarts.init(document.getElementById("column-chart"));
			const option = {
			tooltip: {
			trigger: 'axis',
			axisPointer: {
			type: 'shadow'
			}
			},
			legend: {},
			grid: {
			left: '3%',
			right: '4%',
			bottom: '3%',
			containLabel: true
			},
			xAxis: [
			{
			type: 'category',
			data: []
			}
			],
			yAxis: [
			{
			type: 'value'
			}
			],
			series: [
			{
			name: '出库',
			type: 'bar',
			emphasis: {
			focus: 'series'
			},
			data: [],
			itemStyle: {
			// 修改柱子的颜色
			color: '#e2b507'
			}
			},
			{
			name: '入库',
			type: 'bar',
			stack: 'Ad',
			emphasis: {
			focus: 'series'
			},
			data: [],
			itemStyle: {
			// 修改柱子的颜色
			color: '#2992c6'
			}
			},

			]
			};

			let url = ctx + "/system/stat/tubLogData";
			$.ajaxSettings.async = false;
			$.get(url,{},function(res){
			vm.tubLogs = res.tubLogs;

			res.tubLogs.forEach(function(value, index, array) {
			const tubName = value.tubName;
			const inboundNumber = value.inboundNumber;
			const outboundNumber = value.outboundNumber;
			const unit = value.unit;
			option.xAxis[0].data[index] = tubName;
			option.series[0].data[index] = outboundNumber;
			option.series[1].data[index] = inboundNumber;
			});
			chart.setOption(option, true);
			})
			$.ajaxSettings.async = false;
			console.log(vm.tubLogs);
			}

			//首页第一行个数统计
			function indexCount() {
			let url = ctx + "/system/indexDataCount";
			let url = ctx + "/system/stat/indexDataCount";
			$.ajaxSettings.async = false;
			$.get(url,{},function(res){
			vm.indexDataCount = res.data;
			vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
			})
			$.ajaxSettings.async = false;

			}
			//场地进度
			function stationProcess() {
			let url = ctx + "/system/projectProcess";
			let url = ctx + "/system/stat/projectProcess";
			$.ajaxSettings.async = false;
			$.get(url,{},function(res){
			vm.stationProcessData = res.projectData;
			})
			$.ajaxSettings.async = false;
			console.log(vm.stationProcessData);

			}
			var vm = new Vue({
			el: "#app",
			@@ -483,7 +551,7 @@

			// 获取数据库真实数据
			function getReallyData() {
			let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
			let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/stat/project";
			$.get(url,function(res){
			var data = res.projects;
			showProjectPoint(data);
			@@ -539,11 +607,12 @@
			map.openInfoWindow(markerInfoWin, point); //开启信息窗口
			}


			//总进度仪表盘
			function totalProcess() {
			var Chart1 = echarts.init(document.getElementById('Chart1'));
			var pointerData = 0; // 仪表指针数据
			let url = ctx + "/system/totalProcess";
			let url = ctx + "/system/stat/totalProcess";
			$.ajaxSettings.async = false;
			$.get(url,{},function(res){
			pointerData = res.pointerData;