From 11da32de75cc1f04691676349ff17853b42f8722 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 23 八月 2023 19:27:52 +0800
Subject: [PATCH] 大屏
---
screen_standard/.env.staging | 2 +-
screen_standard/src/stores/counter.js | 4 ++--
screen_standard/.env.production | 4 ++--
screen_standard/.env.development | 7 ++++++-
screen_standard/src/views/process.vue | 5 ++++-
screen_standard/src/views/index.vue | 12 ++++++------
screen_standard/vite.config.js | 15 +++++++++++++--
7 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index b059424..d1b8dc6 100644
--- a/screen_standard/.env.development
+++ b/screen_standard/.env.development
@@ -6,4 +6,9 @@
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'
+
+
+VITE_BASE_PATH = '/api'
+VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
\ No newline at end of file
diff --git a/screen_standard/.env.production b/screen_standard/.env.production
index bb4353f..e332e9c 100644
--- a/screen_standard/.env.production
+++ b/screen_standard/.env.production
@@ -1,5 +1,5 @@
NODE_ENV = production
VITE_NAME = '鐢熶骇鐜'
VITE_BASE_CONTEXT = 'screen'
-VITE_BASE_PATH = '/doumeeplant'
-VITE_BASE_URL = 'https://www.mes.red/doumeeplant/'
\ No newline at end of file
+VITE_BASE_PATH = '/api'
+VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
\ No newline at end of file
diff --git a/screen_standard/.env.staging b/screen_standard/.env.staging
index bcb56b5..a511b8c 100644
--- a/screen_standard/.env.staging
+++ b/screen_standard/.env.staging
@@ -2,4 +2,4 @@
VITE_NAME='娴嬭瘯鐜'
VITE_BASE_CONTEXT='doumeeplant_screen'
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'
\ No newline at end of file
diff --git a/screen_standard/src/stores/counter.js b/screen_standard/src/stores/counter.js
index 9d972af..e3f5613 100644
--- a/screen_standard/src/stores/counter.js
+++ b/screen_standard/src/stores/counter.js
@@ -5,8 +5,8 @@
state: () => {
return {
- companyId: '8',
- departId: '',
+ companyId: window.sessionStorage.getItem('companyId'),
+ departId: window.sessionStorage.getItem('departId'),
delayNum: 0, // 寤舵湡璁″垝鏁�
deviceNum: 0, // 浠婃棩鐢熶骇璁惧鏁�
ingNum: 0, // 鎵ц涓鍒掓暟
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index c415965..989120a 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -669,8 +669,8 @@
}
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 2
- console.log(scrollDom.scrollHeight - scrollDom.clientHeight);
- console.log(scrollDom.scrollTop);
+ // console.log(scrollDom.scrollHeight - scrollDom.clientHeight);
+ // console.log(scrollDom.scrollTop);
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
@@ -720,11 +720,11 @@
return
}
// 缁勪欢杩涜婊氬姩
- scrollDom.scrollTop += 1
+ scrollDom.scrollTop += 2
// console.log('scrollDom.scrollTop', scrollDom.scrollTop);
// console.log('scrollDom.scrollHeight - scrollDom.clientHeight', scrollDom.scrollHeight - scrollDom.clientHeight);
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -752,7 +752,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop = scrollDom.scrollTop+2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight -2)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -780,7 +780,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index a131c36..542c8f5 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -166,6 +166,7 @@
})
function initData() {
+ console.log(enterprise.departId);
// 璁″垝鏁�
getProcedurePlanData(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
.then(res => {
@@ -501,7 +502,8 @@
}
.today-yield {
- height: calc(100vh - 690px);;
+ height: calc(100vh - 690px);
+ min-height: 226px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
.yield-content {
@@ -608,6 +610,7 @@
.bad-diagram {
height:calc(100vh - 690px);;
+ min-height: 226px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
.bad-content {
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 092dcac..0d025d2 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -11,6 +11,10 @@
// 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_PATH.replace(env.VITE_BASE_PATH, ''));
+ console.log('-------');
return {
base:env.VITE_BASE_CONTEXT,
plugins: [
@@ -47,8 +51,15 @@
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
secure: false,
- rewrite: (path) => path.replace(env.VITE_BASE_PATH, '')
- }
+ rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
+ // rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
+ },
+ /*'/api' : {
+ target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
+ changeOrigin: true,
+ ws: false, // 鍏佽websocket浠ｇ悊
+ rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
+ }*/
}
}
}
--
Gitblit v1.9.3