From 22ce3a4c8453b54c2bfe6d582b734195f899f195 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 10 十二月 2024 14:59:50 +0800
Subject: [PATCH] 1. 新增socket生命周期管理、心跳机制、重连机制 2. 新增socket消息校验、解析、生成 3. 新增socket消息类型枚举类src\enum\socketMessage 3. 新增消息管理类src\socket\MessageManager 4. 新增观察者模式消息的发布订阅机制src\socket\eventBus 5. 修改后台任务页面注册后台任务状态消息并修改状态的逻辑

---
 src/components/SearchBar.vue |   55 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 2562c97..b137a36 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,10 +1,14 @@
 <template>
   <el-row class="layout">
-    <el-col :span="16">
+    <el-col :span="12">
       <el-form :inline="true" :model="formSearch">
         <el-form-item label="鎬讳换鍔�">
           <!-- <el-input v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�" /> -->
-          <el-select v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�">
+          <el-select
+            v-model="formSearch.topTaskId"
+            placeholder="鎬讳换鍔�"
+            style="width: 260px"
+          >
             <el-option
               v-for="s in topTasks"
               :key="s.value"
@@ -14,7 +18,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="鍦烘櫙绫诲瀷">
-          <el-select v-model="formSearch.sceneTypeId" placeholder="鍦烘櫙绫诲瀷">
+          <el-select
+            v-model="formSearch.sceneTypeId"
+            placeholder="鍦烘櫙绫诲瀷"
+            style="width: 150px"
+          >
             <el-option
               v-for="s in sceneTypes"
               :key="s.value"
@@ -28,7 +36,7 @@
         </el-form-item>
       </el-form>
     </el-col>
-    <el-col :span="8">
+    <el-col :span="12">
       <el-row justify="end">
         <slot name="summary"></slot>
       </el-row>
@@ -37,50 +45,55 @@
 </template>
 
 <script>
-import taskApi from '@/api/taskApi';
-import { enumScene_2NA } from "@/enum/scene";
+import taskApi from '@/api/fysp/taskApi';
+import { enumScene } from '@/enum/scene';
 
 export default {
   emits: ['onSubmit'],
   data() {
     return {
       topTasks: [],
-      sceneTypes: enumScene_2NA(),
+      sceneTypes: enumScene(2, false),
       formSearch: {
         topTaskId: '',
-        sceneTypeId: '',
-      },
+        sceneTypeId: ''
+      }
     };
   },
   methods: {
     //鑾峰彇鏌ヨ鏉′欢
     getOptions() {
       taskApi.getTopTask().then((res) => {
-        const list = [];
-        res.forEach((r) => {
-          list.push({
+        const list = res.map((r) => {
+          return {
             value: r.tguid,
             label: r.name,
-            towncode: r.towncode,
-            districtCode: r.districtcode,
-            month: r.starttime.slice(0, 7),
-          });
+            data: r
+          };
         });
         this.topTasks = list;
         this.formSearch.topTaskId = list[0].value;
-        this.$emit('onSubmit', this.formSearch);
+        this.onSubmit();
       });
     },
     //鏌ヨ瀛愪换鍔$粺璁′俊鎭�
     onSubmit() {
-      // console.log(this.formSearch.sceneTypeId)
-      this.$emit('onSubmit', this.formSearch);
-    },
+      const task = this.topTasks.find(
+        (t) => t.data.tguid == this.formSearch.topTaskId
+      );
+      const param = {
+        topTask: task ? task.data : {},
+        sceneTypeId: this.formSearch.sceneTypeId
+      };
+      console.log(param);
+
+      this.$emit('onSubmit', param);
+    }
   },
   mounted() {
     this.formSearch.sceneTypeId = this.sceneTypes[0].value;
     this.getOptions();
-  },
+  }
 };
 </script>
 

--
Gitblit v1.9.3