dkyChenJiang.git

			@@ -219,7 +219,7 @@
			<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
			</span>
			<span style="color:rgba(0,0,0,.87);font-size: 15px;">
			未安装 <span style="float: right">68</span>
			未安装 <span style="float: right">{{indexDataCount.cameraCountNaN}}</span>
			<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
			</span>
			</div>
			@@ -294,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>
			@@ -455,6 +455,7 @@
			$.ajaxSettings.async = false;
			$.get(url,{},function(res){
			vm.indexDataCount = res.data;
			vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
			})
			$.ajaxSettings.async = false;

			@@ -162,7 +162,7 @@
			<el-row style="height: 200px;">
			<el-col :span="24">

			<el-card class="box-card card-green" style="height: 320px;margin-top: 20px">
			<el-card class="box-card card-yellow" style="height: 320px;margin-top: 20px">
			<div slot="header" class="clearfix">
			<span>材料统计</span>
			</div>
			@@ -182,26 +182,6 @@
			<div id="column-chart" style="height: 250px; width: 100%;"></div>
			</el-col>
			</el-card>
			<!-- <el-card class="box-card card-green" style="height: 320px;margin-top: 20px">-->
			<!-- <div slot="header" class="clearfix">-->
			<!-- <span>材料信息</span>-->
			<!-- </div>-->
			<!-- <div>-->
			<!-- <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>-->
			<!-- </div>-->
			<!-- </el-card>-->



			</el-col>
			@@ -232,8 +212,7 @@
			var url2 = prefix + "/holeProcess?projectId=" + projectId;
			$.ajaxSettings.async = false;
			$.get(url2,{},function(res){
			vm.holeProcess = (res.data*100).toFixed(0);
			alert(vm.holeProcess);
			vm.holeProcess = res.data==null ? 0 :(res.data*100).toFixed(0);
			});

			tubLogs();

			@@ -101,13 +101,9 @@
			field : 'leader',
			title : '场地负责人'
			},
			{
			field : 'createTime',
			title : '创建时间'
			},
			{
			field : 'status',
			title : '项目状态',
			title : '场地状态',
			formatter: function(value, row, index) {
			return $.table.selectDictLabel(statusDatas, value);
			}

	javaweb-plus/javaweb-admin/src/main/resources/templates/main.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史