javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -164,13 +164,29 @@ String ids = projects.get(i).getIds(); Double val = holeMap.get(ids); vo = new ProjectProcessVO(); vo.setIds(projects.get(i).getIds()); vo.setRanking(i + 1); vo.setStation(projects.get(i).getCode()); vo.setStation(projects.get(i).getFullName()); vo.setValue(val); vo.setLng(projects.get(i).getLng()); vo.setLat(projects.get(i).getLat()); if (val == null) { vo.setValue(0.0d); } vo.setStatus(projects.get(i).getStatus()); String []statusName ={"协调中","待开工","进行中"}; String status = projects.get(i).getStatus(); if(status.equals("0")){ vo.setStatus(statusName[0]); }else if(status.equals("1")){ vo.setStatus(statusName[1]); }else if(status.equals("2")){ vo.setStatus(statusName[2]); }else{ vo.setStatus("未知"); } vos.add(vo); } } javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -14,6 +14,9 @@ width: 100%; background-color: rgba(0,0,0,0.01) !important; } [v-cloak]{ display: none; } .el-card__header{ height: 40px; padding: 8px 20px; @@ -24,7 +27,19 @@ border-radius: 50%; font-size: 14px; color: white; background: #314659; background: #F56C6C; text-align: center; line-height: 20px; float: left; } .active-yellow{ width: 20px; height: 20px; border-radius: 50%; font-size: 14px; color: white; background: #E6A23C; text-align: center; line-height: 20px; float: left; @@ -34,9 +49,9 @@ width: 20px; height: 20px; border-radius: 50%; font-size: 16px; font-size: 14px; color: white; background: dodgerblue; background: #67C23A; text-align: center; line-height: 20px; float: left; @@ -62,14 +77,15 @@ } .rankrow{ margin-top: 12px; cursor: pointer; } </style> </head> <body class="gray-bg"> <div class="content" id="app"> <el-row style="height: 130px;"> <div class="content" id="app" v-cloak> <el-row style="height: 127px;"> <el-col :span="6"> <el-card class="box-card"> <div> @@ -82,15 +98,15 @@ </div> <div> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 协调中 协调中 {{indexDataCount.projectStatus0}} <li class="el-icon-caret-bottom" style="color: #f56c6c"> </span> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 待开工 34 待开工 {{indexDataCount.projectStatus1}} <li class="el-icon-caret-bottom" style="color: #e6a23c"> </span> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 进行中 0 进行中 {{indexDataCount.projectStatus2}} <li class="el-icon-caret-top" style="color: #409eff"> </span> @@ -110,11 +126,11 @@ </div> <div> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 总进尺 134,1000.00m 总进尺 {{indexDataCount.footageCount}}m <li class="el-icon-caret-bottom" style="color: #f56c6c"> </span> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 已完成 12,322.23m 已完成 {{indexDataCount.footageCplCount}}m <li class="el-icon-caret-bottom" style="color: #409eff"> </span> </div> @@ -150,16 +166,21 @@ <li class="el-icon-s-order" style="font-size: 18px;float: right;color: grey"> </div> <div> <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">3813 <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px"> {{indexDataCount.fileCount}}件 </span> </div> <div> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 总进尺 134,1000.00m 施工资料 0 <li class="el-icon-caret-bottom" style="color: #f56c6c"> </span> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 已完成 12,322.23m 安全资料 0 <li class="el-icon-caret-bottom" style="color: #409eff"> </span> <span style="color:rgba(0,0,0,.65);font-size: 15px;"> 质量资料 0 <li class="el-icon-caret-bottom" style="color: #409eff"> </span> </div> @@ -175,7 +196,7 @@ </div> </el-card> <el-card class="box-card"> <el-card class="box-card" style="margin-top: 4px;"> <div id="map_div" style="width: 100%;height: 550px;"></div> </el-card> @@ -189,29 +210,34 @@ <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div> </el-card> <el-card class="box-card"> <div style="width: 100%;height: 20px;"> <el-card class="box-card" style="margin-top: 4px;"> <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;"> <h3>场地详细进度(%)</h3> </div> <div style="width: 100%;height: 500px;overflow: auto"> <!-- <el-row class="rankrow" v-for='entity in stationProcessData'>--> <!-- <el-col :span="2">--> <!-- <div class="active-red">{{entity.ranking}}</div>--> <!-- </el-col>--> <el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'> <el-col :span="2" > <div v-if="entity.status=='协调中'" class="active-red">{{entity.ranking}}</div> <div v-if="entity.status=='待开工'" class="active-yellow">{{entity.ranking}}</div> <div v-if="entity.status=='进行中'" class="active-blue">{{entity.ranking}}</div> <!-- <el-col :span="4">--> <!-- <div style="font-size: 16px">{{entity.station}}</div>--> <!-- </el-col >--> </el-col> <!-- <el-col :span="4">--> <!-- <div style="font-size: 16px">{{entity.status}}</div>--> <!-- </el-col>--> <el-col :span="7"> <div style="font-size: 16px">{{entity.station}}</div> </el-col > <!-- <el-col :span="12">--> <!-- <div><el-progress :stroke-width="12" :percentage="{{entity.status}}"></el-progress></div>--> <!-- </el-col>--> <!-- </el-row>--> <el-col :span="5"> <div style="font-size: 16px">{{entity.status}}</div> </el-col> <el-col :span="8"> <div> <el-progress :stroke-width="10" :percentage="entity.value"></el-progress> </div> </el-col> </el-row> </div> @@ -244,26 +270,29 @@ loadMap(); getReallyData(); totalProcess(); //stationProcess(); stationProcess(); indexCount(); }) function viewStation(station) { var lng = station.lng; var lat = station.lat; map.centerAndZoom(new T.LngLat(lng, lat), 13); // $.modal.openTab("场地导航",ctx+"/geo/project/navigate?ids="+id); } function indexCount() { let url = ctx + "/system/indexDataCount"; $.ajaxSettings.async = false; $.get(url,{},function(res){ console.log(res); //vm.indexDataCount = res.projectData; vm.indexDataCount = res.data; }) $.ajaxSettings.async = false; console.log(vm.stationProcessData); } function stationProcess() { let url = ctx + "/system/projectProcess"; $.ajaxSettings.async = false; $.get(url,{},function(res){ console.log(res.projectData); vm.stationProcessData = res.projectData; }) $.ajaxSettings.async = false; javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/vo/ProjectProcessVO.java
@@ -5,12 +5,39 @@ */ public class ProjectProcessVO { private String ids; private Integer ranking; private String station; private Double value; private String status; private Double lng; private Double lat; public String getIds() { return ids; } public void setIds(String ids) { this.ids = ids; } public Double getLng() { return lng; } public void setLng(Double lng) { this.lng = lng; } public Double getLat() { return lat; } public void setLat(Double lat) { this.lat = lat; } public Integer getRanking() { return ranking; } javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
@@ -13,19 +13,19 @@ </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">名称：</label> <label class="col-sm-3 control-label">设备名称：</label> <div class="col-sm-8"> <input name="deviceName" class="form-control" type="text"> <input name="deviceName" class="form-control" required type="text" placeholder="请填写设备名称"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">类型：</label> <div class="col-sm-8"> <select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select> </div> </div> <!-- <div class="form-group"> --> <!-- <label class="col-sm-3 control-label">类型：</label>--> <!-- <div class="col-sm-8">--> <!-- <select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}">--> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>--> <!-- </select>--> <!-- </div>--> <!-- </div>--> <div class="form-group"> <label class="col-sm-3 control-label">入库时间：</label> <div class="col-sm-8"> @@ -53,7 +53,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">出入库数量：</label> <div class="col-sm-8"> <input name="number" class="form-control" type="text"> <input name="number" required class="form-control" type="text" placeholder="请填写出入库数量"> </div> </div> <div class="form-group"> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
@@ -18,13 +18,7 @@ <p>名称：</p> <input type="text" name="deviceName"/> </li> <li> <p>类型：</p> <select name="type" th:with="type=${@dict.getType('device_log_type')}"> <option value="">所有</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select> </li> <li> <p>经办人：</p> <input type="text" name="optUser"/> @@ -94,11 +88,7 @@ title : '工单号', sortable:true }, { field : 'projectName', title : '场地名称', visible: false }, { field : 'deviceCode', title : '编号', @@ -108,14 +98,7 @@ field : 'deviceName', title : '名称' }, { field : 'type', title : '设备/材料', sortable:true, formatter: function(value, row, index) { return $.table.selectDictLabel(typeDatas, value); } }, { field : 'inboundDate', title : '入库时间', javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
@@ -14,19 +14,19 @@ </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">名称：</label> <label class="col-sm-3 control-label">设备名称：</label> <div class="col-sm-8"> <input name="deviceName" th:field="*{deviceName}" class="form-control" type="text"> <input name="deviceName" th:field="*{deviceName}" class="form-control" type="text" placeholder="请填写设备名称"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">类型：</label> <div class="col-sm-8"> <select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option> </select> </div> </div> <!-- <div class="form-group"> --> <!-- <label class="col-sm-3 control-label">类型：</label>--> <!-- <div class="col-sm-8">--> <!-- <select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}">--> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>--> <!-- </select>--> <!-- </div>--> <!-- </div>--> <div class="form-group"> <label class="col-sm-3 control-label">入库时间：</label> <div class="col-sm-8"> @@ -54,7 +54,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">出入库数量：</label> <div class="col-sm-8"> <input name="number" th:field="*{number}" class="form-control" type="text"> <input name="number" th:field="*{number}" class="form-control" type="text" placeholder="请填写出入库数量"> </div> </div> <div class="form-group"> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -41,7 +41,7 @@ </div> <div class="box-header "> <div class="box-title"> <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/deviceLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">进出库管理</a> <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/deviceLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">设备管理</a> </div> </div> <div class="box-header ">
