From 7550fb636fec7a84dbdea55196d97ed635d7ab10 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 24 八月 2023 14:16:41 +0800
Subject: [PATCH] 平台端bug修改
---
screen_standard/src/components/AppLayout.vue | 2 +-
platform_web/.env.development | 5 ++++-
platform_web/src/views/business/clientRecord.vue | 2 +-
screen_standard/src/views/index.vue | 17 +++++++++++------
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/platform_web/.env.development b/platform_web/.env.development
index d2d1b54..53c2611 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -16,7 +16,10 @@
#姹熻悕鏈湴
-VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
+# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
+
+#鐒︽澗
+VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
#鍒樼纾婃湰鍦�
# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
diff --git a/platform_web/src/views/business/clientRecord.vue b/platform_web/src/views/business/clientRecord.vue
index 6c87c4a..cdde56a 100644
--- a/platform_web/src/views/business/clientRecord.vue
+++ b/platform_web/src/views/business/clientRecord.vue
@@ -33,7 +33,7 @@
</template>
</el-table-column>
<el-table-column prop="detail" label="澶囨敞" align="center" min-width="180px"></el-table-column>
- <el-table-column prop="updateUser" label="鎿嶄綔浜�" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="createUserName" label="鎿嶄綔浜�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createTime" label="鎿嶄綔鏃堕棿" align="center" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index fb9771d..5095786 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -151,7 +151,7 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
- fullChange()
+ // fullChange()
const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
setInterval(() => {
let tempDate = new Date()
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index c9970c2..864ebad 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -272,13 +272,16 @@
watch(() => departId.value, (val) => {
if (val) {
+ clearTimeout(timer.value)
+ clearTimeout(timer5.value)
init()
+ timer5.value = setInterval(init, 60000)
+ timer.value = setInterval(scrillAction, 100)
}
})
const init = () => {
- console.log(timer.value);
// 褰撴棩鍛樺伐浜ч噺TOP10
getTop(companyId.value, departId.value)
.then(res => {
@@ -359,7 +362,6 @@
num: item.unqualifiedNum
}
})
- console.log(data.num);
setTypeChart()
}
})
@@ -753,14 +755,17 @@
}
onMounted(() => {
+ if (departId.value) {
+ console.log('onMounted');
+ init()
+ timer5.value = setInterval(init, 60000)
+ timer.value = setInterval(scrillAction, 100)
+ }
window.addEventListener('resize', () => {
setTypeChart()
setDayChart()
})
- if (!departId.value) return;
- init()
- timer5.value = setInterval(init, 60000)
- timer.value = setInterval(scrillAction, 100)
+
})
onUnmounted(() => {
--
Gitblit v1.9.3