From 0f6ce84b4f8852d3c5f158439fac682d6d9fe17e Mon Sep 17 00:00:00 2001
From: qingyu <14049064+qingyuya123@user.noreply.gitee.com>
Date: Tue, 1 Jul 2025 16:02:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dynamic/videoCenter/index.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/views/dynamic/videoCenter/index.vue b/src/views/dynamic/videoCenter/index.vue
index eb3e500..f4eb306 100644
--- a/src/views/dynamic/videoCenter/index.vue
+++ b/src/views/dynamic/videoCenter/index.vue
@@ -115,13 +115,6 @@
         </div>
     </div>
 
-    <div class="timeline">
-        <div v-for="item in listData" :key="item.id" class="timeline-item">
-            <div class="timeline-date">{{ item.year }}年{{ item.month }}月</div>
-            <div class="timeline-event">{{ item.title }}</div>
-        </div>
-    </div>
-
 </template>
 
 <script setup>

From 2fa2ee8fab1a3e20b713e91b840e24170c9e4764 Mon Sep 17 00:00:00 2001
From: qingyu <14049064+qingyuya123@user.noreply.gitee.com>
Date: Tue, 1 Jul 2025 16:11:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=9B=E8=81=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/recruitment/components/EditDialog.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/recruitment/components/EditDialog.vue b/src/views/recruitment/components/EditDialog.vue
index 6f07d0c..4e7c4e3 100644
--- a/src/views/recruitment/components/EditDialog.vue
+++ b/src/views/recruitment/components/EditDialog.vue
@@ -152,10 +152,10 @@ function handleCreate() {
     formData.value.status = 'enabled'
 }
 
-
 //新建基地
 
 const childHandleOk = async () => {
+
     areaFormRef.value.validateFields().then(async (values) => {
         try {
             const params = { ...formArea.value }
@@ -174,6 +174,7 @@ const childHandleOk = async () => {
  * 编辑
  */
 async function handleEdit(record = {}) {
+    initData()
     showModal({
         type: 'edit',
         title: t('pages.system.user.edit'),

From 2b839595d7830ed9e9488d38df8e53414008e112 Mon Sep 17 00:00:00 2001
From: qingyu <14049064+qingyuya123@user.noreply.gitee.com>
Date: Tue, 1 Jul 2025 17:20:32 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8B=9B=E8=81=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/recruitment/index.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/recruitment/index.vue b/src/views/recruitment/index.vue
index 576a2ba..fd604ac 100644
--- a/src/views/recruitment/index.vue
+++ b/src/views/recruitment/index.vue
@@ -206,12 +206,7 @@ async function onOk() {
  * 编辑基地
  */
 function handleCreateJD() {
-    showModal({
-        type: 'edit',
-        title: '编辑地基',
-    })
-    initData()
-    formData.value.status = 'enabled'
+   console.log('createJD')
 }
 </script>
 

From f980db53c75daf91701d2038ab5059e5c2befb01 Mon Sep 17 00:00:00 2001
From: qingyu <14049064+qingyuya123@user.noreply.gitee.com>
Date: Tue, 1 Jul 2025 17:50:02 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=8B=9B=E8=81=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                        |  4 ++--
 src/views/recruitment/index.vue | 35 ++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.env.dev b/.env.dev
index bcb46e7..bb781b0 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ VITE_ROUTER_BASE=/
 VITE_ROUTER_HISTORY=hash
 
 # api
-#VITE_API_BASIC=https://api.hailin-keji.com
-VITE_API_BASIC=http://10.10.1.6:8060
+VITE_API_BASIC=https://api.hailin-keji.com
+#VITE_API_BASIC=http://10.10.1.6:8060
 VITE_API_HTTP=/api/v1/
 # storage
 VITE_STORAGE_NAMESPACE = gin-admin_local_
diff --git a/src/views/recruitment/index.vue b/src/views/recruitment/index.vue
index fd604ac..3f0c74c 100644
--- a/src/views/recruitment/index.vue
+++ b/src/views/recruitment/index.vue
@@ -110,7 +110,13 @@ const columns = [
     { title: '状态', dataIndex: 'status',width:80 , align: 'center'},
     { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' },
 ]
-
+const areaList = ref([]); // 列表数据
+const editDialogVisible = ref(false); // 弹框开关
+const editForm = reactive({
+    name: '',
+    sequence: 0,
+    status: 'disabled',
+});
 const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } =
     usePagination()
 
@@ -205,9 +211,32 @@ async function onOk() {
 /**
  * 编辑基地
  */
-function handleCreateJD() {
-   console.log('createJD')
+async function handleCreateJD() {
+    console.log('createJD');
+    try {
+        showLoading();
+        const { pageSize, current } = paginationState;
+        const { success, data, total } = await apis.recruitment
+            .getAreasList({
+                pageSize,
+                current: current,
+                ...searchFormData.value,
+            })
+            .catch(() => {
+                throw new Error();
+            });
+        hideLoading();
+        if (config('http.code.success') === success) {
+            areaList.value = data;
+            console.log(areaList.value);
+            paginationState.total = total;
+        }
+    } catch (error) {
+        hideLoading();
+        console.error('Error in handleCreateJD:', error);
+    }
 }
+
 </script>
 
 <style lang="less" scoped></style>

From e820e58250b751c8278dc9b496e5646ca38e95c1 Mon Sep 17 00:00:00 2001
From: qingyu <14049064+qingyuya123@user.noreply.gitee.com>
Date: Tue, 1 Jul 2025 18:22:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=8B=9B=E8=81=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/recruitment/index.vue | 91 +++++++++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 3 deletions(-)

diff --git a/src/views/recruitment/index.vue b/src/views/recruitment/index.vue
index 3f0c74c..2a170b4 100644
--- a/src/views/recruitment/index.vue
+++ b/src/views/recruitment/index.vue
@@ -82,6 +82,55 @@
     </a-row>
 
     <edit-dialog ref="editDialogRef" @ok="onOk"></edit-dialog>
+
+    <a-modal v-model:visible="showEditModal" title="编辑区域" @ok="submitEdit" @cancel="showEditModal = false">
+        <a-form :model="editFormData">
+            <a-form-item label="选择区域">
+                <a-select v-model:value="currentAreaId" @change="onAreaChange" placeholder="请选择区域">
+                    <a-select-option v-for="item in areaList" :key="item.id" :value="item.id">
+                        {{ item.name }}
+                    </a-select-option>
+                </a-select>
+            </a-form-item>
+
+            <a-form-item label="名称">
+                <a-input v-model:value="editFormData.name" />
+            </a-form-item>
+
+            <a-form-item label="序号">
+                <a-input-number v-model:value="editFormData.sequence" />
+            </a-form-item>
+
+            <a-form-item label="状态">
+                <a-select v-model:value="editFormData.status">
+                    <a-select-option value="enabled">启用</a-select-option>
+                    <a-select-option value="disabled">禁用</a-select-option>
+                </a-select>
+            </a-form-item>
+        </a-form>
+    </a-modal>
+
+
+
+
+    <!--    <a-modal v-model:visible="showEditModal" title="编辑区域" @ok="submitEdit" @cancel="showEditModal = false">-->
+<!--        <a-form :model="editFormData">-->
+<!--            <a-form-item label="名称">-->
+<!--                <a-input v-model:value="editFormData.name" />-->
+<!--            </a-form-item>-->
+<!--            <a-form-item label="序号">-->
+<!--                <a-input-number v-model:value="editFormData.sequence" />-->
+<!--            </a-form-item>-->
+<!--            <a-form-item label="状态">-->
+<!--                <a-select v-model:value="editFormData.status">-->
+<!--                    <a-select-option value="enabled">启用</a-select-option>-->
+<!--                    <a-select-option value="disabled">禁用</a-select-option>-->
+<!--                </a-select>-->
+<!--            </a-form-item>-->
+<!--        </a-form>-->
+<!--    </a-modal>-->
+
+
 </template>
 
 <script setup>
@@ -110,13 +159,16 @@ const columns = [
     { title: '状态', dataIndex: 'status',width:80 , align: 'center'},
     { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' },
 ]
+
 const areaList = ref([]); // 列表数据
-const editDialogVisible = ref(false); // 弹框开关
-const editForm = reactive({
+const showEditModal = ref(false);
+const editFormData = ref({
     name: '',
     sequence: 0,
     status: 'disabled',
 });
+const currentAreaId = ref(null);
+
 const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } =
     usePagination()
 
@@ -229,11 +281,44 @@ async function handleCreateJD() {
         if (config('http.code.success') === success) {
             areaList.value = data;
             console.log(areaList.value);
+            openEditModal(data[0] || { name: '', sequence: 0, status: 'enabled' });
             paginationState.total = total;
         }
     } catch (error) {
         hideLoading();
-        console.error('Error in handleCreateJD:', error);
+        console.error('Error in handleCreateJD:', error?.message || error);
+
+    }
+}
+function openEditModal(areaItem) {
+    editFormData.value = { ...areaItem };
+    currentAreaId.value = areaItem.id;
+    showEditModal.value = true;
+}
+
+function onAreaChange(id) {
+    const target = areaList.value.find(item => item.id === id);
+    if (target) {
+        editFormData.value = { ...target };
+    }
+}
+
+async function submitEdit() {
+    try {
+        showLoading();
+        const res = await apis.recruitment.updateArea(editFormData.value);
+        hideLoading();
+        if (config('http.code.success') === res.success) {
+            ElMessage.success('修改成功');
+            showEditModal.value = false;
+            handleCreateJD(); // 重新刷新列表
+        } else {
+            ElMessage.error('修改失败');
+        }
+    } catch (error) {
+        hideLoading();
+        console.error('Error in submitEdit:', error);
+        ElMessage.error('请求异常');
     }
 }