From ae2fad05393d2bbb94ec46712a1a717c85e766f0 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 22 八月 2023 19:29:01 +0800
Subject: [PATCH] 大萨达撒
---
screen_standard/src/components/AppLayout.vue | 12 +++++++++---
screen_standard/src/router/index.js | 7 ++++---
screen_standard/src/views/process.vue | 6 +++---
screen_standard/src/views/index.vue | 2 +-
4 files changed, 17 insertions(+), 10 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 19ffb61..f2654cb 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)
})
--
Gitblit v1.9.3