From 0718eedea3874a024a15c969bbfb48a418c01ebe Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 14 Nov 2024 15:51:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/assets/svg/msg-fill.svg |  1 +
 core/core-frontend/src/layout/index.vue       | 23 +++++++---
 core/core-frontend/src/locales/zh-CN.ts       |  3 ++
 .../src/views/msg/fill/index.vue              | 45 ++++++++++++++++---
 .../src/views/system/parameter/index.vue      |  1 -
 5 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 core/core-frontend/src/assets/svg/msg-fill.svg

diff --git a/core/core-frontend/src/assets/svg/msg-fill.svg b/core/core-frontend/src/assets/svg/msg-fill.svg
new file mode 100644
index 0000000000..7ce39cc2f6
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/msg-fill.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1731570019470" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1016" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M641.01 223.5h-362c-17.67 0-32 14.33-32 32s14.33 32 32 32h362c17.67 0 32-14.33 32-32s-14.33-32-32-32zM542.77 400.75H279.01c-17.67 0-32 14.33-32 32s14.33 32 32 32h263.76c17.67 0 32-14.33 32-32s-14.33-32-32-32zM369.76 578h-90.75c-17.67 0-32 14.33-32 32s14.33 32 32 32h90.75c17.67 0 32-14.33 32-32s-14.33-32-32-32z" p-id="1017"></path><path d="M411.42 960h-198.4c-61.76 0-112-50.24-112-112V176c0-61.76 50.24-112 112-112H707c61.76 0 112 50.24 112 112v242.21c0 17.67-14.33 32-32 32s-32-14.33-32-32V176c0-26.47-21.53-48-48-48H213.02c-26.47 0-48 21.53-48 48v672c0 26.47 21.53 48 48 48h198.4c17.67 0 32 14.33 32 32s-14.33 32-32 32z" p-id="1018"></path><path d="M839.74 528.92c3.02 0 7.44 0.81 11.31 4.69l38.18 38.18c3.87 3.87 4.69 8.29 4.69 11.31 0 3.02-0.81 7.44-4.69 11.31l-290.5 290.51-67.17 6.36 6.36-67.17L828.43 533.6c3.87-3.87 8.29-4.68 11.31-4.68m0-64c-20.47 0-40.95 7.81-56.57 23.43L481.16 790.37c-4.11 4.11-6.23 9.8-5.81 15.59l-12.87 135.91c0.72 9.9 8.59 17.78 18.5 18.5l135.91-12.87c0.49 0.04 0.97 0.05 1.45 0.05 5.28 0 10.38-2.09 14.14-5.86l302.01-302.02c31.24-31.24 31.24-81.89 0-113.14l-38.18-38.18c-15.62-15.62-36.1-23.43-56.57-23.43z" p-id="1019"></path><path d="M764.08 535.73l-45.26 45.25L846.1 708.26l45.26-45.25-127.28-127.28z" p-id="1020"></path></svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue
index 80bed9b17f..f78997135a 100644
--- a/core/core-frontend/src/layout/index.vue
+++ b/core/core-frontend/src/layout/index.vue
@@ -15,6 +15,7 @@ const systemMenu = computed(() => route.path.includes('system'))
 const settingMenu = computed(() => route.path.includes('sys-setting'))
 const marketMenu = computed(() => route.path.includes('template-market'))
 const toolboxMenu = computed(() => route.path.includes('toolbox'))
+const msgFillMenu = computed(() => route.path.includes('msg-fill'))
 const isCollapse = ref(false)
 const setCollapse = () => {
   isCollapse.value = !isCollapse.value
@@ -25,15 +26,27 @@ const { t } = useI18n()
 <template>
   <div class="common-layout">
     <HeaderSystem
-      v-if="settingMenu || marketMenu || toolboxMenu"
-      :title="toolboxMenu ? t('toolbox.name') : marketMenu ? t('toolbox.template_center') : ''"
+      v-if="settingMenu || marketMenu || toolboxMenu || msgFillMenu"
+      :title="
+        toolboxMenu
+          ? t('toolbox.name')
+          : marketMenu
+          ? t('toolbox.template_center')
+          : msgFillMenu
+          ? t('v_query.msg_center')
+          : ''
+      "
     />
     <Header v-else></Header>
     <el-container class="layout-container">
-      <template v-if="systemMenu || settingMenu || toolboxMenu">
+      <template v-if="systemMenu || settingMenu || toolboxMenu || msgFillMenu">
         <Sidebar v-if="!isCollapse" class="layout-sidebar">
-          <div @click="setCollapse" v-if="systemMenu && !isCollapse" class="org-config-center">
-            {{ t('toolbox.org_center') }}
+          <div
+            @click="setCollapse"
+            v-if="(systemMenu || msgFillMenu) && !isCollapse"
+            class="org-config-center"
+          >
+            {{ msgFillMenu ? t('v_query.msg_center') : t('toolbox.org_center') }}
           </div>
           <Menu :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"></Menu>
         </Sidebar>
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 54f5451851..92e3387b6b 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2556,6 +2556,8 @@ export default {
     variable_mgm: '参数设置'
   },
   v_query: {
+    msg_center: '消息中心',
+    to_be_filled: '待填报',
     the_minimum_value: '数值区间最大值必须大于最小值',
     before_querying: '查询条件是必填项，请设置选项值后，再进行查询！',
     here_or_click: '将右侧的字段拖拽到这里 或 点击',
@@ -3463,6 +3465,7 @@ export default {
   },
   data_fill: {
     data_fill: '数据填报',
+    fill_in_the_task: '填报任务',
     data_fill_name: '数据填报名称',
     p_data_fill_name: '请输入数据填报名称',
     save_df_success: '保存数据填报成功',
diff --git a/core/core-frontend/src/views/msg/fill/index.vue b/core/core-frontend/src/views/msg/fill/index.vue
index a6098f6a74..0da6fc13b9 100644
--- a/core/core-frontend/src/views/msg/fill/index.vue
+++ b/core/core-frontend/src/views/msg/fill/index.vue
@@ -1,13 +1,48 @@
 <template>
-  <div class="fill-template">{{ info }}</div>
+  <p class="router-title">{{ t('data_fill.fill_in_the_task') }}</p>
+  <el-tabs v-model="activeName">
+    <el-tab-pane v-for="item in tabArray" :key="item.name" :label="item.label" :name="item.name" />
+  </el-tabs>
+  <div class="sys-setting-p setting-auto-h">
+    <div class="container-sys-param"></div>
+  </div>
 </template>
 
 <script setup lang="ts">
-const info = 'This is msg-fill page for tong.shu'
-</script>
+import { ref } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+const { t } = useI18n()
+const activeName = ref('toBeFilled')
 
-<style lang="less" scoped>
-.fill-template {
+const tabArray = ref([
+  { label: t('v_query.to_be_filled'), name: 'toBeFilled' },
+  { label: t('data_fill.form.status_1'), name: 'completed' }
+])
+</script>
+<style lang="less">
+.router-title {
+  color: #1f2329;
+  font-feature-settings: 'clig' off, 'liga' off;
+  font-family: var(--de-custom_font, 'PingFang');
+  font-size: 20px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 28px;
+}
+.sys-setting-p {
   width: 100%;
+  height: calc(100vh - 176px);
+  box-sizing: border-box;
+  margin-top: 12px;
+}
+.setting-auto-h {
+  height: auto !important;
+}
+
+.container-sys-param {
+  height: 100%;
+  overflow: hidden;
+  background: var(--ContentBG, #ffffff);
+  border-radius: 4px;
 }
 </style>
diff --git a/core/core-frontend/src/views/system/parameter/index.vue b/core/core-frontend/src/views/system/parameter/index.vue
index 8f2baeccf9..f1087dd896 100644
--- a/core/core-frontend/src/views/system/parameter/index.vue
+++ b/core/core-frontend/src/views/system/parameter/index.vue
@@ -68,4 +68,3 @@ const addTable = tab => {
   border-radius: 4px;
 }
 </style>
-<style lang="less" scoped></style>