From ed7bce1f736fa927ba12b253e3cc4464863e5b83 Mon Sep 17 00:00:00 2001
From: liangbin <15536829364@163.com>
Date: Wed, 4 Feb 2026 16:36:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=80=BB=E8=A7=88API=E5=B9=B6=E4=BC=98=E5=8C=96=E7=90=83?=
 =?UTF-8?q?=E6=9C=BA=E5=88=86=E9=85=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增项目总览API接口，用于查询项目列表
优化球机分配功能，增加分配状态判断和自动刷新列表
修改项目总览页面，移除无用tab并简化施工单位输入
格式化球机分配时间，确保数据格式统一
---
 src/api/general.js                                  | 10 ++++++++++
 src/views/Proprietor/ProjectOverview/index.vue      | 13 ++-----------
 .../Tenement/BallheadCamera/HighRiskProject.vue     |  3 ++-
 .../Tenement/BallheadCamera/components/DialogA.vue  |  4 +++-
 4 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 src/api/general.js

diff --git a/src/api/general.js b/src/api/general.js
new file mode 100644
index 0000000..b02e54e
--- /dev/null
+++ b/src/api/general.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询项目总览列表
+export function FetchProjectOverviewList(query) {
+  return request({
+    url: '/manage/contractor/projectFullProcess/list ',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/Proprietor/ProjectOverview/index.vue b/src/views/Proprietor/ProjectOverview/index.vue
index 2c665d2..06d3c7a 100644
--- a/src/views/Proprietor/ProjectOverview/index.vue
+++ b/src/views/Proprietor/ProjectOverview/index.vue
@@ -1,21 +1,13 @@
 <!-- 业主模块-项目总览-列表页 -->
 <template>
     <div class="MainBox">
-        <el-tabs v-model="activeTab" class="mb-4">
-            <el-tab-pane label="签发列表" name="1"></el-tab-pane>
-            <el-tab-pane label="历史记录" name="2"></el-tab-pane>
-            <el-tab-pane label="统计报表" name="3"></el-tab-pane>
-        </el-tabs>
+        
         <el-form :model="queryForm" inline class="card-box mb-4" label-position="top">
             <el-form-item label="项目名称/编号">
                 <el-input v-model="queryForm.name" placeholder="请输入项目名称/编号"></el-input>
             </el-form-item>
             <el-form-item label="施工单位">
-                <el-select v-model="queryForm.enterpriseName" placeholder="请选择施工单位">
-                    <el-option label="单位1" value="1"></el-option>
-                    <el-option label="单位2" value="2"></el-option>
-                    <el-option label="单位3" value="3"></el-option>
-                </el-select>
+               <el-input v-model="queryForm.enterpriseName" placeholder="请输入施工单位"></el-input>
             </el-form-item>
             <el-form-item label="作业类型">
                 <el-select v-model="queryForm.jobType" placeholder="请选择作业类型">
@@ -92,7 +84,6 @@
 </template>
 <script setup name="Index">
 import { ref } from "vue";
-const activeTab = ref("1"); // 当前选中的tab
 
 // 查询表单数据
 const queryForm = ref({
diff --git a/src/views/Tenement/BallheadCamera/HighRiskProject.vue b/src/views/Tenement/BallheadCamera/HighRiskProject.vue
index cb3fb94..9aeeee9 100644
--- a/src/views/Tenement/BallheadCamera/HighRiskProject.vue
+++ b/src/views/Tenement/BallheadCamera/HighRiskProject.vue
@@ -46,7 +46,7 @@
                 </el-table-column>
                 <el-table-column label="操作" width="180">
                     <template #default="scope">
-                        <el-button size="small" type="text" @click="handleAssignBallhead(scope.row)">分配球机</el-button>
+                        <el-button v-if="scope.row.allocStatus === '0'" size="small" type="text" @click="handleAssignBallhead(scope.row)">分配球机</el-button>
                         <el-button size="small" type="primary" link @click="handleViewDetail(scope.row)">查看详情</el-button>
                     </template>
                 </el-table-column>
@@ -182,6 +182,7 @@ const handleCancel = () => {
     console.log('关闭弹窗')
     dialogShow.value = false
     isReadonly.value = false
+    getList()
 }
 
 
diff --git a/src/views/Tenement/BallheadCamera/components/DialogA.vue b/src/views/Tenement/BallheadCamera/components/DialogA.vue
index 24271e1..c25c9be 100644
--- a/src/views/Tenement/BallheadCamera/components/DialogA.vue
+++ b/src/views/Tenement/BallheadCamera/components/DialogA.vue
@@ -90,6 +90,7 @@
 </template>
 
 <script setup>
+import dayjs from 'dayjs'
 import { ref, watch, defineProps } from 'vue'
 import { listAvailableCamera, confirmAllocation, getAllocationDetail, getCameraDetail } from '@/api/tenement/highRiskProject'
 import { ElMessage } from 'element-plus'
@@ -359,10 +360,11 @@ const handleSubmit = async () => {
 
     // 准备提交数据
     const submitData = {
+        applicationId: props.projectInfo?.applicationId || '', // 球机申请表ID
         projectId: props.projectInfo?.id || props.projectInfo?.projectId, // 项目ID
         cameraIds: selectedCameras.value.map(camera => camera.id || camera.cameraId), // 选中的球机ID数组
         allocBy: form.value.assigner, // 分配人
-        allocTime: form.value.assignTime, // 分配时间
+        allocTime: dayjs(form.value.assignTime).format('YYYY-MM-DD HH:mm:ss'), // 分配时间
         allocNote: form.value.deliveryAddress // 配送地址
     }