From 6f2e1f380b4bfdcc43dcac731226ccab49e17706 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 24 八月 2023 13:42:49 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/components/AppLayout.vue | 13 ++++++++++---
screen_standard/src/router/index.js | 5 +++++
screen_standard/src/views/process.vue | 15 +++++++++++----
screen_standard/src/views/index.vue | 17 +++++++++++------
4 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 88f8907..fb9771d 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -115,9 +115,9 @@
}
const fullChange = () => {
- data.isFull = !data.isFull
+ // data.isFull = !data.isFull
let element = document.documentElement;
- if (data.isFull) { // 鍏ㄥ睆
+ if (!data.isFull) { // 鍏ㄥ睆
if (element.requestFullscreen) {
element.requestFullscreen();
} else if (element.webkitRequestFullScreen) {
@@ -139,10 +139,11 @@
document.msExitFullscreen();
}
}
- // data.isFull = !data.isFull
+ data.isFull = !data.isFull
}
onMounted(() => {
+ enterprise.setDepartId()
getDepartmentList(enterprise.companyId)
.then(res => {
data.comList = res
@@ -150,6 +151,7 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
+ fullChange()
const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
setInterval(() => {
let tempDate = new Date()
@@ -184,6 +186,11 @@
height: 100%;
padding: 20px 30px;
overflow-y: scroll;
+ scrollbar-width:none;
+ -ms-overflow-style:none;
+ &::-webkit-scrollbar{
+ width: 0;
+ }
display: flex;
flex-direction: column;
diff --git a/screen_standard/src/router/index.js b/screen_standard/src/router/index.js
index c34f775..afebefa 100644
--- a/screen_standard/src/router/index.js
+++ b/screen_standard/src/router/index.js
@@ -10,6 +10,11 @@
routes: [
{
path: '/',
+ redirect: '/home',
+
+ },
+ {
+ path: '/home',
name: 'home',
component: indexView
},
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index fdfbaa9..c9970c2 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -59,7 +59,7 @@
:content="'宸叉姤宸ヨ壇鍝佹暟' + child.doneNum + '锛涘伐搴忚鍒掓暟' + child.planNum" placement="top">
<div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
<div class="scroll_item_row_item_x"></div>
- <span v-if="child.rate < 100">{{ child.rate.toFixed(0) }}%</span>
+ <span v-if="child.rate < 100">{{ Math.floor(child.rate) }}%</span>
<img v-else src="@/assets/img/ic_complete@2x.png" alt="" />
<span class="scroll_item_row_item_wz">{{ child.procedureName.substring(0, 3) }}</span>
</div>
@@ -385,11 +385,15 @@
let option;
option = {
title: {
- text: `杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�${data.num}`,
+ text: ` 杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�${data.num}`,
textStyle: {
color: '#fff',
fontSize: 12
}
+ },
+ grid: {
+ top: 40,
+ bottom: 30
},
xAxis: {
type: 'category',
@@ -636,8 +640,11 @@
}
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 2
+
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight-0.5)) {
+ console.log(scrollDom.scrollTop);
+ console.log(scrollDom.scrollHeight, scrollDom.clientHeight);
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -768,9 +775,7 @@
$fixed-height: 690px;
.content1 {
- scrollbar-width:none;
- -ms-overflow-style:none;
- ::-webkit-scrollbar{display:none}
+
flex: 1;
width: 100%;
height: auto;
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index c44e935..5ddfde1 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -113,7 +113,7 @@
</template>
<script setup>
-import { reactive, ref, toRefs, onMounted, onUnmounted } from 'vue'
+import { reactive, ref, toRefs, onMounted, onUnmounted, nextTick } from 'vue'
import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
import { useRoute } from 'vue-router'
@@ -148,8 +148,11 @@
onMounted(() => {
window.addEventListener('resize', () => {
- setDayChart()
- setTypeChart()
+ console.log('resize');
+ nextTick(() => {
+ setDayChart()
+ setTypeChart()
+ })
})
initData()
scrollTimer.value = setInterval(() => {
@@ -303,7 +306,6 @@
dateList.push(item.createTime)
numList.push(item.unqualifiedNum || 0)
})
- console.log(data.allBad);
let option;
option = {
title: {
@@ -312,6 +314,10 @@
color: '#fff',
fontSize: 12
}
+ },
+ grid: {
+ top: 40,
+ bottom: 40
},
xAxis: {
type: 'category',
@@ -388,6 +394,7 @@
*/
function setTypeChart() {
let dayChartDom = document.getElementById('type-distribution');
+ console.log(dayChartDom);
let myChart = echarts.init(dayChartDom);
let legendData = []
let seriesData = []
--
Gitblit v1.9.3