fix:

.env.cloud

@@ -1,2 +1,3 @@
 VITE_APP_ENV = cloud
 VITE_BASE_URL = 'http://192.168.1.99:8080'
+VITE_ZMQ_BASE_URL = '192.168.1.99'

.env.local

@@ -1 +1,3 @@
 VITE_APP_ENV = local
+VITE_BASE_URL = 'http://192.168.1.99:8080'
+VITE_ZMQ_BASE_URL = '192.168.1.99'

package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview",
     "build-only": "vite build",
     "build:dev": "vite build --mode development",
-    "build:prod": "vite build --mode prod",
+    "build:cloud": "vite build --mode cloud",
     "type-check": "vue-tsc --build"
   },
   "dependencies": {

src/api/module/taks/index.ts

@@ -12,8 +12,7 @@ export const getTaskList = (params: Param) =>
   }>({
     url: 'api/task/summary',
     method: 'get',
-    data: params,
-
+    params,
   })
 
 

src/composables/useZMQJsonWorker.ts

@@ -1,15 +1,26 @@
 import { WorkerCMD, ZmqCMD, } from '@/utils/zmq'
-import type { ManualAction, PublishMsg, PubMsgData, SubMsgData, TimeoutMsg, ZmqMessage } from '@/utils/zmq'
+import type {
+  ManualAction,
+  PublishMsg,
+  PubMsgData,
+  SubMsgData,
+  TimeoutMsg,
+  ZmqMessage
+} from '@/utils/zmq'
 import webWorker from '@/utils/zmqJsonWorker?worker'
+
 const env = import.meta.env
-const defaultHost = import.meta.env.PROD ? window.location.hostname : '192.168.1.199'
+let defaultHost = env.VITE_ZMQ_BASE_URL
+if (env.VITE_APP_ENV === 'local') {
+  defaultHost = window.location.hostname === 'localhost' ? env.VITE_ZMQ_BASE_URL : window.location.hostname
+}
 
 class ZMQJsonWorker {
   private static instance: ZMQJsonWorker | null = null; // ➤ 单例实例
   private worker: Worker;
   private scribeHandlers: Map<string, (msg: SubMsgData | PubMsgData) => void> = new Map();
   private pubTimeoutHandlers: Map<string, (msg: TimeoutMsg) => void> = new Map();
-  private host: string;
+  private readonly host: string;
   private statusCallback: ((status: string) => void) | null = null;
   private isAlwaysListenMsgMap: Map<string, PublishMsg<any>> = new Map();
 
@@ -64,7 +75,13 @@ class ZMQJsonWorker {
     if (isAlwaysListen) {
       this.isAlwaysListenMsgMap.set(`${msg.id}`, msg)
     }
-    this.worker.postMessage({ cmd: WorkerCMD.PUBLISH, topic, msg: JSON.stringify(msg), isTimeout, isAlwaysListen });
+    this.worker.postMessage({
+      cmd: WorkerCMD.PUBLISH,
+      topic,
+      msg: JSON.stringify(msg),
+      isTimeout,
+      isAlwaysListen
+    });
   }
 
   setStatusCallback(callback: (status: string) => void) {
@@ -104,7 +121,7 @@ class ZMQJsonWorker {
 
   private handleMessage(e: MessageEvent<ZmqMessage>) {
     const { cmd, msg, topic, community } = e.data;
-
+    console.log(e.data)
     if (cmd === ZmqCMD.STATUS) {
       const status = community ? 'disconnected' : 'connected';
       if (this.statusCallback) {

src/router/index.ts

@@ -53,16 +53,16 @@ export const defaultRouter = [
           icon: 'i-mingcute:task-line',
         }
       },
-      {
-        path: '/testG6',
-        name: 'testG6',
-        component: () => import('@/views/testG6/index.vue'),
-        meta: {
-          title: '测试G6',
-          isShow: true,
-          icon: 'i-mingcute:task-line',
-        }
-      }
+      // {
+      //   path: '/testG6',
+      //   name: 'testG6',
+      //   component: () => import('@/views/testG6/index.vue'),
+      //   meta: {
+      //     title: '测试G6',
+      //     isShow: true,
+      //     icon: 'i-mingcute:task-line',
+      //   }
+      // }
     ],
   },
 ]

src/views/firmwareUpload/index.vue

@@ -1,17 +1,23 @@
 <template>
   <div class="flex justify-center items-center size-full">
     <EdfsWrap :title="title" style="width: 50%; height: 50%">
-      <el-upload v-model:fileList="fileList" v-loading="loading" element-loading-text="上传中..." drag action=""
-        accept=".zip,.tar,.tar.gz" :limit="1" :on-exceed="handleExceed" :auto-upload="false" ref="uploadRef"
-        :before-upload="beforeAvatarUpload" class="h-[calc(100%-30px)] w-full">
+      <el-upload v-model:fileList="fileList" v-loading="loading" element-loading-text="上传中..."
+                 drag action=""
+                 accept=".zip,.tar,.tar,.gz" :limit="1" :on-exceed="handleExceed"
+                 :auto-upload="false"
+                 ref="uploadRef"
+                 :before-upload="beforeAvatarUpload" class="h-[calc(100%-30px)] w-full">
         <div class="i-line-md:cloud-alt-upload-loop text-20px mx-auto"></div>
         <div class="text">拖拽文件或者 <em>点击上传</em></div>
         <template #tip v-if="!fileList.length">
-          <div class="el-upload__tip">上传限制一个文件，新文件会覆盖旧文件，仅支持 .zip、.tar 或 .tar.gz 格式</div>
+          <div class="el-upload__tip">上传限制一个文件，新文件会覆盖旧文件，仅支持 .zip、.tar 或
+            .tar.gz 格式
+          </div>
         </template>
       </el-upload>
       <div class="flex justify-center">
-        <el-button type="primary" @click="onSave" v-show="fileList.length && !loading">确定上传</el-button>
+        <el-button type="primary" @click="onSave" v-show="fileList.length && !loading">确定上传
+        </el-button>
         <el-button type="info" v-show="loading" @click="onClone">取消上传</el-button>
       </div>
     </EdfsWrap>
@@ -62,6 +68,7 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = rawFile => {
 
   return true
 }
+
 function validate() {
   if (!fileList.value.length) {
     message.error('请上传文件')
@@ -70,6 +77,7 @@ function validate() {
 
   return beforeAvatarUpload(fileList.value[0].raw!)
 }
+
 const loading = ref(false)
 const abortController = ref<AbortController>()
 
@@ -163,6 +171,7 @@ async function createChunksFromFileData(file: File, chunkSize: number) {
 function clearData() {
   fileList.value = []
 }
+
 function onClone() {
   if (loading.value) {
     abortController.value?.abort()
@@ -170,6 +179,7 @@ function onClone() {
   }
   clearData()
 }
+
 const firmwarePath = ref<string>()
 
 const title = computed(() => {

src/views/taskList/index.vue

@@ -1,46 +1,60 @@
 <template>
   <div class="task-list wh-full">
     <EdfsWrap title="任务列表" class="h-full">
-      <EdfsTable class="wh-full" v-loading="loading" :data="list" ref="tableRef" :highlight-current-row="true"
-        :page-total="total" :current-page="queryParams.page" :page-size="queryParams.size" row-class-name="row"
-        @pageCurrentChange="handleJump">
+      <EdfsTable class="wh-full" v-loading="loading" :data="list" ref="tableRef"
+                 :highlight-current-row="true"
+                 :page-total="total" :current-page="queryParams.page" :page-size="queryParams.size"
+                 row-class-name="row"
+                 @pageCurrentChange="handleJump">
         <template v-for="(col, idx) in tableCol" :key="idx">
-          <el-table-column v-if="col.prop.endsWith('Time')" :label="col.label" :min-width="col.minWidth">
+          <el-table-column v-if="col.prop.endsWith('Time')" :label="col.label"
+                           :min-width="col.minWidth">
             <template #default="scope">
               {{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
             </template>
           </el-table-column>
           <el-table-column v-else-if="col.prop === 'status'" :prop="col.prop" :label="col.label"
-            :min-width="col.minWidth">
+                           :min-width="col.minWidth">
             <template #default="scope">
-              {{taskStatus.find(r => r.value === scope.row.status)?.label || '--'}}
+              {{ taskStatus.find(r => r.value === scope.row.status)?.label || '--' }}
             </template>
           </el-table-column>
           <el-table-column v-else-if="col.prop === 'mode'" :prop="col.prop" :label="col.label"
-            :min-width="col.minWidth">
+                           :min-width="col.minWidth">
             <template #default="scope">
-              {{taskMode.find(r => r.value === scope.row.mode)?.label || '--'}}
+              {{ taskMode.find(r => r.value === scope.row.mode)?.label || '--' }}
             </template>
           </el-table-column>
-          <el-table-column v-else :prop="col.prop" :label="col.label" :min-width="col.minWidth" />
+          <el-table-column v-else :prop="col.prop" :label="col.label" :min-width="col.minWidth"/>
         </template>
         <el-table-column label="操作" width="210" align="center">
           <template #default="scope">
-            <EdfsButton size="small" link type="primary" inner-text="详情" @click="onDetail(scope.row)" />
-            <EdfsButton size="small" link type="danger" v-if="[0, 1].includes(scope.row.mode)" inner-text="取消任务"
-              @click="onCancel(scope.row.id)" />
+            <EdfsButton size="small" link type="primary" inner-text="详情"
+                        @click="onDetail(scope.row)"/>
+            <EdfsButton size="small" link type="danger" v-if="[0, 1].includes(scope.row.mode)"
+                        inner-text="取消任务"
+                        @click="onCancel(scope.row.id)"/>
           </template>
         </el-table-column>
       </EdfsTable>
 
     </EdfsWrap>
   </div>
-  <InfoDrawer ref="InfoDrawerRef" />
+  <InfoDrawer ref="InfoDrawerRef" @task-finish="onTaskFinish"/>
 </template>
 
 <script setup lang="ts">
-import { cancelTask, getTaskInfo, getTaskList, type TaskInfo, type TaskList } from '@/api/module/taks'
+import {
+  cancelTask,
+  getTaskInfo,
+  getTaskList,
+  type TaskInfo,
+  type TaskList
+} from '@/api/module/taks'
 import { useMessage } from '@/composables/useMessage'
+import EdfsWrap from "@/components/Edfs-wrap.vue";
+import EdfsTable from "@/components/Edfs-table/index.vue";
+import EdfsButton from "@/components/Edfs-button.vue";
 import dayjs from 'dayjs'
 import InfoDrawer from './infoDrawer.vue'
 
@@ -113,15 +127,25 @@ function handleJump(page: number) {
 }
 
 const InfoDrawerRef = ref<typeof InfoDrawer>()
+
 function onDetail(row: TaskList) {
   InfoDrawerRef.value?.open(row)
 }
+
 const onCancel = async (id: string) => {
   await message.delConfirm(`是否确认取消该任务？`)
   const res = await cancelTask(id)
   if (res.code !== 0) return
   await getList()
 }
+
+function onTaskFinish(sn: string, status:  -1 | 0 | 1 | 2 | 3) {
+  const curTask = list.value.findIndex(item => item.id === sn)
+  if (curTask !== -1) {
+    list.value[curTask].status = status
+  }
+}
+
 onMounted(() => {
   getList()
 })

src/views/taskList/infoDrawer.vue

@@ -1,15 +1,26 @@
 <template>
   <div class="fault-rule-drawer">
-    <el-drawer v-model="isShowDrawer" title="任务详情" direction="rtl" size="50%" modal-class="model-dev-opn"
-      :before-close="handleBeforeClose">
+    <el-drawer v-model="isShowDrawer" title="任务详情" direction="rtl" size="50%"
+               modal-class="model-dev-opn"
+               :before-close="handleBeforeClose">
       <main class="wh-full" v-loading="loading">
         <template v-for="detail in detailList">
           <el-descriptions border :title="`${detail.sn}任务详情`">
-            <el-descriptions-item :label-width="60" label="状态"> <el-tag size="small">{{statusList.find(r => r.value ===
-              detail.status)?.label || '--'
-                }}</el-tag></el-descriptions-item>
-            <el-descriptions-item :label-width="100" label="总数数据量">{{ detail.total }}</el-descriptions-item>
-            <el-descriptions-item :label-width="110" label="已完成数据量">{{ detail.finish }}</el-descriptions-item>
+            <el-descriptions-item :label-width="60" label="状态">
+              <el-tag size="small">{{
+                  statusList.find(r => r.value ===
+                    detail.status)?.label || '--'
+                }}
+              </el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item :label-width="100" label="总数任务量">{{
+                detail.total
+              }}
+            </el-descriptions-item>
+            <el-descriptions-item :label-width="110" label="已完任务量">{{
+                detail.finish
+              }}
+            </el-descriptions-item>
             <el-descriptions-item :label-width="60" label="信息">
               {{ detail?.info ? detail.info : '暂无信息' }}
             </el-descriptions-item>
@@ -17,8 +28,9 @@
               <template v-if="detail.total === 0">
                 <span>暂无进度</span>
               </template>
-              <el-progress v-else style="width: 95%;" :percentage="Math.floor((detail.finish / detail.total) * 100)"
-                :text-inside="true" :stroke-width="20" />
+              <el-progress v-else style="width: 95%;"
+                           :percentage="Math.floor((detail.finish / detail.total) * 100)"
+                           :text-inside="true" :stroke-width="20"/>
             </el-descriptions-item>
           </el-descriptions>
         </template>
@@ -28,11 +40,12 @@
 </template>
 
 <script setup lang="ts">
-import { getSubTopic, type PubMsgData } from '@/utils/zmq'
+import { getSubTopic, type SubMsgData } from '@/utils/zmq'
 import ZMQWorker from '@/composables/useZMQJsonWorker'
 import { getTaskInfo, type TaskInfo, type TaskList } from '@/api/module/taks'
 import { useMessage } from '@/composables/useMessage'
 
+const emit = defineEmits<{ 'task-finish': [string, -1 | 0 | 1 | 2 | 3] }>()
 const message = useMessage()
 const worker = ZMQWorker.getInstance()
 const isShowDrawer = defineModel<boolean>()
@@ -50,40 +63,57 @@ async function onDetail(row: TaskList) {
   }
   loading.value = false
 }
-const curentTaskId = ref('')
+
+const currentTaskId = ref('')
+
 async function open(row: TaskList) {
   isShowDrawer.value = true
-  curentTaskId.value = row.id
+  currentTaskId.value = row.id
   await onDetail(row)
   worker.subscribe(getSubTopic('server', 'event', 'task'), zmqTaskCb)
 }
 
 const statusList = [
-  { label: '未开始', value: 0 },
-  { label: '进行中', value: 1 },
-  { label: '成功', value: 2 },
-  { label: '失败', value: -1 },
+  {
+    value: -1,
+    label: '执行失败'
+  }, {
+    label: '等待执行',
+    value: 0
+  }, {
+    label: '执行中',
+    value: 1
+  }, {
+    label: '已取消',
+    value: 2
+  }, {
+    label: '执行成功',
+    value: 3
+  }
 ]
 
 
-function zmqTaskCb(msg: PubMsgData) {
-  const { feedback, result, id } = msg
+function zmqTaskCb(msg: SubMsgData) {
+  const { feedback } = msg
   const taskId = feedback[0]
   const deviceSN = feedback[1]
   const deviceStatus = feedback[2] || '未知状态'
   const finish = feedback[3] || 0
   const total = feedback[4] || 0
-  if (curentTaskId.value !== taskId) return
+  if (currentTaskId.value !== taskId) return
   const detail = detailList.value.find(item => item.sn === deviceSN)
   if (!detail) return
   detail.status = deviceStatus
   detail.finish = finish
   detail.total = total
+  if (detail.finish === detail.finish) {
+    emit('task-finish', deviceSN, deviceStatus)
+  }
 }
 
 function handleBeforeClose(done: () => void) {
   isShowDrawer.value = false
-  curentTaskId.value = ''
+  currentTaskId.value = ''
   done()
 }
 

src/views/testG6/index.vue

@@ -41,6 +41,18 @@ onMounted(() => {
       nodes: graphData.getNodes(),
       edges: graphData.getEdges()
     },
+    plugins: [
+      {
+        type: 'contextmenu',
+        enable: (e: any) => e.targetType === 'node',
+        getItems: () => {
+          return [{ name: '查看详情', value: 'detail' }];
+        },
+        onClick: (value: string, item: HTMLElement, current: any) => {
+          console.log('展示节点详情', current.config.context.model.getNodeData(current.config.id));
+        },
+      },
+    ],
     behaviors: ['drag-canvas', 'zoom-canvas'],
   });
   graph.render();

vite.config.ts

@@ -1,6 +1,6 @@
 import { fileURLToPath, URL } from 'node:url'
 import UnoCSS from 'unocss/vite'
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import vueDevTools from 'vite-plugin-vue-devtools'
 import AutoImport from 'unplugin-auto-import/vite'
@@ -9,68 +9,74 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 import vueJsx from '@vitejs/plugin-vue-jsx'
 import Icons from 'unplugin-icons/vite'
 // Vite 配置文件
-export default defineConfig({
-  plugins: [
-    vue(),
-    vueJsx(),
-    vueDevTools(),
-    UnoCSS(),
-    Icons({
-      autoInstall: true,
-    }),
-    AutoImport({
-      imports: ['vue', 'vue-router'],
-      resolvers: [ElementPlusResolver()],
-      dts: 'global.types/auto-imports.d.ts',
-    }),
-    Components({
-      dirs: ['src/components'],
-      extensions: ['vue'],
-      dts: 'global.types/components.d.ts',
-      resolvers: [ElementPlusResolver()],
-    }),
-  ],
-  resolve: {
-    alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url)),
+export default defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd())
+  console.log(env)
+  console.log(env.PROD)
+  return {
+    plugins: [
+      vue(),
+      vueJsx(),
+      vueDevTools(),
+      UnoCSS(),
+      Icons({
+        autoInstall: true,
+      }),
+      AutoImport({
+        imports: ['vue', 'vue-router'],
+        resolvers: [ElementPlusResolver()],
+        dts: 'global.types/auto-imports.d.ts',
+      }),
+      Components({
+        dirs: ['src/components'],
+        extensions: ['vue'],
+        dts: 'global.types/components.d.ts',
+        resolvers: [ElementPlusResolver()],
+      }),
+    ],
+    resolve: {
+      alias: {
+        '@': fileURLToPath(new URL('./src', import.meta.url)),
+      },
     },
-  },
 
-  build: {
-    minify: 'terser',
-    terserOptions: {
-      compress: {
-        drop_console: true,
-        drop_debugger: true,
+    build: {
+      outDir: env.VITE_APP_ENV === 'cloud' ? 'dist-cloud' : 'dist-local',
+      minify: 'terser',
+      terserOptions: {
+        compress: {
+          drop_console: true,
+          drop_debugger: true,
+        },
       },
     },
-  },
-  css: {
-    preprocessorOptions: {
-      scss: {
-        additionalData: '@use "@/assets/styles/mixins.scss" as *;',
+    css: {
+      preprocessorOptions: {
+        scss: {
+          additionalData: '@use "@/assets/styles/mixins.scss" as *;',
+        },
       },
     },
-  },
-  define: {
-    'process.env': {}
-  },
+    define: {
+      'process.env': {}
+    },
 
-  // 开发服务器配置
-  server: {
-    // 启动时自动打开浏览器
-    // 开发服务器端口
-    port: 3000,
-    // 允许局域网访问
-    host: '0.0.0.0',
-    proxy: {
-      '/remoteServer': {
-        target: 'http://192.168.1.199:8080/',
-        changeOrigin: true,
-        secure: false,
-        ws: true,
-        rewrite: path => path.replace(/^\/remoteServer/, ''),
-      },
-    }
-  },
+    // 开发服务器配置
+    server: {
+      // 启动时自动打开浏览器
+      // 开发服务器端口
+      port: 3000,
+      // 允许局域网访问
+      host: '0.0.0.0',
+      proxy: {
+        '/remoteServer': {
+          target: env.VITE_BASE_URL,
+          changeOrigin: true,
+          secure: false,
+          ws: true,
+          rewrite: path => path.replace(/^\/remoteServer/, ''),
+        },
+      }
+    },
+  }
 })