From 3090bc43d319f9c382cf98bb7f3a5950c6f4e506 Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Thu, 7 Aug 2025 09:30:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8C=BA=E5=9F=9F-=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E5=92=8C?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/jobarea/index.vue        | 14 +++++++++++++-
 src/views/demo/jobarea/pathAreaInfo.vue |  8 ++++++++
 src/views/demo/jobarea/pathLeftMenu.vue | 15 ++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/views/demo/jobarea/index.vue b/src/views/demo/jobarea/index.vue
index aeeb8d1..8bd8f43 100644
--- a/src/views/demo/jobarea/index.vue
+++ b/src/views/demo/jobarea/index.vue
@@ -8,6 +8,7 @@
           :allAreaDataList="allAreaDataList"
           :allWorkspaceDataList="allWorkspaceDataList"
           :nowShowAreaData="nowShowAreaData"
+          :projectList="projectList"
           @changeLeftMenuShow="changeLeftMenuShow"
           @handlerLocation="handlerLocation"
           @changeAnnotationInfoShow="changeAnnotationInfoShow"
@@ -84,6 +85,10 @@
     // 左侧目录是否显示----------------------------------------------------
     const pathLeftMenuRef = ref();
     const leftMenuShow = ref(true);
+
+    const projectList = ref([
+      { label: '全部项目', value: 'all' },
+    ])
     function changeLeftMenuShow() {
       leftMenuShow.value = !leftMenuShow.value;
     }
@@ -95,6 +100,13 @@
     function getWorksListData() {
       GetWorkspaceList().then((result1) => {
           allWorkspaceDataList.value = result1;
+          console.log('projectlist',result1)
+          result1.forEach(item => {
+            projectList.value.push({
+              label: item.WorkspaceName,
+              value: item.Id
+            })
+          })
       })
     }
     // 关闭右侧标注
@@ -256,7 +268,7 @@
         z-index:1;
         display:flex;
         gap:15px;
-        width: 340px;
+        width: 423px;
       }
   
       .mapDiv {
diff --git a/src/views/demo/jobarea/pathAreaInfo.vue b/src/views/demo/jobarea/pathAreaInfo.vue
index 6acf4fc..997f15f 100644
--- a/src/views/demo/jobarea/pathAreaInfo.vue
+++ b/src/views/demo/jobarea/pathAreaInfo.vue
@@ -110,6 +110,14 @@
       <a-col :span="18">
         <div class="annotationContent"> {{ props.nowShowAreaData.createUserName }}</div>
       </a-col>
+      <a-col :span="6">
+        <div class="annotationTitle">所属项目</div>
+      </a-col>
+      <a-col :span="18">
+        <div class="annotationContent">
+          {{ props.nowShowAreaData.workSpaceName}}
+        </div>
+      </a-col>
     </a-row>
   </div>
 </template>
diff --git a/src/views/demo/jobarea/pathLeftMenu.vue b/src/views/demo/jobarea/pathLeftMenu.vue
index a5274ec..25284dd 100644
--- a/src/views/demo/jobarea/pathLeftMenu.vue
+++ b/src/views/demo/jobarea/pathLeftMenu.vue
@@ -20,13 +20,20 @@
             </a-select>
             <a-select
               v-model:value="areastate"
-              style="width: 120px"
+              style="width: 120px; margin-right: 15px;"
               @change="handleChangeAreaSelect"
             >
               <a-select-option value="all">全部状态</a-select-option>
               <a-select-option value="0">已启用</a-select-option>
               <a-select-option value="1">已禁用</a-select-option>
             </a-select>
+            <a-select
+              v-model:value="areaProject"
+              style="width: 120px"
+              placeholder="全部项目"
+              @change="handleChangeAreaSelect"
+              :options="props.projectList"
+            />
           </div>
           <!-- 列表 -->
           <div v-for="show in showMenuInfoList" :key="show.id">
@@ -196,6 +203,7 @@
     'allWorkspaceDataList',
     'allAreaDataList',
     'nowShowAreaData',
+    'projectList'
   ]);
   const emits = defineEmits([
     'changeLeftMenuShow',
@@ -224,6 +232,7 @@
   // 地图作业区域-单选
   const areatype = ref('all');
   const areastate = ref('all');
+  const areaProject = ref('all')
   // 地图作业区域-获取类别区分
   function getType(type) {
     let name = '';
@@ -244,12 +253,16 @@
   const filterAfterAreaDataList = ref(props.allAreaDataList);
   function handleChangeAreaSelect() {
     let filterAreaData = props.allAreaDataList;
+    console.log('filterAreaData',filterAreaData)
     if (areatype.value !== 'all') {
       filterAreaData = filterAreaData.filter((item) => item.type == areatype.value);
     }
     if (areastate.value !== 'all') {
       filterAreaData = filterAreaData.filter((item) => item.state == areastate.value);
     }
+    if (areaProject.value !== 'all') {
+      filterAreaData = filterAreaData.filter((item) => item.workSpaceId == areaProject.value);
+    }
     filterAreaData.forEach((annotation) => {
       props.allWorkspaceDataList.forEach((tree) => {
         if (tree.Id == annotation.workSpaceId) {