首页及后台
This commit is contained in:
parent
c147641d4b
commit
e2e54fb558
|
|
@ -31,7 +31,6 @@ public class HomeController {
|
|||
private HomeService service;
|
||||
|
||||
@PostMapping(value = "getApprovalNum")
|
||||
@DecryptAndVerify(decryptedClass = ToolsManageDto.class)
|
||||
public Map<String,Object> getApprovalNum(HomeVo vo) {
|
||||
Map<String,Object> map=new HashMap<>();
|
||||
try{
|
||||
|
|
|
|||
|
|
@ -80,4 +80,6 @@ public class HomeVo {
|
|||
* 合作时间
|
||||
*/
|
||||
private String cooperateDate;
|
||||
|
||||
private String updateDate;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ server.servlet.context-path=/szgqj
|
|||
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=bonus@admin123
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.7:13306/sz_aqgqj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Bonus@admin123!
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/sz_aqgqj ?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
spring.datasource.url=jdbc:mysql://192.168.0.7:13306/sz_aqgqj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=jsk@131551
|
||||
spring.datasource.password=Bonus@admin123!
|
||||
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/sz_aqgqj ?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=jsk@131551
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.14:2000/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=zhly@mysql14!
|
||||
|
|
@ -67,7 +67,7 @@ token.expire.seconds=7200
|
|||
spring.servlet.multipart.enabled=true
|
||||
|
||||
#\u662F\u5426\u5F00\u542F\u5B89\u5168\u6A21\u5F0F
|
||||
zhly.aq.enable=true
|
||||
zhly.aq.enable=false
|
||||
#\u6587\u4EF6\u8FC7\u6EE4
|
||||
zhly.aq.file.suffix=woff,js,css,html,woff2,lang,map,png,jpg
|
||||
#\u9759\u6001\u8D44\u6E90 \u4E0D\u62E6\u622A
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.aqgqj.basis.dao.HomeDao">
|
||||
<select id="getApprovalNum" parameterType="com.bonus.aqgqj.basis.entity.vo.HomeVo" resultType="com.bonus.aqgqj.basis.entity.vo.HomeVo">
|
||||
select
|
||||
sum(case when team_id is null then 0 else 1 end ) as dispatchWorkNum
|
||||
,sum(case when team_id is not null and process_status is null then 1 else 0 end ) as testNum
|
||||
,sum(case when process_status='1' and remarks is not null then 1 else 0 end ) as reloadReviewNUm
|
||||
,sum(case when process_status='1' and remarks is null then 1 else 0 end ) as reviewNUm
|
||||
,sum(case when process_status='2' then 1 else 0 end ) as examineNum
|
||||
,sum(case when process_status='3' then 1 else 0 end ) as approvalNum
|
||||
,DATE_FORMAT(NOW(), '%Y-%m-%d') as updateDate
|
||||
from (
|
||||
select * from tb_sample where del_flag='0'
|
||||
) ts
|
||||
</select>
|
||||
<select id="getATeamNumForEcharts" parameterType="com.bonus.aqgqj.basis.entity.vo.HomeVo" resultType="com.bonus.aqgqj.basis.entity.vo.HomeVo">
|
||||
select tt.team_name as teamName,ts.id,DATE_FORMAT(ts.dispatch_time, '%Y-%m-%d') as testData from tb_sample ts
|
||||
where ts.del_flag='0'
|
||||
</select>
|
||||
<select id="getATeamCostForEcharts" parameterType="com.bonus.aqgqj.basis.entity.vo.HomeVo" resultType="com.bonus.aqgqj.basis.entity.vo.HomeVo">
|
||||
select
|
||||
teamName,sum(amount) as testCost
|
||||
from (
|
||||
select tt.team_name as teamName,ts.id,teis.amount from tb_exper te
|
||||
left join tb_sample ts on te.sample_id=ts.id
|
||||
left join tb_team tt on ts.team_id=tt.id
|
||||
left join tb_exper_items teis on te.id=teis.exper_id
|
||||
where ts.del_flag='0'
|
||||
) aa group by teamName
|
||||
</select>
|
||||
<select id="getCostRank" parameterType="com.bonus.aqgqj.basis.entity.vo.HomeVo" resultType="com.bonus.aqgqj.basis.entity.vo.HomeVo">
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -6,11 +6,41 @@ layui.use(['form', 'layer', 'table', 'laydate','carousel','util'], function () {
|
|||
carousel = layui.carousel;
|
||||
util=layui.util;
|
||||
console.log("测试")
|
||||
initApproe();
|
||||
echartsone();
|
||||
echartstwo();
|
||||
iniTable();
|
||||
// layui-table-body
|
||||
})
|
||||
function initApproe(){
|
||||
var dispatchWorkNum=0;
|
||||
var testNum =0;
|
||||
var reloadReviewNUm=0;
|
||||
var reviewNUm =0;
|
||||
var examineNum =0;
|
||||
var approvalNum =0;
|
||||
var objs=$(".updateDate");
|
||||
$.each(objs, function (index, item) {
|
||||
$(item).html("2024-07-26")
|
||||
})
|
||||
$.ajax({
|
||||
url: dataUrl + "/home/getApprovalNum",
|
||||
headers: {
|
||||
"token": tokens
|
||||
},
|
||||
type: 'POST',
|
||||
async: true,
|
||||
success: function (result) {
|
||||
if (result.code === 200) {
|
||||
if (result.data) {
|
||||
|
||||
}
|
||||
}
|
||||
}, error: function (xhr) {
|
||||
// error(xhr);
|
||||
}
|
||||
});
|
||||
}
|
||||
var data=[{"numbers":1,"username":"测试","fee":"测试","dingdan":"测试","name":"测试","phone":"测试","gettime":"测试"}
|
||||
,{"numbers":2,"username":"测试","fee":"测试","dingdan":"测试","name":"测试","phone":"测试","gettime":"测试"}
|
||||
,{"numbers":3,"username":"测试","fee":"测试","dingdan":"测试","name":"测试","phone":"测试","gettime":"测试"}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
var ctxPath = getContextPath();
|
||||
let aqEnnable = true;//是否开启安全验证
|
||||
let aqEnnable = false;//是否开启安全验证
|
||||
// console.log(ctxPath)
|
||||
var url=window.location.href;
|
||||
// console.log(url)
|
||||
|
|
|
|||
|
|
@ -38,22 +38,22 @@
|
|||
<td>
|
||||
<div class="daiban">
|
||||
<div><span>待派工</span></div>
|
||||
<div><span>24</span></div>
|
||||
<div><span>更新至</span><span>2024-07-18</span></div>
|
||||
<div><span id="dispatchWorkNum">0</span></div>
|
||||
<div><span>更新至</span><span class="updateDate">2024-07-18</span></div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="daiban">
|
||||
<div><span>待试验</span></div>
|
||||
<div><span>24</span></div>
|
||||
<div><span>更新至</span><span>2024-07-18</span></div>
|
||||
<div><span id="testNum">0</span></div>
|
||||
<div><span>更新至</span><span class="updateDate">2024-07-18</span></div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="daiban">
|
||||
<div><span>待重新审阅</span></div>
|
||||
<div><span>24</span></div>
|
||||
<div><span>更新至</span><span>2024-07-18</span></div>
|
||||
<div><span id="reloadReviewNUm">0</span></div>
|
||||
<div><span>更新至</span><span class="updateDate">2024-07-18</span></div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -61,22 +61,22 @@
|
|||
<td>
|
||||
<div class="daiban">
|
||||
<div><span>待审阅</span></div>
|
||||
<div><span>24</span></div>
|
||||
<div><span>更新至</span><span>2024-07-18</span></div>
|
||||
<div><span id="reviewNUm">0</span></div>
|
||||
<div><span>更新至</span><span class="updateDate">2024-07-18</span></div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="daiban">
|
||||
<div><span>待审核</span></div>
|
||||
<div><span>24</span></div>
|
||||
<div><span>更新至</span><span>2024-07-18</span></div>
|
||||
<div><span id="examineNum">0</span></div>
|
||||
<div><span>更新至</span><span class="updateDate">2024-07-18</span></div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="daiban">
|
||||
<div><span>待审批</span></div>
|
||||
<div><span>24</span></div>
|
||||
<div><span>更新至</span><span>2024-07-18</span></div>
|
||||
<div><span id="approvalNum">0</span></div>
|
||||
<div><span>更新至</span><span class="updateDate">2024-07-18</span></div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
<!--<script type="text/javascript" src="../../../js/jq.js"></script>-->
|
||||
<!--<script type="text/javascript" src="../../../js/my/permission.js"></script>-->
|
||||
<script type="text/javascript" src="../../js/layui-v2.6.8/layui.js"></script>
|
||||
<!--<script type="text/javascript" src="../../../js/publicJs.js"></script>-->
|
||||
<script type="text/javascript" src="../../js/publicJs.js"></script>
|
||||
<script type="text/javascript" src="../../js/libs/echarts.js"></script>
|
||||
<script type="text/javascript" src="../../js/home/home.js"></script>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue