From e3ffcfc9d1717547128025e9c0217db4615a3067 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Fri, 28 Feb 2025 15:22:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/GlobalHeader.vue |  4 +--
 src/components/page/GlobalLayout.vue | 46 ++--------------------------
 src/components/tools/UserMenu.vue    | 38 -----------------------
 3 files changed, 4 insertions(+), 84 deletions(-)

diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 49924c3..491c707 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -4,7 +4,7 @@
     v-if="!headerBarFixed"
     :class="[
       fixedHeader && 'ant-header-fixedHeader',
-      sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',
+      //sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',
     ]"
     :style="{ padding: '0' }"
   >
@@ -31,7 +31,7 @@
         <div class="header-nowTime" :style="topMenuStyle.headerIndexLeft">末端数据接入处理系统</div>
         <div class="header-index-center" :style="topMenuStyle.headerIndexCenter">
           <div class="header-index-wide">
-            <div class="header-index-center" :style="topMenuStyle.topmenuCenter">
+            <div class="header-index-center" :style="topMenuStyle.headerIndexLeft">
               <s-menu mode="horizontal" :menu="menus" :theme="theme"></s-menu>
             </div>
           </div>
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 05d9cb9..60bc7e8 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -1,28 +1,7 @@
 <template>
   <a-layout class="layout" :class="[device]">
-    <template v-if="layoutMode === 'sidemenu'">
-      <a-drawer
-        v-if="device === 'mobile'"
-        :wrapClassName="'drawer-sider ' + navTheme"
-        placement="left"
-        @close="() => (this.collapsed = false)"
-        :closable="false"
-        :visible="collapsed"
-        width="200px"
-      >
-        <side-menu
-          mode="inline"
-          v-if="device === 'mobile'"
-          :menus="menus"
-          @menuSelect="menuSelect"
-          :theme="navTheme"
-          :collapsed="false"
-          :collapsible="true"
-        ></side-menu>
-      </a-drawer>
-
+    <!-- <template v-if="layoutMode === 'sidemenu'">
       <side-menu
-        v-show="device === 'desktop'"
         mode="inline"
         :menus="menus"
         @menuSelect="myMenuSelect"
@@ -30,28 +9,7 @@
         :collapsed="collapsed"
         :collapsible="true"
       ></side-menu>
-    </template>
-    <!-- 下次优化这些代码 -->
-    <template v-else>
-      <a-drawer
-        v-if="device === 'mobile'"
-        :wrapClassName="'drawer-sider ' + navTheme"
-        placement="left"
-        @close="() => (this.collapsed = false)"
-        :closable="false"
-        :visible="collapsed"
-        width="200px"
-      >
-        <side-menu
-          mode="inline"
-          :menus="menus"
-          @menuSelect="menuSelect"
-          :theme="navTheme"
-          :collapsed="false"
-          :collapsible="true"
-        ></side-menu>
-      </a-drawer>
-    </template>
+    </template> -->
 
     <a-layout
       :class="[layoutMode, `content-width-${contentWidth}`]"
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index e363c68..1cc6943 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -1,37 +1,5 @@
 <template>
   <div class="user-wrapper" :class="theme" style="min-width:460px">
-    <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <!-- <span class="action" @click="showClick">
-      <a-icon type="search"></a-icon>
-    </span> -->
-    <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <!-- <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">
-      <a-select
-        class="search-input"
-        showSearch
-        :showArrow="false"
-        placeholder="搜索菜单"
-        optionFilterProp="children"
-        :filterOption="filterOption"
-        :open="isMobile()?true:null"
-        :getPopupContainer="(node) => node.parentNode"
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
-        @change="searchMethods"
-        @blur="hiddenClick"
-      >
-        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
-      </a-select>
-    </component> -->
-    <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
-    <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <!-- <span class="action">
-      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
-        <a-icon type="question-circle-o"></a-icon>
-      </a>
-    </span> -->
-    <!-- <header-notice class="action"/> -->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu" >
         <!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/> -->
@@ -39,12 +7,6 @@
         <span v-if="isDesktop()" style="color:#00c3ff">欢迎您，{{ nickname() }}</span>
       </span>
     </a-dropdown>
-    <span class="action">
-      <a class="logout_title" href="../../codeInstructions/index.html" target="_blank">
-<!--        <a class="target" href="../../codeInstructions/index.html" target="_blank">函数文档</a>-->
-        <span v-if="isDesktop()" style="color:#00c3ff">&nbsp;函数文档</span>
-      </a>
-    </span>
     <span class="action">
       <a class="logout_title" href="javascript:;" @click="handleLogout">
         <!-- <a-icon type="logout"/> -->

From 5f901b95365e6beece9b844a2b916930916f6db1 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Fri, 28 Feb 2025 16:06:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=88=B0=E4=B8=93=E9=A2=98=E5=BA=93=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/GlobalHeader.vue |   2 +-
 src/views/data/dataManage.vue        | 123 +++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 src/views/data/dataManage.vue

diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 491c707..68de8ec 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -31,7 +31,7 @@
         <div class="header-nowTime" :style="topMenuStyle.headerIndexLeft">末端数据接入处理系统</div>
         <div class="header-index-center" :style="topMenuStyle.headerIndexCenter">
           <div class="header-index-wide">
-            <div class="header-index-center" :style="topMenuStyle.headerIndexLeft">
+            <div class="header-index-center" :style="topMenuStyle.topmenuCenter">
               <s-menu mode="horizontal" :menu="menus" :theme="theme"></s-menu>
             </div>
           </div>
diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue
new file mode 100644
index 0000000..149ddcc
--- /dev/null
+++ b/src/views/data/dataManage.vue
@@ -0,0 +1,123 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="30">
+          
+          <a-col :md="6" :sm="10" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button @click="dataAdd" type="primary" v-has="'cont:btn'" icon="plus">发布到专题库</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- table区域-begin -->
+    <div style="height:900px;overflow-y:auto;">
+      <a-progress :percent="percent" status="active" />
+      <a-list bordered :data-source="contentList">
+        <template #renderItem="{ item }">
+          <a-list-item>{{ item }}</a-list-item>
+        </template>
+      </a-list>
+    </div>
+    <!-- table区域-end -->
+    
+    <!-- 表单区域 -->
+    
+  </a-card>
+</template>
+
+<script>
+  
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from "@/components/jeecg/JEllipsis";
+  import {getAction} from '@/api/manage'
+
+  export default {
+    name: "dataManage",
+    mixins:[JeecgListMixin],
+    components: {
+      taskModal,
+      JEllipsis,
+      contentList:[],
+      percent:0,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      },
+    },
+    data () {
+      return {
+        description: '数据发布',
+      }
+    },
+    mounted() { 
+          //初始化websocket
+          this.initWebSocket()
+    },
+    computed: {
+    },
+    destroyed: function () { // 离开页面生命周期函数
+          this.websocketclose();
+    },
+    created () {
+      this.loadData();
+    },
+    methods: {
+      initWebSocket: function () {
+        // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
+        var userId = store.getters.userInfo.id;
+        var url = window._CONFIG['domianURL'].replace("https://","ws://").replace("http://","ws://")+"/websocket/1/data_distribute";
+        this.websock = new WebSocket(url);
+        this.websock.onopen = this.websocketonopen;
+        this.websock.onerror = this.websocketonerror;
+        this.websock.onmessage = this.websocketonmessage;
+        this.websock.onclose = this.websocketclose;
+      },
+      websocketonopen: function () {
+        console.log("WebSocket连接成功");
+      },
+      websocketonerror: function (e) {
+        console.log("WebSocket连接发生错误");
+      },
+      websocketonmessage: function (e) {
+        var data = eval("(" + e.data + ")"); 
+        console.log(e);
+          //处理订阅信息
+        this.contentList.push(data.content);
+        this.percent = data.currProgress
+      },
+      websocketclose: function (e) {
+        console.log("connection closed (" + e.code + ")");
+      },
+      dataAdd(){
+        getAction("/dataSpecial/special").then((res) => {
+            if (res.success) {
+                this.$message.success(res.message);
+            }
+        });
+      },
+      loadData() {
+        taskPageList(this.queryParam).then((res) => {
+            if (res.success) {
+                this.dataSource = res.result.rows||res.result;
+                if(res.result.total)
+                {
+                  this.ipagination.total = res.result.total;
+                }
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
+      },
+      
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file