From f19d2bc5b93e158fd20c30ff9f735252f3de31a7 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:24:31 +0000
Subject: [PATCH 01/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index d1c91ec..4ab6ecb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,6 +23,7 @@ steps:
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
+      - npm install @esbuild/linux-x64
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From b972359d413cda0ee17da20e8a7794211207cfe9 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:26:50 +0000
Subject: [PATCH 02/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 4ab6ecb..d1c91ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,7 +23,6 @@ steps:
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
-      - npm install @esbuild/linux-x64
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From b056e2b0e3404829c08016fc61442933a7af06e0 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:37:45 +0000
Subject: [PATCH 03/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20vite.config.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vite.config.js b/vite.config.js
index a3ab326..c6bd456 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,5 +1,6 @@
 import {fileURLToPath, URL} from "node:url";
 import {defineConfig} from "vite";
+import { esbuildPlugin } from 'vite-plugin-esbuild';
 import AutoImport from "unplugin-auto-import/vite";
 import Components from "unplugin-vue-components/vite";
 import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
@@ -13,6 +14,7 @@ import path from "path";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
+    esbuildPlugin(),
     vue(),
     vueJsx(),
     AutoImport({

From ef7f139dcc8cff42ad05abe120a091c4269a1a3b Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:43:04 +0000
Subject: [PATCH 04/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index d1c91ec..e724884 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,6 +23,7 @@ steps:
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
+      - ls
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From 22b495e037fccabdd4e50a6be89b71effbdc7983 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:44:25 +0000
Subject: [PATCH 05/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index e724884..774a454 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,6 +24,8 @@ steps:
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
       - ls
+      - cd node_modules
+      - ls
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From d6acc9cdb6902601c26927d1e93803861f83b113 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:48:21 +0000
Subject: [PATCH 06/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 774a454..1523e53 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,13 +20,11 @@ steps:
       - npm -v
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
-      - npm config set registry https://registry.npmmirror.com
-      - set NODE_OPTIONS=--openssl-legacy-provider
+      # - npm config set registry https://registry.npmmirror.com
+      # - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
-      - ls
-      - cd node_modules
-      - ls
       - npm run build
+      - ls /app/build/$DRONE_REPO_NAME/
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME
 

From 19e04a76fcc946ddc8d1a53b86c52fa80a7fd69d Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:49:44 +0000
Subject: [PATCH 07/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1523e53..d498ff2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,8 +20,8 @@ steps:
       - npm -v
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
-      # - npm config set registry https://registry.npmmirror.com
-      # - set NODE_OPTIONS=--openssl-legacy-provider
+      - npm config set registry https://registry.npmmirror.com
+      - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
       - npm run build
       - ls /app/build/$DRONE_REPO_NAME/

From cb35773c4740aa76fe43412f49fc2dc6c02891d9 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:51:58 +0000
Subject: [PATCH 08/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index d498ff2..500d2e7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,13 +18,14 @@ steps:
       - cp docker.sh /app/build/$DRONE_REPO_NAME/
       - cp nginx.conf /app/build/$DRONE_REPO_NAME/
       - npm -v
+      - ls
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
+      - ls
       - npm install
       - npm run build
-      - ls /app/build/$DRONE_REPO_NAME/
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME
 

From 9551abe97519d6cb623af84c7acb16eec446ad52 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:54:57 +0000
Subject: [PATCH 09/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index 500d2e7..42b6abe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,6 +19,7 @@ steps:
       - cp nginx.conf /app/build/$DRONE_REPO_NAME/
       - npm -v
       - ls
+      - rm -rf ./node_modules
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com

From 3d67a78d64dc8e4ba15dbad1cf85b4e835ba31fc Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:56:12 +0000
Subject: [PATCH 10/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 42b6abe..e91dcd6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,8 +18,6 @@ steps:
       - cp docker.sh /app/build/$DRONE_REPO_NAME/
       - cp nginx.conf /app/build/$DRONE_REPO_NAME/
       - npm -v
-      - ls
-      - rm -rf ./node_modules
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com

From d2952b17d6fbf9ec44190f89f91e60ea73d55ed3 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:57:39 +0000
Subject: [PATCH 11/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e91dcd6..4b363e5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,8 +22,7 @@ steps:
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
-      - ls
-      - npm install
+      # - npm install
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From 88b1daefe22b771e39adb5c71fee34952ca7527e Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 09:59:24 +0000
Subject: [PATCH 12/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 4b363e5..d1c91ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ steps:
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
-      # - npm install
+      - npm install
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From 2587456ba4fb994f584ef72ac41c3629a1c1be5e Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 10:04:57 +0000
Subject: [PATCH 13/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20vite.config.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index c6bd456..a3ab326 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,6 +1,5 @@
 import {fileURLToPath, URL} from "node:url";
 import {defineConfig} from "vite";
-import { esbuildPlugin } from 'vite-plugin-esbuild';
 import AutoImport from "unplugin-auto-import/vite";
 import Components from "unplugin-vue-components/vite";
 import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
@@ -14,7 +13,6 @@ import path from "path";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
-    esbuildPlugin(),
     vue(),
     vueJsx(),
     AutoImport({

From 02e6afbc30a4aa4fe1f7e7a9c67a153ebe32907a Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 10:05:18 +0000
Subject: [PATCH 14/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index d1c91ec..5a19f36 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,6 +23,7 @@ steps:
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
+      - npm i esbuild
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From ca6261ab572b1ca6198ef46d402f8110bd5ab510 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 10:08:55 +0000
Subject: [PATCH 15/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 5a19f36..d1c91ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,7 +23,6 @@ steps:
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
-      - npm i esbuild
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From b4f3f7d1086327b6288f940fdc32eda54cd7bcbd Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 10:11:26 +0000
Subject: [PATCH 16/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index d1c91ec..924fdd6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,10 +19,12 @@ steps:
       - cp nginx.conf /app/build/$DRONE_REPO_NAME/
       - npm -v
       - mkdir -p ./node_modules
+      - ls
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
+      - ls
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From f4ed8ef352836c4b94c2692a5ff38ae71341c0b0 Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Sun, 15 Sep 2024 10:13:08 +0000
Subject: [PATCH 17/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 924fdd6..d1c91ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,12 +19,10 @@ steps:
       - cp nginx.conf /app/build/$DRONE_REPO_NAME/
       - npm -v
       - mkdir -p ./node_modules
-      - ls
       - export NODE_MODULES_PATH=`pwd`/node_modules
       - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
-      - ls
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From 31e03494432acb3cb1eb2ba0dc5ae0f4bd8d2c00 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Mon, 16 Sep 2024 12:50:05 +0000
Subject: [PATCH 18/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker.sh b/docker.sh
index 40db59a..3ec2615 100644
--- a/docker.sh
+++ b/docker.sh
@@ -12,5 +12,5 @@ docker rmi smartopsweb:latest
 echo '----build image start----'
 docker build -t smartopsweb:latest .
 echo '----build image success----'
-docker run --name smartopsweb -d -p 8080:80 smartopsweb:latest
+docker run --name smartopsweb --restart=always -d -p 8080:80 smartopsweb:latest
 

From 20f1b568fab7025809438785e42d2a0bb281a3dc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 3 Oct 2024 17:06:27 +0800
Subject: [PATCH 19/22] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=86=E9=85=8D=E7=94=A8=E6=88=B7=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                      |  2 +-
 src/views/system/user/index.vue | 73 ++++++++++++++++++++++-----------
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index dd6eb0a..a877aa2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ steps:
       - export NODE_MODULES_PATH=`pwd`/node_modules
       # - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
-      # - npm install
+      - npm install
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 00d5d9b..93062f8 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,7 +1,9 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
-  <fvFormDialog v-if="showAddOrEditUserDialog" ref="formDialogRef" :title="dialogTitle" :form-schema="formSchema" :form-rules="formRules" @dialogCancel="handleCancel" @dialogSubmit="handleSubmit"></fvFormDialog>
+  <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
+                :form-schema="formSchema" :form-rules="formRules"
+                @dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
 </template>
 
 <script setup>
@@ -11,6 +13,7 @@ import {useCacheStore} from "@/stores/cache.js";
 
 const tableIns = ref()
 const formDialogRef = ref()
+const dialogType = ref("");
 const showAddOrEditUserDialog = ref(false)
 const dialogTitle = ref("");
 const searchConfig = reactive([
@@ -68,7 +71,7 @@ const tableConfig = reactive({
   api: '/user',
   params: {},
   btns: [
-    {name: '导入', key: 'add', type: 'primary'},
+    {name: '新增', key: 'add', type: 'primary'},
   ]
 })
 const formRules = reactive({
@@ -179,36 +182,60 @@ const headBtnClick = (key) => {
 }
 //新增用户
 const handleAdd = () => {
-  // showAddOrEditUserDialog.value = true
+  showAddOrEditUserDialog.value = true
   // formRules.value.password[0].required = true
   // restForm();
-  // dialogTitle.value = "新增用户";
-  // nextTick(()=>{
-  //   // 清空校验
-  //   formDialogRef.value.getFormInstance().clearValidate()
-  //   formDialogRef.value.getFormInstance().resetFields()
-  // })
+  dialogTitle.value = "新增用户";
+  dialogType.value = "add";
+  nextTick(() => {
+    // formDialogRef.value.getFormInstance().setValues({})
+    // 清空校验
+    formDialogRef.value.getFormInstance().clearValidate()
+    formDialogRef.value.getFormInstance().resetFields()
+  })
 };
+
+const handleEdit = (row) => {
+  formDialogRef.value.openOrCloseDialog(true)
+  getDetail(row)
+  dialogTitle.value = "编辑用户";
+  dialogType.value = "edit";
+}
+
+const getDetail = (row) => {
+  getUserDetail(row.userId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      nextTick(() => {
+        formDialogRef.value.getFormInstance().setValues(res.data)
+        // 清空校验
+        formDialogRef.value.getFormInstance().clearValidate()
+      })
+    } else {
+    }
+  })
+}
+
 //取消
 const handleCancel = () => {
   showAddOrEditUserDialog.value = false;
 };
-
 //提交
 const handleSubmit = async (formInstance) => {
   if (!formInstance) return;
-  formInstance.validate(async (valid) => {
-    if (!valid) return;
-    // if (title.value === "新增用户") {
-    //   addUser(userForm.value).then(res => {
-    //     if (res.code === 1000) {
-    //       ElMessage.success(res.msg);
-    //       isVisited.value = false;
-    //     } else {
-    //       ElMessage.error(res.msg);
-    //     }
-    //   });
-    // }
-  })
+  let validate = await formInstance.validate()
+  if (!validate.isValidate) return;
+  if (dialogType.value === "add") {
+    addUser(formInstance.getValues()).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  }
+  // editUser
 }
 </script>

From 925b3de4f981ae9622c2c87a238be9141f2f167d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 3 Oct 2024 17:21:26 +0800
Subject: [PATCH 20/22] =?UTF-8?q?build=20:=20=E5=90=AF=E5=8A=A8npm=20insta?=
 =?UTF-8?q?ll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index a877aa2..d1c91ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,7 +20,7 @@ steps:
       - npm -v
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
-      # - npm config set registry https://registry.npmmirror.com
+      - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
       - npm install
       - npm run build

From 25da31b03440e14ac2de07ffc73d075c54a9256e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 3 Oct 2024 17:25:47 +0800
Subject: [PATCH 21/22] =?UTF-8?q?build=20:=20=E5=90=AF=E5=8A=A8npm=20insta?=
 =?UTF-8?q?ll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d1c91ec..15b7821 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,9 +20,9 @@ steps:
       - npm -v
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
-      - npm config set registry https://registry.npmmirror.com
-      - set NODE_OPTIONS=--openssl-legacy-provider
-      - npm install
+#      - npm config set registry https://registry.npmmirror.com
+#      - set NODE_OPTIONS=--openssl-legacy-provider
+#      - npm install
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

From d6e6843ecbb8cdd33e30f78368ae47bf3e474f90 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 6 Oct 2024 19:25:02 +0800
Subject: [PATCH 22/22] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/infoLiveCall/index.vue        | 74 ++++++++++++-------
 src/components/liveCall/LiveCallItem.vue     | 21 ++++--
 src/components/liveCall/LiveCallItemHome.vue | 35 +++++++--
 src/components/liveCall/index.vue            | 78 +++++---------------
 src/views/home/index.vue                     | 12 ++-
 5 files changed, 117 insertions(+), 103 deletions(-)

diff --git a/src/components/infoLiveCall/index.vue b/src/components/infoLiveCall/index.vue
index fff0633..bd8045b 100644
--- a/src/components/infoLiveCall/index.vue
+++ b/src/components/infoLiveCall/index.vue
@@ -1,11 +1,16 @@
 <script setup>
 import LiveCallItem from '@/components/liveCall/LiveCallItem.vue'
 import {getHistoryCallContent} from '@/api/workbench';
+import {ElMessage} from "element-plus";
 
 const dialogVisible = ref(false);
 const recordLeftRef = ref(null);
+const emit = defineEmits(['update:value'])
 const props = defineProps({
-  rowData: String
+  value: {
+    type:String,
+    default:''
+  }
 })
 
 const open = (row) => {
@@ -13,14 +18,20 @@ const open = (row) => {
 };
 
 const leftHeadData = ref({
-  username: '张三',
-  phone: '13546812315',
-  orderName: '张三工单',
+  // username: '张三',
+  // phone: '13546812315',
+  // orderName: '张三工单',
+})
+const detailLoading=ref(false)
+const recordLeftObj = ref({});
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("update:value", val);
+  }
 })
-
-const recordLeftObj = ref({
-  content: []
-});
 const convertArrayToMap=(array)=> {
   const map = new Map();
   array.forEach(item => {
@@ -35,22 +46,33 @@ const convertArrayToMap=(array)=> {
   return map;
 }
 
-watch(() => props.rowData, async (newVal) => {
-  recordLeftObj.value.content = []
-  // let map1 = new Map()
-  await getHistoryCallContent(newVal).then(res => {
-    res.data?.forEach(item => {
-      item.textVoList = convertArrayToMap(item.textVoList);
-    })
-    recordLeftObj.value = res.data
-    // console.info("🚀 ~method:res.data -----", res.data)
-    if (res.data && res.data.length > 0) {
-      leftHeadData.value.username = res.data[0].callIdNumber || '--';
-      leftHeadData.value.phone = res.data[0].callPhone || '--';
-      leftHeadData.value.orderName = res.data[0].orderName || '--';
-    }
-  })
+watch(() => props.value, async (newVal) => {
+  if(newVal){
+
+    getHistoryDetail(newVal)
+  }
 })
+const getHistoryDetail=(newVal)=>{
+  detailLoading.value=true
+   getHistoryCallContent(newVal).then(res => {
+     if (res.code === 1000) {
+       detailLoading.value=false
+       res.data?.forEach(item => {
+         if( item.textVoList&& item.textVoList.length>0){
+           item.textVoList = convertArrayToMap(item.textVoList);
+         }
+       })
+       recordLeftObj.value = res.data
+       if (res.data && res.data.length > 0) {
+         leftHeadData.value.username = res.data[0].callIdNumber || '--';
+         leftHeadData.value.phone = res.data[0].callPhone || '--';
+         leftHeadData.value.orderName = res.data[0].orderName || '--';
+       }
+     } else {
+       ElMessage.error(res.msg);
+     }
+  })
+}
 
 const scrollToBottom = (scrollbarRef) => {
   if (scrollbarRef) {
@@ -68,8 +90,8 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="历史通话记录" width="600" class="box">
-    <LiveCallItem ref="recordLeftRef" :recordArray="recordLeftObj" :headData="leftHeadData" style="width: 100%;"/>
+  <el-dialog v-model="dialogVisible" title="历史通话记录" width="700" class="box">
+    <LiveCallItem ref="recordLeftRef" :recordArray="recordLeftObj" :headData="leftHeadData" style="width: 100%;" :detailLoading="detailLoading"/>
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false">
@@ -82,6 +104,6 @@ defineExpose({
 
 <style>
 .box {
-  height: 68vh;
+  /*height: 68vh;*/
 }
 </style>
diff --git a/src/components/liveCall/LiveCallItem.vue b/src/components/liveCall/LiveCallItem.vue
index c27172b..2c7c793 100644
--- a/src/components/liveCall/LiveCallItem.vue
+++ b/src/components/liveCall/LiveCallItem.vue
@@ -1,11 +1,13 @@
 <template>
-  <div class="live-call">
+  <div class="live-call" v-loading="detailLoading">
     <div class="header">
       <div>
         <span style="margin-right: 20px">{{ headData.username }}</span>
-        <span>电话号码：{{ headData.phone }}</span>
       </div>
-      <div><span>工单名称：{{ headData.orderName }}</span></div>
+      <div>
+        <span>电话号码：{{ headData.phone ||'--'}}</span>
+      </div>
+      <div><span>工单名称：{{ headData.orderName ||'--'}}</span></div>
     </div>
     <el-scrollbar ref="scrollbarRef" class="scrollbar">
       <div class="chat-content" ref="innerRef">
@@ -31,8 +33,10 @@
               </div>
             </div>
           </div>
-          <el-divider border-style="dotted" v-if="item">一轮通话结束~~</el-divider>
+          <el-divider border-style="dotted" v-if="item.textVoList&&item.textVoList.length>0">一轮通话结束~~</el-divider>
         </div>
+<!--                  <el-empty description="暂无通话记录~" v-if="recordArray"/>-->
+
       </div>
     </el-scrollbar>
   </div>
@@ -51,10 +55,17 @@ const props = defineProps({
     type: Object,
     default: {}
   },
+  detailLoading: {
+    type: Boolean,
+    default: false
+  },
 })
 const getScrollbarRef = () => {
   return scrollbarRef.value
 }
+watch(() => props.detailLoading,  (newVal) => {
+  props.detailLoading=newVal
+})
 defineExpose({
   getScrollbarRef
 })
@@ -62,7 +73,7 @@ defineExpose({
 
 <style lang="scss" scoped>
 .live-call {
-  width: 48%;
+  width: 50%;
   height: 47vh;
   margin-bottom: 20px;
   overflow: hidden;
diff --git a/src/components/liveCall/LiveCallItemHome.vue b/src/components/liveCall/LiveCallItemHome.vue
index 1084c5c..58bc90c 100644
--- a/src/components/liveCall/LiveCallItemHome.vue
+++ b/src/components/liveCall/LiveCallItemHome.vue
@@ -2,10 +2,11 @@
   <div class="live-call">
     <div class="header">
       <div>
-        <span style="margin-right: 20px">{{ headData.username }}</span>
-        <span>{{ headData.phone }}</span>
+        <span style="margin-right: 20px">姓名：{{ recordObj.name ||'--'}}</span>
+        <span>电话号码：{{ recordObj.phone ||'--'}}</span>
       </div>
-      <div><span>工单名称：{{ headData.orderName }}</span></div>
+      <div><span>工单名称：{{ recordObj.orderName||'--' }}</span></div>
+      <div><span>{{ recordObj.type=='1'?'线路一':recordObj.type=='2'?'线路二':'' }}</span></div>
     </div>
     <el-scrollbar ref="scrollbarRef" class="scrollbar">
       <div class="chat-content" ref="innerRef">
@@ -14,7 +15,8 @@
           <!-- 我的 -->
           <div v-if="item.speaker==0" class="word-my">
             <div class="info">
-              <p class="name">{{ item.speaker==0?headData.username:'AI助手' }} </p>
+<!--              <p class="name">{{ item.speaker==0?recordObj.name:'AI助手' }} </p>-->
+              <p class="name">{{ item.speaker==0?item.callIdNumber:'AI助手' }} </p>
               <div class="info-content">{{ item.message }}</div>
             </div>
             <el-avatar text="我"/>
@@ -23,11 +25,15 @@
           <div v-else class="word">
             <el-avatar text="对方"/>
             <div class="info">
-              <p class="name">{{ item.speaker==0?headData.username:'AI助手'  }} </p>
+              <p class="name">{{ item.speaker==0?item.callIdNumber:'AI助手' }} </p>
               <div class="info-content">{{ item.message }}</div>
             </div>
           </div>
         </div>
+
+<!--                  <el-divider border-style="dotted" v-if="handleShowDeadLine(recordObj)">一轮通话结束~~</el-divider>-->
+<!--        <el-empty description="暂无通话记录~" v-else/>-->
+
       </div>
     </el-scrollbar>
   </div>
@@ -46,9 +52,28 @@ const props = defineProps({
     default: {}
   },
 })
+
 const getScrollbarRef=()=>{
   return  scrollbarRef.value
 }
+const handleShowDeadLine=(recordObj)=>{
+  console.info("🚀 ~method:'recordObj' -----", recordObj)
+  let flag=false
+  if(recordObj.content&&recordObj.content.length>1){
+        let indices = recordObj.content.reduce(function (r, v, i) {
+          return r.concat(v === 'a' ? i : []);
+        }, []);
+
+    console.log(indices);
+
+    recordObj.content.forEach((item,index)=>{
+      console.info("🚀 ~method:.callIdNumber -----",recordObj.content.findIndex(item=>item.callIdNumber), item.callIdNumber)
+      flag=recordObj.content[recordObj.content.length-2]?.callIdNumber!=recordObj.content[recordObj.content.length-1].callIdNumber
+
+    })
+  }
+return flag;
+}
 defineExpose({
   getScrollbarRef
 })
diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue
index 0c70640..1289503 100644
--- a/src/components/liveCall/index.vue
+++ b/src/components/liveCall/index.vue
@@ -17,71 +17,21 @@ const authStore = useAuthStore()
 const recordLeftRef = ref(null);
 const recordRightRef = ref(null);
 const leftHeadData = ref({
-  username: '张三',
-  phone: '13546812315',
-  orderName: '张三工单',
+  // username: '张三',
+  // phone: '13546812315',
+  // orderName: '张三工单',
 })
 const rightHeadData = ref({
-  username: '李四',
-  phone: '18246812546',
-  orderName: '李四工单',
+  // username: '李四',
+  // phone: '18246812546',
+  // orderName: '李四工单',
 })
 const recordLeftObj = ref({
-      content: []
-    }
-    // {
-    //   "callIdNumber": "17260625724565",
-    //   "content": [{
-    //     "callIdNumber": "17260625724565",
-    //     "conversationId": 0,
-    //     "conversationTimestamp": "2024-09-15 12:10",
-    //     "createTime": "2024-09-16",
-    //     "message": "你好11",
-    //     "speaker": "1"
-    //   },
-    //     {
-    //       "callIdNumber": "17260625724565",
-    //       "conversationId": 0,
-    //       "conversationTimestamp": "2024-09-15 16:10",
-    //       "createTime": "2024-09-16",
-    //       "message": "你好好11!",
-    //       "speaker": "0"
-    //     }
-    //   ],
-    //   "name": "",
-    //   "phone": "",
-    //   "timestamp": "1726416597958",
-    //   "type": "1"
-    // }
-)
+  content: []
+})
 const recordRightObj = ref({
-      content: []
-    }
-    // {
-    //   "callIdNumber": "17260625724123",
-    //   "content": [{
-    //     "callIdNumber": "17260625724123",
-    //     "conversationId": 0,
-    //     "conversationTimestamp": "2024-09-15 12:10",
-    //     "createTime": "2024-09-16",
-    //     "message": "你好22",
-    //     "speaker": "1"
-    //   },
-    //     {
-    //       "callIdNumber": "17260625724123",
-    //       "conversationId": 0,
-    //       "conversationTimestamp": "2024-09-15 16:10",
-    //       "createTime": "2024-09-16",
-    //       "message": "你好好222!",
-    //       "speaker": "0"
-    //     }
-    //   ],
-    //   "name": "",
-    //   "phone": "",
-    //   "timestamp": "1726416597958",
-    //   "type": "2"
-    // }
-)
+  content: []
+})
 let socket = reactive("");
 let token = getToken();
 let send = {
@@ -139,12 +89,20 @@ const initWebSocket = () => {
         }
         console.log("服务器返回的信息: ", data);
         if (data.type == '1') {
+          recordLeftObj.value.name=data.name
+          recordLeftObj.value.phone=data.phone
+          recordLeftObj.value.type=data.type
+          recordLeftObj.value.orderName=data.orderName
           recordLeftObj.value.content.push(data.content)
           // console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
           nextTick(() => {
             scrollToBottom(recordLeftRef.value)
           })
         } else {
+          recordRightObj.value.name=data.name
+          recordRightObj.value.phone=data.phone
+          recordRightObj.value.type=data.type
+          recordRightObj.value.orderName=data.orderName
           recordRightObj.value.content.push(data.content)
           // console.info("🚀 ~method:onmessage -----", recordRightObj.value)
           nextTick(() => {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index a1c1bec..730561b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -8,7 +8,7 @@
       <h3>历史通话记录</h3>
       <fvTable ref="tableIns" :tableConfig="tableConfig"></fvTable>
       <voice ref="voiceRef" title="语音详情" :rowUrl="rowUrl" />
-      <infoLiveCall ref="infoLiveCallRef" :rowData="rowData" />
+      <infoLiveCall ref="infoLiveCallRef" v-model:value="orderNumber" />
     </div>
   </div>
 </template>
@@ -17,7 +17,7 @@
 import LiveCall from '@/components/liveCall/index.vue'
 import Voice from '@/components/voice/index.vue'
 import InfoLiveCall from '@/components/infoLiveCall/index.vue'
-const rowData = ref()
+const orderNumber = ref('')
 const rowUrl = ref()
 const infoLiveCallRef = ref()
 const voiceRef = ref()
@@ -121,7 +121,6 @@ const tableConfig = reactive({
   ],
   api: '/order/list',
   params: {
-    orderState: '2'
   }
 })
 const handleVoice = (row) => {
@@ -137,10 +136,9 @@ const handleVoice = (row) => {
 
 }
 const handleInfo = (row) => {
-  console.log(row);
-
-  infoLiveCallRef.value.open(true)
-  rowData.value = row.orderNumber
+  console.log('fefe',row.orderNumber);
+  orderNumber.value = row.orderNumber
+  infoLiveCallRef.value.open()
 }
 </script>