From 98672e42b9ddad9046a1d2b25c3fedbe1d8be662 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 08 九月 2025 13:34:57 +0800
Subject: [PATCH] DNC首页调整样式
---
/dev/null | 176 -----------------------------
src/views/dashboard/modules/MdcManagerSignage.vue | 1
src/views/dashboard/modules/TodoList.vue | 14 +-
src/views/dashboard/Analysis.vue | 6
src/views/dashboard/modules/SyncProcessList.vue | 14 --
src/views/dashboard/modules/EamManagerSignage.vue | 2
src/views/dashboard/modules/DncManagerSignage.vue | 119 +++++++++++++++++++
7 files changed, 132 insertions(+), 200 deletions(-)
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index da42538..3a93a91 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -12,9 +12,9 @@
<script>
import signageApi from '@/api/signage'
- import MdcManagerSignage from './mdcIndex/MdcManagerSignage.vue'
- import DncManagerSignage from './dncIndex/DncManagerSignage.vue'
- import EamManagerSignage from './eamIndex/EamManagerSignage.vue'
+ import MdcManagerSignage from './modules/MdcManagerSignage.vue'
+ import DncManagerSignage from './modules/DncManagerSignage.vue'
+ import EamManagerSignage from './modules/EamManagerSignage.vue'
export default {
name: 'Analysis',
diff --git a/src/views/dashboard/dncIndex/DncManagerSignage.vue b/src/views/dashboard/dncIndex/DncManagerSignage.vue
deleted file mode 100644
index 61d4c8a..0000000
--- a/src/views/dashboard/dncIndex/DncManagerSignage.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
- <div class="home-container">
- <div class="left-card">
- <div class="card">
- <div class="card-header">
- <h2 class="card-title">鎴戠殑寰呭姙</h2>
- <h2 class="more-btn" @click = "gotoTodoList">鏇村</h2>
- </div>
- <div class="card-content">
- <!-- 宓屽叆todoList缁勪欢骞惰缃粯璁ゅ垎绫� -->
- <todo-list
- ref="todoList"
- class="embedded-flow-todo"
- :defaultCategories="['drApproval','ggApproval','programConfirmApproval','ncFileSettingProcessApproval']"
- ></todo-list>
- </div>
- </div>
- </div>
-
- <!-- 鍙充晶涓や釜灏忓崱鐗� -->
- <div class="right-cards">
- <div class="card top-card">
- <h2 class="card-title">涓夌淮宸ヨ壓鐢熸垚浜у搧缁撴瀯鏍�</h2>
- <h2 class="more-btns" @click = "gotoSyncProcessList">鏇村</h2>
- <div class="card-content">
- <syncProcessList
- ref="syncProcessList"
- ></syncProcessList>
- </div>
- </div>
-
- <div class="card bottom-card">
- <h2 class="card-title">娲惧伐浠诲姟棰嗗彇</h2>
- <div class="card-content">
- </div>
- </div>
- </div>
- </div>
-</template>
-
-<script>
-import TodoList from '@views/dashboard/TodoList.vue'
-import SyncProcessList from '@views/dashboard/SyncProcessList.vue'
-
-
-export default {
- name: 'DncManagerSignage',
- components: {
- TodoList,
- SyncProcessList
- },
- data() {
- return {
- }
- },
- mounted() {
- this.$nextTick(() => {
- if (this.$refs.todoList) {
- this.$refs.todoList.loadData(1)
- }
- })
- },
- methods: {
- gotoTodoList() {
- this.$router.push('/flowable/workflow/FlowTodo')
- },
- gotoSyncProcessList(){
- this.$router.push('/dnc/base/SyncProcessSpecificationInfoList')
- },
- }
-}
-</script>
-
-<style scoped>
-.left-card .card-content {
- padding: 5px 0;
-}
-.home-container {
- display: flex;
- height: 100vh;
- padding: 5px;
- box-sizing: border-box;
- gap: 16px;
- background-color: #f0f2f7;
-}
-
-.left-card {
- flex: 1;
- min-width: 0;
-}
-
-.right-cards {
- flex: 2;
- min-width: 0;
- display: flex;
- flex-direction: column;
- gap: 16px;
-}
-
-.card {
- background: #ffffff;
- border-radius: 8px;
- box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
- padding: 10px;
- height: 100%;
- display: flex;
- flex-direction: column;
- overflow: hidden;
- justify-content: flex-start;
-}
-
-/* 鍦ㄥ師鏈夋牱寮忓熀纭�涓婃坊鍔� */
-.card-header {
- display: flex;
- justify-content: space-between;
- /* 鍨傜洿灞呬腑瀵归綈 */
- align-items: center;
- /* 鍙互鏍规嵁闇�瑕佽缃珮搴︼紝杩欓噷鍋囪璁剧疆涓� 40px锛屼篃鍙牴鎹疄闄呮儏鍐佃皟鏁� */
- height: 40px;
-}
-
-.more-btn {
- margin: 0;
- color: #00bfff;
- font-size: 14px;
- border: none;
- cursor: pointer;
-}
-
-.more-btns {
- position: absolute;
- top: 140px;
- right: 40px;
- color: #1890ff;
- font-size: 14px;
- background: none;
- border: none;
- cursor: pointer;
- text-decoration: none;
- z-index: 10;
-}
-.top-card {
- flex: 1;
-}
-
-.bottom-card {
- flex: 1;
-}
-
-.card-title {
- margin: 0;
- padding-bottom: 0;
- color: #000000;
- font-size: 16px;
- font-weight: 600;
-}
-
-.card-content {
- flex: 1;
- overflow: auto;
-}
-
-@media (max-width: 992px) {
- .home-container {
- flex-direction: column;
- }
-
- .left-card, .right-cards {
- width: 100%;
- }
-
- .left-card {
- margin-bottom: 16px;
- }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/dashboard/modules/DncManagerSignage.vue b/src/views/dashboard/modules/DncManagerSignage.vue
new file mode 100644
index 0000000..8cde729
--- /dev/null
+++ b/src/views/dashboard/modules/DncManagerSignage.vue
@@ -0,0 +1,119 @@
+<template>
+ <div class="home-container">
+ <a-card title="鎴戠殑寰呭姙" class="left-container">
+ <a slot="extra" href="#" @click="$router.push('/flowable/workflow/FlowTodo')">鏇村</a>
+
+ <!-- 宓屽叆todoList缁勪欢骞惰缃粯璁ゅ垎绫� -->
+ <todo-list
+ ref="todoList"
+ class="embedded-flow-todo"
+ :defaultCategories="['drApproval','ggApproval','programConfirmApproval','ncFileSettingProcessApproval']"/>
+ </a-card>
+
+ <!-- 鍙充晶涓や釜灏忓崱鐗� -->
+ <div class="right-container">
+ <a-card title="涓変綅宸ヨ壓鐢熸垚浜у搧缁撴瀯鏍�" class="right-top-container">
+ <a slot="extra" href="#" @click="$router.push('/dnc/base/SyncProcessSpecificationInfoList')">鏇村</a>
+
+ <syncProcessList
+ ref="syncProcessList"/>
+ </a-card>
+
+ <!--<div class="card top-card">-->
+ <!--<h2 class="card-title">涓夌淮宸ヨ壓鐢熸垚浜у搧缁撴瀯鏍�</h2>-->
+ <!--<h2 class="more-btns" @click="gotoSyncProcessList">鏇村</h2>-->
+ <!--<div class="card-content">-->
+ <!--<syncProcessList-->
+ <!--ref="syncProcessList"/>-->
+ <!--</div>-->
+ <!--</div>-->
+
+ <a-card title="娲惧伐浠诲姟棰嗗彇">
+
+ </a-card>
+
+ <!--<div class="card bottom-card">-->
+ <!--<h2 class="card-title">娲惧伐浠诲姟棰嗗彇</h2>-->
+ <!--<div class="card-content">-->
+ <!--</div>-->
+ <!--</div>-->
+ </div>
+ </div>
+</template>
+
+<script>
+ import TodoList from '@views/dashboard/modules/TodoList.vue'
+ import SyncProcessList from '@views/dashboard/modules/SyncProcessList.vue'
+
+
+ export default {
+ name: 'DncManagerSignage',
+ components: {
+ TodoList,
+ SyncProcessList
+ },
+ data() {
+ return {}
+ },
+ mounted() {
+ this.$nextTick(() => {
+ if (this.$refs.todoList) {
+ this.$refs.todoList.loadData(1)
+ }
+ })
+ },
+ methods: {}
+ }
+</script>
+
+<style scoped lang="less">
+ @container-margin: 10px;
+
+ .home-container {
+ display: flex;
+ height: 100vh;
+ gap: @container-margin;
+
+ /deep/ .ant-card {
+ display: flex;
+ flex-direction: column;
+ & ::-webkit-scrollbar {
+ width: 6px; /* 婊氬姩鏉″搴� */
+ }
+ .ant-card-body {
+ flex: 1;
+ overflow: auto;
+ }
+ }
+
+ .left-container {
+ width: 45%;
+ height: 100%;
+
+ /deep/ .ant-card-body {
+ padding: 6px 24px 12px;
+ }
+ }
+
+ .right-container {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ gap: @container-margin;
+
+ > div {
+ flex: 1;
+ }
+ }
+ }
+
+ @media (max-width: 992px) {
+ .home-container {
+ flex-direction: column;
+
+ > .left-container {
+ width: 100%;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/dashboard/eamIndex/EamManagerSignage.vue b/src/views/dashboard/modules/EamManagerSignage.vue
similarity index 99%
rename from src/views/dashboard/eamIndex/EamManagerSignage.vue
rename to src/views/dashboard/modules/EamManagerSignage.vue
index 635cda8..3bcd326 100644
--- a/src/views/dashboard/eamIndex/EamManagerSignage.vue
+++ b/src/views/dashboard/modules/EamManagerSignage.vue
@@ -53,7 +53,7 @@
</template>
<script>
- import TodoList from '../TodoList'
+ import TodoList from './TodoList'
import signageApi from '@/api/signage'
export default {
diff --git a/src/views/dashboard/mdcIndex/MdcManagerSignage.vue b/src/views/dashboard/modules/MdcManagerSignage.vue
similarity index 99%
rename from src/views/dashboard/mdcIndex/MdcManagerSignage.vue
rename to src/views/dashboard/modules/MdcManagerSignage.vue
index 572b018..b37c7d9 100644
--- a/src/views/dashboard/mdcIndex/MdcManagerSignage.vue
+++ b/src/views/dashboard/modules/MdcManagerSignage.vue
@@ -126,6 +126,7 @@
this.getDoubleBarChartDataByApi(currentFactoryId)
},
+ // 閿�姣佸浘琛ㄧ粍浠�
destroyChartsInstances() {
const charts = [
this.runningStateChart,
diff --git a/src/views/dashboard/SyncProcessList.vue b/src/views/dashboard/modules/SyncProcessList.vue
similarity index 92%
rename from src/views/dashboard/SyncProcessList.vue
rename to src/views/dashboard/modules/SyncProcessList.vue
index 3800ad6..01a5e50 100644
--- a/src/views/dashboard/SyncProcessList.vue
+++ b/src/views/dashboard/modules/SyncProcessList.vue
@@ -1,5 +1,5 @@
<template>
- <div class="sync-process-container">
+ <div>
<a-spin :spinning="loading">
<a-table
:columns="columns"
@@ -25,7 +25,7 @@
<script>
import '@/assets/less/TableExpand.less'
-import SyncProcessSpecificationInfoModal from '../dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue'
+import SyncProcessSpecificationInfoModal from '../../dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'
@@ -156,16 +156,6 @@
<style scoped>
@import '~@assets/less/common.less';
-
-.sync-process-container {
- padding: 16px;
- background-color: #fff;
- border-radius: 8px;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
- height: 500px;
- display: flex;
- flex-direction: column;
-}
.table-header {
display: flex;
diff --git a/src/views/dashboard/TodoList.vue b/src/views/dashboard/modules/TodoList.vue
similarity index 98%
rename from src/views/dashboard/TodoList.vue
rename to src/views/dashboard/modules/TodoList.vue
index 4df52b1..42ca47a 100644
--- a/src/views/dashboard/TodoList.vue
+++ b/src/views/dashboard/modules/TodoList.vue
@@ -189,13 +189,6 @@
GuideCardBatchHandle,
AssignEquipmentFileStreamHandle
},
- props: {
- // 娣诲姞榛樿鍒嗙被灞炴��
- defaultCategories: {
- type: Array,
- default: () => []
- }
- },
data() {
return {
todoList: [],
@@ -564,8 +557,13 @@
<style scoped lang="less">
.list-container {
height: 100%;
- /deep/ .ant-spin-nested-loading, /deep/ .ant-spin-container {
+ /deep/ .ant-spin-nested-loading, /deep/ .ant-spin-container, /deep/ .ant-spin-spinning {
height: 100%;
+ max-height: 100%;
+ }
+
+ /deep/ .ant-list-item-meta-description {
+ width: 98%;
}
}
</style>
--
Gitblit v1.9.3