提交代码
姜玉琦
parent
ea16bd847c
commit
9155b554da
|
|
@ -366,11 +366,12 @@ export default {
|
||||||
daysTrendView() {
|
daysTrendView() {
|
||||||
this.$api.aiWarning.getDaysTrendView(this.selProject.id).then((response) => {
|
this.$api.aiWarning.getDaysTrendView(this.selProject.id).then((response) => {
|
||||||
if (response.data) {
|
if (response.data) {
|
||||||
|
response.data.reverse();
|
||||||
let _data1 = [];
|
let _data1 = [];
|
||||||
let _date8 = [];
|
let _date8 = [];
|
||||||
response.data.forEach((datum) => {
|
response.data.forEach((datum) => {
|
||||||
_data1.push(datum.total);
|
_data1.push(datum.total);
|
||||||
_date8.push(datum.dayStr);
|
_date8.push(datum.create_time);
|
||||||
});
|
});
|
||||||
let _lineData = [];
|
let _lineData = [];
|
||||||
_lineData.push(_data1);
|
_lineData.push(_data1);
|
||||||
|
|
|
||||||
|
|
@ -105,36 +105,9 @@
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-list-data">
|
<div class="equipment-list-data">
|
||||||
<p style="font-size: 12px">任务数</p>
|
<p style="font-size: 12px">{{ overviewDatas[0].name }}</p>
|
||||||
<div><span style="font-size: 12px">1</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<div class="equipment-list-min1 quality-target-index-min">
|
|
||||||
<div class="czz-number-img czz-number-img-green">
|
|
||||||
<svg
|
|
||||||
class="my-svg-icon-green"
|
|
||||||
style="
|
|
||||||
vertical-align: middle;
|
|
||||||
fill: currentColor;
|
|
||||||
overflow: hidden;
|
|
||||||
"
|
|
||||||
viewBox="0 0 1024 1024"
|
|
||||||
version="1.1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
p-id="7849"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M896 64H128c-35.296 0-64 28.704-64 64v768c0 35.296 28.704 64 64 64h592a32 32 0 1 0 0-64H128V128h768v592a32 32 0 1 0 64 0V128c0-35.296-28.704-64-64-64zM791.744 746.496A206.752 206.752 0 0 0 832 624c0-114.688-93.312-208-208-208S416 509.312 416 624s93.312 208 208 208a206.752 206.752 0 0 0 122.496-40.256l110.88 110.88a31.904 31.904 0 0 0 45.248 0 31.968 31.968 0 0 0 0-45.248l-110.88-110.88zM480 624c0-79.392 64.608-144 144-144s144 64.608 144 144-64.608 144-144 144-144-64.608-144-144zM800 264a32 32 0 0 0-32-32H256a32 32 0 0 0 0 64h512a32 32 0 0 0 32-32zM256 422.656a32 32 0 0 0 0 64h96a32 32 0 0 0 0-64H256z"
|
|
||||||
p-id="7850"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div class="equipment-list-data">
|
|
||||||
<p style="font-size: 12px">已完成</p>
|
|
||||||
<div>
|
<div>
|
||||||
<span style="font-size: 12px">2</span>
|
<span style="font-size: 12px">{{ overviewDatas[0].value }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -161,9 +134,38 @@
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-list-data">
|
<div class="equipment-list-data">
|
||||||
<p style="font-size: 12px">完成率</p>
|
<p style="font-size: 12px">{{ overviewDatas[1].name }}</p>
|
||||||
<div>
|
<div>
|
||||||
<span>3</span>
|
<span style="font-size: 12px">{{ overviewDatas[1].value }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<div class="equipment-list-min1 quality-target-index-min">
|
||||||
|
<div class="czz-number-img czz-number-img-green">
|
||||||
|
<svg
|
||||||
|
class="my-svg-icon-green"
|
||||||
|
style="
|
||||||
|
vertical-align: middle;
|
||||||
|
fill: currentColor;
|
||||||
|
overflow: hidden;
|
||||||
|
"
|
||||||
|
viewBox="0 0 1024 1024"
|
||||||
|
version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
p-id="7849"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M896 64H128c-35.296 0-64 28.704-64 64v768c0 35.296 28.704 64 64 64h592a32 32 0 1 0 0-64H128V128h768v592a32 32 0 1 0 64 0V128c0-35.296-28.704-64-64-64zM791.744 746.496A206.752 206.752 0 0 0 832 624c0-114.688-93.312-208-208-208S416 509.312 416 624s93.312 208 208 208a206.752 206.752 0 0 0 122.496-40.256l110.88 110.88a31.904 31.904 0 0 0 45.248 0 31.968 31.968 0 0 0 0-45.248l-110.88-110.88zM480 624c0-79.392 64.608-144 144-144s144 64.608 144 144-64.608 144-144 144-144-64.608-144-144zM800 264a32 32 0 0 0-32-32H256a32 32 0 0 0 0 64h512a32 32 0 0 0 32-32zM256 422.656a32 32 0 0 0 0 64h96a32 32 0 0 0 0-64H256z"
|
||||||
|
p-id="7850"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div class="equipment-list-data">
|
||||||
|
<p style="font-size: 12px">{{ overviewDatas[2].name }}</p>
|
||||||
|
<div>
|
||||||
|
<span>{{ overviewDatas[2].value }}</span>
|
||||||
<span style="font-size: 12px">%</span>
|
<span style="font-size: 12px">%</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -192,42 +194,9 @@
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-list-data">
|
<div class="equipment-list-data">
|
||||||
<p>进行中</p>
|
<p>{{ overviewDatas[3].name }}</p>
|
||||||
<div><span style="font-size: 12px">4</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<div class="equipment-list-min1 quality-target-index-min">
|
|
||||||
<div class="czz-number-img czz-number-img-green">
|
|
||||||
<svg
|
|
||||||
class="my-svg-icon-green"
|
|
||||||
style="
|
|
||||||
vertical-align: middle;
|
|
||||||
fill: currentColor;
|
|
||||||
overflow: hidden;
|
|
||||||
"
|
|
||||||
viewBox="0 0 1024 1024"
|
|
||||||
version="1.1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
p-id="8279"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M855.13728 187.4176c-105.97376 0-209.34656-36.9152-291.08736-103.936l-40.9344-33.56672-40.94976 33.56672c-81.77152 67.01568-185.15456 103.936-291.09248 103.936H126.49984V622.83264l4.95104 11.90912c67.33824 161.82784 206.54592 289.3824 372.38272 341.2224l19.08224 5.96992 19.11808-5.86752c170.07616-52.16768 305.99168-176.79872 372.92032-341.89824l4.62848-11.43808 0.08704-12.34944 0.03072-3.27168V187.4176h-64.5632z m0 419.22048l-0.03072 3.26144c-58.8544 145.21856-180.87424 258.06848-332.00128 304.44032-148.33664-46.39232-272.86528-162.24256-332.032-304.4096V252.0064c125.99296 0 241.62304-44.46208 332.032-118.56896C613.50912 207.5648 729.088 252.0064 855.13728 252.0064v354.63168z"
|
|
||||||
fill=""
|
|
||||||
p-id="8280"
|
|
||||||
></path>
|
|
||||||
<path
|
|
||||||
d="M400.47616 304.95232c57.68192 2.5856 87.78752 39.74656 90.368 111.5136-2.58048 70.50752-33.97632 107.0336-94.21312 109.5936-55.12192-3.85024-84.59264-40.37632-88.43776-109.5936 2.55488-71.76704 33.31584-108.928 92.28288-111.5136z m-1.92 174.96064c26.91584-1.25952 41.0112-23.07072 42.30144-65.37216-1.29024-42.29632-14.7456-64.08192-40.37632-65.37216-28.20608 0-42.29632 22.44096-42.29632 67.29216 1.25952 39.75168 14.72 60.89728 40.3712 63.45216z m207.64672-174.96064h51.91168l-219.18208 417.21856H387.0208l219.18208-417.21856z m40.37632 199.95648c57.68192 2.5856 87.78752 40.37632 90.36288 113.4336-2.58048 66.6624-33.97632 101.23776-94.208 103.82336-56.41728-3.84512-85.88288-38.45632-88.44288-103.82336 2.56-71.77216 33.32096-109.58848 92.288-113.4336z m-1.92512 176.88576c25.63072-1.25952 39.0912-23.71072 40.38144-67.29728-1.29024-41.0112-14.12096-62.16192-38.45632-63.45216-26.91584 0-41.0368 21.81632-42.30144 65.37728 1.26976 41.0368 14.72512 62.81216 40.37632 65.37216z"
|
|
||||||
fill=""
|
|
||||||
p-id="8281"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div class="equipment-list-data">
|
|
||||||
<p>已滞后</p>
|
|
||||||
<div>
|
<div>
|
||||||
<span style="font-size: 12px">5</span>
|
<span style="font-size: 12px">{{ overviewDatas[3].value }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -260,9 +229,44 @@
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-list-data">
|
<div class="equipment-list-data">
|
||||||
<p>滞后率</p>
|
<p>{{ overviewDatas[4].name }}</p>
|
||||||
<div>
|
<div>
|
||||||
<span>6</span>
|
<span style="font-size: 12px">{{ overviewDatas[4].value }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<div class="equipment-list-min1 quality-target-index-min">
|
||||||
|
<div class="czz-number-img czz-number-img-green">
|
||||||
|
<svg
|
||||||
|
class="my-svg-icon-green"
|
||||||
|
style="
|
||||||
|
vertical-align: middle;
|
||||||
|
fill: currentColor;
|
||||||
|
overflow: hidden;
|
||||||
|
"
|
||||||
|
viewBox="0 0 1024 1024"
|
||||||
|
version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
p-id="8279"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M855.13728 187.4176c-105.97376 0-209.34656-36.9152-291.08736-103.936l-40.9344-33.56672-40.94976 33.56672c-81.77152 67.01568-185.15456 103.936-291.09248 103.936H126.49984V622.83264l4.95104 11.90912c67.33824 161.82784 206.54592 289.3824 372.38272 341.2224l19.08224 5.96992 19.11808-5.86752c170.07616-52.16768 305.99168-176.79872 372.92032-341.89824l4.62848-11.43808 0.08704-12.34944 0.03072-3.27168V187.4176h-64.5632z m0 419.22048l-0.03072 3.26144c-58.8544 145.21856-180.87424 258.06848-332.00128 304.44032-148.33664-46.39232-272.86528-162.24256-332.032-304.4096V252.0064c125.99296 0 241.62304-44.46208 332.032-118.56896C613.50912 207.5648 729.088 252.0064 855.13728 252.0064v354.63168z"
|
||||||
|
fill=""
|
||||||
|
p-id="8280"
|
||||||
|
></path>
|
||||||
|
<path
|
||||||
|
d="M400.47616 304.95232c57.68192 2.5856 87.78752 39.74656 90.368 111.5136-2.58048 70.50752-33.97632 107.0336-94.21312 109.5936-55.12192-3.85024-84.59264-40.37632-88.43776-109.5936 2.55488-71.76704 33.31584-108.928 92.28288-111.5136z m-1.92 174.96064c26.91584-1.25952 41.0112-23.07072 42.30144-65.37216-1.29024-42.29632-14.7456-64.08192-40.37632-65.37216-28.20608 0-42.29632 22.44096-42.29632 67.29216 1.25952 39.75168 14.72 60.89728 40.3712 63.45216z m207.64672-174.96064h51.91168l-219.18208 417.21856H387.0208l219.18208-417.21856z m40.37632 199.95648c57.68192 2.5856 87.78752 40.37632 90.36288 113.4336-2.58048 66.6624-33.97632 101.23776-94.208 103.82336-56.41728-3.84512-85.88288-38.45632-88.44288-103.82336 2.56-71.77216 33.32096-109.58848 92.288-113.4336z m-1.92512 176.88576c25.63072-1.25952 39.0912-23.71072 40.38144-67.29728-1.29024-41.0112-14.12096-62.16192-38.45632-63.45216-26.91584 0-41.0368 21.81632-42.30144 65.37728 1.26976 41.0368 14.72512 62.81216 40.37632 65.37216z"
|
||||||
|
fill=""
|
||||||
|
p-id="8281"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div class="equipment-list-data">
|
||||||
|
<p>{{ overviewDatas[5].name }}</p>
|
||||||
|
<div>
|
||||||
|
<span>{{ overviewDatas[5].value }}</span>
|
||||||
<span style="font-size: 12px">%</span>
|
<span style="font-size: 12px">%</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -421,10 +425,10 @@ export default {
|
||||||
value: ((_yzhjhs.length / res.data.length) * 100).toFixed(2),
|
value: ((_yzhjhs.length / res.data.length) * 100).toFixed(2),
|
||||||
});
|
});
|
||||||
this.overviewTask = [];
|
this.overviewTask = [];
|
||||||
(this.overviewJxzjh = _jxzjhs),
|
this.overviewJxzjh = _jxzjhs;
|
||||||
(this.overviewYwcjh = _ywcjhs),
|
this.overviewYwcjh = _ywcjhs;
|
||||||
(this.overviewYzhjh = _yzhjhs),
|
this.overviewYzhjh = _yzhjhs;
|
||||||
(this.overviewMonthjh = _nowMonth);
|
this.overviewMonthjh = _nowMonth;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
initScheduleNodes() {
|
initScheduleNodes() {
|
||||||
|
|
|
||||||
|
|
@ -142,6 +142,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
and is_del='0'
|
and is_del='0'
|
||||||
</where>
|
</where>
|
||||||
group by date(create_time)
|
group by date(create_time)
|
||||||
|
order by date(create_time) desc
|
||||||
|
limit 8
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="groupCountByAlarmType" parameterType="DevAiProjectData" resultType="map">
|
<select id="groupCountByAlarmType" parameterType="DevAiProjectData" resultType="map">
|
||||||
|
|
|
||||||
|
|
@ -112,21 +112,21 @@ public class DevAiProjectDataController extends BaseController
|
||||||
@GetMapping("/getDaysTrendView/{proId}")
|
@GetMapping("/getDaysTrendView/{proId}")
|
||||||
public AjaxResult getDaysTrendView(@PathVariable("proId") Long proId)
|
public AjaxResult getDaysTrendView(@PathVariable("proId") Long proId)
|
||||||
{
|
{
|
||||||
String key = "PUBLIC_AIBOX_listView::"+proId;
|
// String key = "PUBLIC_AIBOX_listView::"+proId;
|
||||||
Object obj = redisService.getCacheObject(key);
|
// Object obj = redisService.getCacheObject(key);
|
||||||
if(obj!=null){
|
// if(obj!=null){
|
||||||
return success(obj);
|
// return success(obj);
|
||||||
}
|
// }
|
||||||
DevAiProjectData dataQuery = new DevAiProjectData();
|
DevAiProjectData dataQuery = new DevAiProjectData();
|
||||||
dataQuery.setProjectId(proId);
|
dataQuery.setProjectId(proId);
|
||||||
// 获取当前日期
|
/**获取当前日期
|
||||||
LocalDate today = LocalDate.now();
|
LocalDate today = LocalDate.now();
|
||||||
// 获取最近${X}天的日期
|
// 获取最近${X}天的日期
|
||||||
LocalDate todayAgo = today.minusDays(7);
|
LocalDate todayAgo = today.minusDays(7);
|
||||||
Map<String, Object> params = new HashMap<>();
|
Map<String, Object> params = new HashMap<>();
|
||||||
params.put("beginTime",today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
params.put("beginTime",today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||||
params.put("endTime",todayAgo.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
params.put("endTime",todayAgo.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||||
dataQuery.setParams(params);
|
dataQuery.setParams(params);*/
|
||||||
List<Map<String, Object>> list = devAiProjectDataService.findDaysTrendView(dataQuery);
|
List<Map<String, Object>> list = devAiProjectDataService.findDaysTrendView(dataQuery);
|
||||||
/**List<Map<String, Object>> daysTrendList = new ArrayList<>();
|
/**List<Map<String, Object>> daysTrendList = new ArrayList<>();
|
||||||
for (LocalDate date = todayAgo; !date.isAfter(today); date = date.plusDays(1)) {
|
for (LocalDate date = todayAgo; !date.isAfter(today); date = date.plusDays(1)) {
|
||||||
|
|
@ -142,7 +142,7 @@ public class DevAiProjectDataController extends BaseController
|
||||||
date.put("total", _list.get(0).get("total"));
|
date.put("total", _list.get(0).get("total"));
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
redisService.setCacheObject(key, list, 2L, TimeUnit.MINUTES);
|
//redisService.setCacheObject(key, list, 2L, TimeUnit.MINUTES);
|
||||||
return success(list);
|
return success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue