From 29194b5f6962594884b7218756dc37db54ba0748 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 19:30:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
screen_standard/src/components/AppLayout.vue | 12 +++++++++---
screen_standard/src/router/index.js | 7 ++++---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 4 ++--
screen_standard/src/views/process.vue | 6 +++---
screen_standard/src/views/index.vue | 2 +-
server/src/main/resources/mappers/PlansExtMapper.xml | 4 ++--
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 10 +++++-----
7 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 06bde5d..d1df556 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -16,10 +16,10 @@
</template>
</el-dropdown>
- <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="router.go(-1)">
+ <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="back">
</div>
- <div class="title">{{ route.name=='home' ? 'DM浜戝伐鍘傝溅闂村ぇ灞�' : `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` }}</div>
+ <div class="title">{{ title }}</div>
<div class="header-item right">
<img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
@@ -84,7 +84,9 @@
const unqualifiedRate = computed(() => {
return enterprise.unqualifiedRate
})
-
+const title = computed(() => {
+ return enterprise.procedureName ? 'DM浜戝伐鍘傝溅闂村ぇ灞�' : `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘`
+})
const data = reactive({
tempCom: { name: '璞嗙背绉戞妧' },
isFull: false,
@@ -160,6 +162,10 @@
// console.log(date.getDay());
})
+const back = () => {
+ enterprise.setProcedureName('')
+ router.go(-1)
+}
</script>
<style lang="scss" scoped>
diff --git a/screen_standard/src/router/index.js b/screen_standard/src/router/index.js
index 59ce881..c756cb1 100644
--- a/screen_standard/src/router/index.js
+++ b/screen_standard/src/router/index.js
@@ -1,11 +1,12 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router'
import HomeView from '../views/HomeView.vue'
import indexView from '../views/index.vue'
import processView from '../views/process.vue'
-console.log(import.meta.env.VITE_BASE_CONTEXT);
+// console.log(import.meta.env.VITE_BASE_CONTEXT);
const router = createRouter({
- history: createWebHistory(import.meta.env.VITE_BASE_CONTEXT),
+ history: createWebHashHistory(import.meta.env.VITE_BASE_CONTEXT),
+ // history: createWebHistory(import.meta.env.VITE_BASE_CONTEXT),
routes: [
{
path: '/',
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 1d41ceb..5c46b9c 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -15,7 +15,7 @@
<div class="content_left_item1_content_row_line">
<el-progress
:show-text="false"
- :percentage="item.doneNum / baseNum * 100">
+ :percentage="item.doneNum / baseNum">
</el-progress>
</div>
<div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index 92ff35b..78f162f 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -86,7 +86,7 @@
<div class="scroll_item_row">{{ item.userName }}</div>
<div class="scroll_item_row">{{ item.materialName }}</div>
<div class="scroll_item_row">{{ item.materialCode }}</div>
- <div class="scroll_item_row">{{ item.createTime }}</div>
+ <div class="scroll_item_row" style="flex: 1.5;">{{ item.createTime }}</div>
<div class="scroll_item_row">{{ item.qualifiedNum }}</div>
<div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
<div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
@@ -142,7 +142,7 @@
]
})
-let { listData, top1, top2, baseNum, allBad } = toRefs(data)
+let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)
// start()
onBeforeUnmount(() => {
@@ -154,7 +154,7 @@
initData()
mainTimer.value = setInterval(() => {
initData()
- }, 6000)
+ }, 60000)
})
diff --git a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
index 9826144..fbcc75f 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -305,8 +305,8 @@
tt.setDoneNum(Constants.formatBigdecimal(t.getDoneNum()));
rList.add(tt);
//鏈�鍚庝竴鍒楃殑鑹搧鏁�/瀹屽伐鏁帮細涓哄綋鍓嶄骇鍝佹渶鍚庝竴閬撳伐搴忕殑鑹搧鏁�/瀹屽伐鏁�
- model.setNum(t.getPlanNum());
- model.setQualifiedNum(t.getDoneNum());
+ model.setDoneNum(t.getDoneNum());
+ model.setQualifiedNum(t.getQualifiedNum());
}
}
model.setProcedureList(rList);
diff --git a/server/src/main/resources/mappers/PlansExtMapper.xml b/server/src/main/resources/mappers/PlansExtMapper.xml
index e48e1b2..c80683a 100644
--- a/server/src/main/resources/mappers/PlansExtMapper.xml
+++ b/server/src/main/resources/mappers/PlansExtMapper.xml
@@ -1357,8 +1357,8 @@
<select id="getPlansStaticticsData" parameterType="doumeemes.dao.ext.dto.QueryPlansExtDTO" resultType="doumeemes.dao.business.dto.statistics.StatisticsPlanDataModel">
SELECT count(a.id) as ingNum,
(select count(b.id) FROM `plans` b where b.DELETED = 0 and b.PROCEDURE_ID=#{procedureId} AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND (b.`STATUS` in (1,4) and now() > b.plan_Date )) as delayNum,
- (select count(distinct(b.CREATE_USER)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.PROCEDURE_ID=#{procedureId} AND b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status in (0,1,2,3,4,7)) as prouserNum,
- (select count(distinct(b.PRO_DEVICE_ID)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.PROCEDURE_ID=#{procedureId} AND b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status in (0,1,2,3,4,7)) as deviceNum,
+ (select count(distinct(b.CREATE_USER)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.PROCEDURE_ID=#{procedureId} AND b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status in (0,1,2,3,4,7) AND to_days(b.create_time)=to_days(now())) as prouserNum,
+ (select count(distinct(b.PRO_GROUP_ID)) FROM workorder b where b.PROCEDURE_ID=#{procedureId} AND b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND b.status in (0,1,2,3,4,7) AND to_days(b.create_time)=to_days(now())) as deviceNum,
(select sum(ifnull(b.UNQUALIFIED_NUM,0)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.PROCEDURE_ID=#{procedureId} AND b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status=4) as unqualifiedNum,
(select sum(ifnull(b.NUM,0)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.PROCEDURE_ID=#{procedureId} AND b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status=4) as doneNum
FROM `plans` `a`
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index bd5eae7..42042d4 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -172,11 +172,11 @@
</select>
<select id="getPlansStaticticsData" parameterType="doumeemes.dao.ext.dto.QueryWorkPlansDTO" resultType="doumeemes.dao.business.dto.statistics.StatisticsPlanDataModel">
SELECT count(a.id) as ingNum,
- (select count(b.id) FROM `work_plans` b where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND (b.`STATUS` = 1 and now() > b.plan_Date )) as delayNum,
+ (select count(b.id) FROM `work_plans` b where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND (b.`STATUS` = 1 and b.plan_Date > now() )) as delayNum,
(select count(distinct(b.CREATE_USER)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where to_days(b.create_time)=to_days(now()) and b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status in (0,1,2,3,4,7)) as prouserNum,
- (select count(distinct(b.PRO_DEVICE_ID)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status in (0,1,2,3,4,7)) as deviceNum,
- (select sum(ifnull(b.UNQUALIFIED_NUM,0)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status=4) as unqualifiedNum,
- (select sum(ifnull(b.NUM,0)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND c.status=4) as doneNum
+ (select count(distinct(b.PRO_GROUP_ID)) FROM `workorder` b where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND b.status in (0,1,2,3,4,7)) as deviceNum,
+ (select sum(ifnull(b.UNQUALIFIED_NUM,0)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND to_days(b.create_time)=to_days(now()) and c.status=4 ) as unqualifiedNum,
+ (select sum(ifnull(b.NUM,0)) FROM `workorder_record` b left join workorder c on b.workorder_id =c.id where b.DELETED = 0 AND b.ROOT_DEPART_ID = #{rootDepartId} AND b.DEPART_ID = #{departId} AND to_days(b.create_time)=to_days(now()) and c.status=4) as doneNum
FROM `work_plans` `a`
where
a.DELETED = 0 AND a.ROOT_DEPART_ID = #{rootDepartId} AND a.DEPART_ID = #{departId} AND a.`STATUS` = 1
@@ -189,7 +189,7 @@
FROM `work_plans` `a`
LEFT JOIN `material_distribute` c ON a.MATERIAL_ID=c.ID
LEFT JOIN `material` m ON c.MATERIAL_ID=m.ID
- where ( a.status= 0 or (a.status=6 and EXISTS(select b.id from workorder_record b left join plans c on b.PLAN_ID=c.id where b.type=1 and b.DELETED=0 and c.WORK_PLANS_ID=a.id) ))
+ where ( a.status= 1 or (a.status=6 and EXISTS(select b.id from workorder_record b left join plans c on b.PLAN_ID=c.id where b.type=1 and b.DELETED=0 and c.WORK_PLANS_ID=a.id) ))
and a.deleted=0 and a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId}
order by a.CREATE_TIME
--
Gitblit v1.9.3