From d467a97c79888d4b78011781bb07c0beb1a4df33 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 八月 2023 18:00:09 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/assets/main.css | 2
screen_standard/src/views/process.vue | 2
screen_standard/src/views/index.vue | 48 +++++++++++------------
screen_standard/vite.config.js | 15 +------
4 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/screen_standard/src/assets/main.css b/screen_standard/src/assets/main.css
index ead72f7..5df6d48 100644
--- a/screen_standard/src/assets/main.css
+++ b/screen_standard/src/assets/main.css
@@ -10,7 +10,7 @@
margin: 0;
/* height: 100%; */
height: 100vh;
- /* overflow-y: scroll; */
+ overflow-y: hidden;
font-weight: normal;
}
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 80b418b..71d1d98 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -54,7 +54,7 @@
<div class="scroll_item_row">{{ item.materialName }}</div>
<div class="scroll_item_row">{{ item.materialCode }}</div>
<div class="scroll_item_row">{{ item.num }}</div>
- <div class="scroll_item_row">
+ <div class="scroll_item_row" style="text-align: left;">
<el-tooltip v-for="(child, i) in item.procedureList" :key="i" effect="dark"
:content="'宸叉姤宸ヨ壇鍝佹暟' + child.doneNum + '锛涘伐搴忚鍒掓暟' + child.planNum" placement="top">
<div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
@@ -137,8 +137,8 @@
<div v-for="(item, index) in data.log" :key="index"
:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
<div class="scroll_item_row">{{ item.userName }}</div>
+ <div class="scroll_item_row">{{ item.materialName }}</div>
<div class="scroll_item_row">{{ item.procedureName }}</div>
- <div class="scroll_item_row">{{ item.materialCode }}</div>
<div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
<div class="scroll_item_row">{{ item.qualifiedNum || 0 }}</div>
<div class="scroll_item_row">{{ item.unqualifiedNum || 0 }}</div>
@@ -187,7 +187,10 @@
:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
<div class="scroll_item_row">{{ dateToSub(item.checkdate) }}</div>
<div class="scroll_item_row">{{ item.deviceName }}</div>
- <div class="scroll_item_row">{{ item.status == 0 ? '鍚堟牸' : '涓嶅悎鏍�' }}</div>
+ <div class="scroll_item_row">
+ <span v-if="item.status == 0">姝ｅ父</span>
+ <span v-else style="color: #F84F26">寮傚父</span>
+ </div>
<div class="scroll_item_row">{{ item.userName }}</div>
</div>
</div>
@@ -218,10 +221,11 @@
dayDistribution: [],
typeDistribution: [],
num: 0,
- baseNum: 0
+ baseNum: 0,
+ bottomAuthHeight: 284
})
-let { baseNum } = toRefs(data)
+let { baseNum, bottomAuthHeight } = toRefs(data)
let timer = ref(null)
let timer1 = ref(null)
@@ -229,7 +233,6 @@
let timer3 = ref(null)
let timer4 = ref(null)
let timer5 = ref(null)
-let bottomAuthHeight = 284;
let scrollContainer = ref(null)
let scrollContainer1 = ref(null)
let scrollContainer2 = ref(null)
@@ -376,8 +379,7 @@
}
function setBottomHeight(){
const pageHeight = window.innerHeight;
- bottomAuthHeight = pageHeight -700;
- // bottom1.style.height=bottomAuthHeight;
+ bottomAuthHeight = pageHeight - 700;
}
/**
@@ -550,14 +552,6 @@
}
option && myChart.setOption(option);
}
-
-// onBeforeUnmount(()=>{
-// clearTimeout(timer.value)
-// clearTimeout(timer1.value)
-// clearTimeout(timer2.value)
-// clearTimeout(timer3.value)
-// clearTimeout(timer4.value)
-// })
onUnmounted(() => {
clearTimeout(timer.value)
clearTimeout(timer1.value)
@@ -667,15 +661,16 @@
if (scrollDom.offsetHeight == 0) {
scrollDom = scrollContainer.value
} else {
+ let maxLength = scrollDom.clientHeight/34
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if (scrollDom.children.length < 6) {
+ if (scrollDom.children.length <= maxLength) {
clearTimeout(timer.value)
return
}
// 缁勪欢杩涜婊氬姩
- scrollDom.scrollTop += 1
+ scrollDom.scrollTop += 2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (Math.floor(scrollDom.scrollTop) >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -805,6 +800,8 @@
</script>
<style lang="scss" scoped>
+
+$fixed-height: 690px;
.content1 {
flex: 1;
width: 100%;
@@ -843,7 +840,7 @@
.content_left_item1_content {
width: 100%;
- height: calc(100% - 38px);
+ height: calc(100% - 36px);
padding: 20px;
overflow: hidden;
box-sizing: border-box;
@@ -854,7 +851,8 @@
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 13px;
+ // margin-bottom: 13px;
+ padding: 7px 0;
&:last-child {
margin: 0;
@@ -1094,7 +1092,7 @@
color: #01D9FE;
&:nth-child(5) {
- flex: 2.7;
+ flex: 3;
}
}
@@ -1135,7 +1133,7 @@
&:nth-child(5) {
flex: 3;
-
+ justify-content: start;
}
.scroll_item_row_item {
margin-top: -11px;
@@ -1433,8 +1431,8 @@
left: 50%;
transform: translate(-50%, -50%);
z-index: 999;
- width: 114px;
- height: 114px;
+ width: 100px;
+ height: 100px;
border-radius: 50%;
border: 2px dashed #01D9FE;
display: flex;
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index 3ac67d4..030023c 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -199,7 +199,7 @@
start()
})
// 鎶ュ伐鏃ュ織鍒嗛〉鏌ヨ
- getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 9999, page: 1, model: { procedureId: route.query.procedureId } })
+ getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 20, page: 1, model: { procedureId: route.query.procedureId } })
.then(res => {
data.reportListData = res.records
reportStart()
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index af60791..092dcac 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -11,10 +11,6 @@
// https://vitejs.dev/config/
export default defineConfig(({mode, command}) => {
let env = loadEnv(mode, process.cwd(), '')
- console.log('-------');
- console.log(env.VITE_BASE_PATH);
- console.log(env.VITE_BASE_URL);
- console.log('-------');
return {
base:env.VITE_BASE_CONTEXT,
plugins: [
@@ -50,16 +46,9 @@
target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
- // rewrite: (path) => path.replace(/^[env.VITE_BASE_PATH]/, ''), // 灏哸pi鏇挎崲涓虹┖
secure: false,
- rewrite: (path) => path.replace(/^\/api/, '')
- },
- /*'/api' : {
- target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
- changeOrigin: true,
- ws: false, // 鍏佽websocket浠ｇ悊
- rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
- }*/
+ rewrite: (path) => path.replace(env.VITE_BASE_PATH, '')
+ }
}
}
}
--
Gitblit v1.9.3