From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
screen_standard/src/components/AppLayout.vue | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 117357e..22f0e80 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -2,7 +2,7 @@
<div class="content">
<div class="header">
<div class="header-item" style="font-size: 20px;">
- <el-dropdown trigger="click">
+ <el-dropdown trigger="click" v-if="route.name=='home'">
<div class="eare-title">
{{ tempCom.name}}
<div class="right-icon">
@@ -15,9 +15,11 @@
</el-dropdown-menu>
</template>
</el-dropdown>
-
+
+ <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="back">
</div>
- <div class="title">DM浜戝伐鍘傝溅闂村ぇ灞�</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">
@@ -27,10 +29,9 @@
<div class="time">{{ tempDate.time }}</div>
<div class="day">{{ `${tempDate.date} ${tempDate.day}` }}</div>
</div>
- <img src="@/assets/img/title_line@2x.png" class="right-line" alt="">
+ <!-- <img src="@/assets/img/title_line@2x.png" class="right-line" alt=""> -->
</div>
</div>
- <!-- 'background': `url(${getAssets(item.bgImg)})`, -->
<div class="num-list">
<div
v-for="(item, index) in layoutList"
@@ -41,21 +42,26 @@
<img :src="getAssets(item.logo)" alt="">
<div class="item-right">
<div class="item-title">{{ item.name }}</div>
- <div class="num-value">1</div>
+ <div class="num-value">{{ countList[index] }}</div>
</div>
-
</div>
</div>
- <RouterView />
+ <KeepAlive>
+ <router-view></router-view>
+ </KeepAlive>
</div>
</template>
<script setup>
import { getAssets } from '@/utils'
-import { reactive, toRefs, onMounted } from 'vue';
-import { RouterView } from 'vue-router'
-
+import { getDepartmentList } from '@/utils/api.js'
+import { reactive, toRefs, onMounted, computed } from 'vue';
+import { useCounterStore } from '@/stores/counter.js'
+import { useRoute, useRouter } from 'vue-router'
+const enterprise = useCounterStore()
+const route = useRoute()
+const router = useRouter()
const layoutList = [
{ bgImg: 'bg_zhixingzhong@2x.png', name: '鎵ц涓鍒掓暟(涓�)', logo: 'ic_zhixingzhong@2x.png' },
{ bgImg: 'bg_yanqijihua@2x.png', name: '寤舵湡璁″垝鏁�(涓�)', logo: 'ic_yanqijihua@2x.png' },
@@ -63,6 +69,24 @@
{ bgImg: 'bg_jinrishebei@2x.png', name: '浠婃棩鐢熶骇璁惧(鍙�)', logo: 'ic_jinrishebei@2x.png' },
{ bgImg: 'bg_jinribuliang@2x.png', name: '浠婃棩涓嶈壇鍝佺巼(%)', logo: 'ic_jinribuliang@2x.png' },
]
+const ingNum = computed(() => {
+ return enterprise.ingNum
+})
+const delayNum = computed(() => {
+ return enterprise.delayNum
+})
+const prouserNum = computed(() => {
+ return enterprise.prouserNum
+})
+const deviceNum = computed(() => {
+ return enterprise.deviceNum
+})
+const unqualifiedRate = computed(() => {
+ return enterprise.unqualifiedRate
+})
+const title = computed(() => {
+ return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` : 'DM浜戝伐鍘傝溅闂村ぇ灞�'
+})
const data = reactive({
tempCom: { name: '璞嗙背绉戞妧' },
isFull: false,
@@ -70,21 +94,24 @@
time: '',
date: '',
day: ''
- }
+ },
+ comList: [],
+ countList: [
+ ingNum||0,
+ delayNum||0,
+ prouserNum||0,
+ deviceNum||0,
+ unqualifiedRate||0
+ ]
})
-let { tempCom, isFull, tempDate } = toRefs(data)
-const comList = [
- {name: '璞嗙背'},
- {name: '澶х背'},
- {name: '灏忕背'},
- {name: '榛勭背'},
-]
+let { tempCom, isFull, tempDate, comList, countList } = toRefs(data)
const selectCom = (item, index) => {
data.tempCom = item
+ enterprise.setDepartId(data.tempCom.id)
}
const fullChange = () => {
@@ -116,8 +143,14 @@
}
onMounted(() => {
-
- const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�',]
+ getDepartmentList(enterprise.companyId)
+ .then(res => {
+ data.comList = res
+ data.tempCom = res[0]
+ enterprise.setDepartId(data.tempCom.id)
+ })
+ .catch(err => {})
+ const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
setInterval(() => {
let date = new Date()
data.tempDate = {
@@ -127,20 +160,26 @@
}
}, 1000)
// console.log(date.getDay());
-
+
})
+const back = () => {
+ enterprise.setProcedureName('')
+ router.go(-1)
+}
</script>
<style lang="scss" scoped>
.content {
- background-image: url('@/assets/img/bg@2x.png');
+ background-image: url('@/assets/img/bg.png');
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
+ // width: 1920px;
+ // height: 1080px;
width: 100%;
height: 100%;
padding: 30px;
- overflow-y: scroll;
+ // overflow-y: scroll;
box-sizing: border-box;
.header {
background-image: url('@/assets/img/bg_maintitle@2x.png');
--
Gitblit v1.9.3