From e2249a2e740407906a1d251c0ba437dac08805af Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 24 八月 2023 14:30:02 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/components/AppLayout.vue | 6 ++++++
server/src/main/resources/application.yml | 2 +-
screen_standard/.env.development | 8 +++++---
screen_standard/src/views/index.vue | 8 ++++----
screen_standard/vite.config.js | 2 +-
server/src/main/resources/mappers/PlansExtMapper.xml | 4 ++--
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 4 ++--
7 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index b059424..faee205 100644
--- a/screen_standard/.env.development
+++ b/screen_standard/.env.development
@@ -1,9 +1,11 @@
NODE_ENV = development
VITE_NAME='寮�鍙戠幆澧�'
-VITE_BASE_CONTEXT=''
+VITE_BASE_CONTEXT='screen'
VITE_BASE_PATH='/api'
-VITE_BASE_URL='http://192.168.0.35:10021'
+#VITE_BASE_URL='http://192.168.0.35:10021'
# VITE_BASE_PATH='/doumeeplant_api'
-# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
\ No newline at end of file
+# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
+
+VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
\ No newline at end of file
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 1083e29..7604b4d 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -25,6 +25,10 @@
<img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
<img v-else src="@/assets/img/ic_exitfullscreen@2x.png" class="full-ic" @click="fullChange">
<img src="@/assets/img/title_line@2x.png" class="right-line" alt="">
+
+ <template>
+ <v-mini-weather></v-mini-weather>
+ </template>
<div class="date">
<div class="time">{{ tempDate.time }}</div>
<div class="day">{{ `${tempDate.date} ${tempDate.day}` }}</div>
@@ -59,6 +63,8 @@
import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
import { useRoute, useRouter } from 'vue-router'
+import { vMiniWeather } from 'vue-mini-weather'
+// export default { components: {vMiniWeather }}
const enterprise = useCounterStore()
const route = useRoute()
const router = useRouter()
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 2f482fd..e477f37 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -688,14 +688,14 @@
scrollDom = scrollContainer1.value
} else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if (scrollDom.children.length < 7) {
+ if (scrollDom.children.length < 6) {
clearTimeout(timer1.value)
return
}
// 缁勪欢杩涜婊氬姩
- scrollDom.scrollTop += 1
+ scrollDom.scrollTop += 2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop+2 >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -778,7 +778,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop+1 >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 092dcac..0861b64 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -47,7 +47,7 @@
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
secure: false,
- rewrite: (path) => path.replace(env.VITE_BASE_PATH, '')
+ rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
}
}
}
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 72fcf23..dd0fac5 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standard
+ active: standardPro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/src/main/resources/mappers/PlansExtMapper.xml b/server/src/main/resources/mappers/PlansExtMapper.xml
index 8e7925f..633bb9c 100644
--- a/server/src/main/resources/mappers/PlansExtMapper.xml
+++ b/server/src/main/resources/mappers/PlansExtMapper.xml
@@ -324,7 +324,7 @@
FROM `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 in (1,4) or (a.status=6 and EXISTS(select b.id from workorder_record b where b.type=1 and b.DELETED=0 and b.PLAN_ID=a.id) ))
+ where (a.status in (1,4) or (a.status=6 and EXISTS(select b.id from workorder_record b where b.type=1 and b.DELETED=0 and b.PLAN_ID=a.id and to_days(b.create_time)=to_days(now())) ))
and a.deleted=0 and a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} and a.PROCEDURE_ID=#{procedureId}
order by a.CREATE_TIME
</select>
@@ -1373,7 +1373,7 @@
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 to_days(now()) > to_days(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) 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 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 AND to_days(b.create_time)=to_days(now())) 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 AND to_days(b.create_time)=to_days(now())) as doneNum
FROM `plans` `a`
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 9df0163..1b0b5dc 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -174,7 +174,7 @@
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 to_days(now()) > to_days(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 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_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 count(distinct(b.PRO_GROUP_ID)) FROM `workorder` b 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 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`
@@ -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= 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) ))
+ 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 to_days(b.create_time)=to_days(now()) 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