diff --git a/backend/move/pom.xml b/backend/move/pom.xml
index 54f6e41..ad34ac0 100644
--- a/backend/move/pom.xml
+++ b/backend/move/pom.xml
@@ -51,6 +51,11 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>3.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.0</version>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
diff --git a/backend/move/src/main/java/com/example/move/controller/CarProjectController.java b/backend/move/src/main/java/com/example/move/controller/CarProjectController.java
index 2ed5f66..a0f5fc0 100644
--- a/backend/move/src/main/java/com/example/move/controller/CarProjectController.java
+++ b/backend/move/src/main/java/com/example/move/controller/CarProjectController.java
@@ -1,14 +1,16 @@
 package com.example.move.controller;
 
-import com.example.move.pojo.CarProject;
-import com.example.move.pojo.Result;
+import com.example.move.pojo.*;
+import com.example.move.service.CarMoveService;
 import com.example.move.service.CarProjectService;
+import com.example.move.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -17,9 +19,36 @@ public class CarProjectController {
     @Autowired
     private CarProjectService carProjectService;
 
+    @Autowired
+    private CarMoveService carMoveService;
+
+    @Autowired
+    private StaffService staffService;
+
     @GetMapping("/queryCarByProId")
     public Result queryCarByProId(@RequestParam Integer proId) {
         List<CarProject> carProjectList = carProjectService.queryCarByProId(proId);
-        return Result.success(carProjectList);
+        int n = carProjectList.size();
+        List<CarProjectMove> carProjectMove = new ArrayList<CarProjectMove>(n);
+        List<CarMove> carMoveList;
+        String name;
+        for (int i=0;i<carProjectList.size();i++)
+        {
+            System.out.println(carProjectList);
+            carMoveList = carMoveService.queryCarByCarId(carProjectList.get(i).getCarId());
+            System.out.println(carMoveList.get(0));
+            CarProjectMove carProjectMove1 = new CarProjectMove();
+            Staff staff = staffService.staffNameByStaffid(carProjectList.get(i).getCarPersonalId()).get(0);
+            System.out.println(staff);
+            carProjectMove1.setCarId(carMoveList.get(0).getCarId());
+            carProjectMove1.setCarName(carMoveList.get(0).getCarName());
+            carProjectMove1.setCarImage(carMoveList.get(0).getCarImage());
+            carProjectMove1.setCarNumber(carMoveList.get(0).getCarNumber());
+            carProjectMove1.setCarEndTime(carProjectList.get(i).getCarEndTime());
+            carProjectMove1.setCarStartTime(carProjectList.get(i).getCarStartTime());
+            carProjectMove1.setName(staff.getStaffName());
+            carProjectMove.add(carProjectMove1);
+        }
+        return Result.success(carProjectMove);
     }
 }
diff --git a/backend/move/src/main/java/com/example/move/mapper/StaffMapper.java b/backend/move/src/main/java/com/example/move/mapper/StaffMapper.java
new file mode 100644
index 0000000..047a84c
--- /dev/null
+++ b/backend/move/src/main/java/com/example/move/mapper/StaffMapper.java
@@ -0,0 +1,24 @@
+package com.example.move.mapper;
+
+import com.example.move.pojo.Staff;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+* @author liuwe
+* @description 针对表【staff(管理员端，公司人员表)】的数据库操作Mapper
+* @createDate 2024-08-21 19:30:29
+* @Entity com.example.move.pojo.Staff
+*/
+@Mapper
+public interface StaffMapper extends BaseMapper<Staff> {
+
+    List<Staff> staffNameByStaffid(int staffid);
+
+}
+
+
+
+
diff --git a/backend/move/src/main/java/com/example/move/pojo/CarProjectMove.java b/backend/move/src/main/java/com/example/move/pojo/CarProjectMove.java
new file mode 100644
index 0000000..2102e68
--- /dev/null
+++ b/backend/move/src/main/java/com/example/move/pojo/CarProjectMove.java
@@ -0,0 +1,53 @@
+package com.example.move.pojo;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CarProjectMove {
+
+    /**
+     * 汽车id
+     */
+    @TableId
+    private Integer carId;
+
+    /**
+     * 车辆名称
+     */
+    private String carName;
+
+    /**
+     * 车牌号
+     */
+    private String carNumber;
+
+    /**
+     * 车辆头像
+     */
+    private byte[] carImage;
+    /**
+     * 车辆使用起始时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date carStartTime;
+
+    /**
+     * 车辆使用截止时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date carEndTime;
+
+    /**
+     * 姓名
+     */
+    private String name;
+}
diff --git a/backend/move/src/main/java/com/example/move/pojo/Staff.java b/backend/move/src/main/java/com/example/move/pojo/Staff.java
new file mode 100644
index 0000000..824f9af
--- /dev/null
+++ b/backend/move/src/main/java/com/example/move/pojo/Staff.java
@@ -0,0 +1,60 @@
+package com.example.move.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 管理员端，公司人员表
+ * @TableName staff
+ */
+@TableName(value ="staff")
+@Data
+public class Staff implements Serializable {
+    /**
+     * 职工id
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer staffId;
+
+    /**
+     * 职工类型
+     */
+    private String staffType;
+
+    /**
+     * 职工姓名
+     */
+    private String staffName;
+
+    /**
+     * 职工身份证
+     */
+    private String staffIdNo;
+
+    /**
+     * 职工手机号
+     */
+    private String staffPhoneNo;
+
+    /**
+     * 职工微信号
+     */
+    private String staffWechatNo;
+
+    /**
+     * 职工职位
+     */
+    private String staffPos;
+
+    /**
+     * 职工状态(0:离职，1：正常)
+     */
+    private String staffStatus;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/move/src/main/java/com/example/move/service/StaffService.java b/backend/move/src/main/java/com/example/move/service/StaffService.java
new file mode 100644
index 0000000..b1fdd04
--- /dev/null
+++ b/backend/move/src/main/java/com/example/move/service/StaffService.java
@@ -0,0 +1,17 @@
+package com.example.move.service;
+
+import com.example.move.pojo.Staff;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author liuwe
+* @description 针对表【staff(管理员端，公司人员表)】的数据库操作Service
+* @createDate 2024-08-21 19:30:29
+*/
+public interface StaffService extends IService<Staff> {
+
+    List<Staff> staffNameByStaffid(int staffid);
+
+}
diff --git a/backend/move/src/main/java/com/example/move/service/impl/StaffServiceImpl.java b/backend/move/src/main/java/com/example/move/service/impl/StaffServiceImpl.java
new file mode 100644
index 0000000..6ca1d78
--- /dev/null
+++ b/backend/move/src/main/java/com/example/move/service/impl/StaffServiceImpl.java
@@ -0,0 +1,31 @@
+package com.example.move.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.move.pojo.Staff;
+import com.example.move.service.StaffService;
+import com.example.move.mapper.StaffMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author liuwe
+* @description 针对表【staff(管理员端，公司人员表)】的数据库操作Service实现
+* @createDate 2024-08-21 19:30:29
+*/
+@Service
+public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff>
+    implements StaffService{
+
+    @Autowired
+    private StaffMapper staffMapper;
+    @Override
+    public List<Staff> staffNameByStaffid(int staffid) {
+        return staffMapper.staffNameByStaffid(staffid);
+    }
+}
+
+
+
+
diff --git a/backend/move/src/main/java/generator/com/example/move/Test.java b/backend/move/src/main/java/generator/com/example/move/Test.java
new file mode 100644
index 0000000..001f126
--- /dev/null
+++ b/backend/move/src/main/java/generator/com/example/move/Test.java
@@ -0,0 +1,24 @@
+package generator.com.example.move;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName test
+ */
+@TableName(value ="test")
+@Data
+public class Test implements Serializable {
+    /**
+     * 
+     */
+    private Integer columnName;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/move/src/main/java/generator/mapper/TestMapper.java b/backend/move/src/main/java/generator/mapper/TestMapper.java
new file mode 100644
index 0000000..c525a0e
--- /dev/null
+++ b/backend/move/src/main/java/generator/mapper/TestMapper.java
@@ -0,0 +1,18 @@
+package generator.mapper;
+
+import generator.com.example.move.Test;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author liuwe
+* @description 针对表【test】的数据库操作Mapper
+* @createDate 2024-08-21 19:20:09
+* @Entity generator.com.example.move.Test
+*/
+public interface TestMapper extends BaseMapper<Test> {
+
+}
+
+
+
+
diff --git a/backend/move/src/main/java/generator/service/TestService.java b/backend/move/src/main/java/generator/service/TestService.java
new file mode 100644
index 0000000..a7f4af7
--- /dev/null
+++ b/backend/move/src/main/java/generator/service/TestService.java
@@ -0,0 +1,13 @@
+package generator.service;
+
+import generator.com.example.move.Test;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author liuwe
+* @description 针对表【test】的数据库操作Service
+* @createDate 2024-08-21 19:20:09
+*/
+public interface TestService extends IService<Test> {
+
+}
diff --git a/backend/move/src/main/java/generator/service/impl/TestServiceImpl.java b/backend/move/src/main/java/generator/service/impl/TestServiceImpl.java
new file mode 100644
index 0000000..6a3cfd0
--- /dev/null
+++ b/backend/move/src/main/java/generator/service/impl/TestServiceImpl.java
@@ -0,0 +1,22 @@
+package generator.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import generator.com.example.move.Test;
+import generator.service.TestService;
+import generator.mapper.TestMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author liuwe
+* @description 针对表【test】的数据库操作Service实现
+* @createDate 2024-08-21 19:20:09
+*/
+@Service
+public class TestServiceImpl extends ServiceImpl<TestMapper, Test>
+    implements TestService{
+
+}
+
+
+
+
diff --git a/backend/move/src/main/resources/application.properties b/backend/move/src/main/resources/application.properties
index 5b2116c..552ed94 100644
--- a/backend/move/src/main/resources/application.properties
+++ b/backend/move/src/main/resources/application.properties
@@ -1,10 +1,10 @@
 spring.application.name=move
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/zybanjia
-spring.datasource.username=root
-spring.datasource.password=123456
-#spring.datasource.url=jdbc:mysql://localhost:3306/db01
+#spring.datasource.url=jdbc:mysql://localhost:3306/zybanjia
 #spring.datasource.username=root
-#spring.datasource.password=1234
+#spring.datasource.password=123456
+spring.datasource.url=jdbc:mysql://localhost:3306/db01
+spring.datasource.username=root
+spring.datasource.password=liuweijie
 # application.properties
 mybatis.mapper-locations=classpath:mapper/*.xml
\ No newline at end of file
diff --git a/backend/move/src/main/resources/mapper/StaffMapper.xml b/backend/move/src/main/resources/mapper/StaffMapper.xml
new file mode 100644
index 0000000..ddacd4c
--- /dev/null
+++ b/backend/move/src/main/resources/mapper/StaffMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.move.mapper.StaffMapper">
+
+    <resultMap id="BaseResultMap" type="com.example.move.pojo.Staff">
+            <id property="staffId" column="staff_id" jdbcType="INTEGER"/>
+            <result property="staffType" column="staff_type" jdbcType="VARCHAR"/>
+            <result property="staffName" column="staff_name" jdbcType="VARCHAR"/>
+            <result property="staffIdNo" column="staff_id_no" jdbcType="VARCHAR"/>
+            <result property="staffPhoneNo" column="staff_phone-no" jdbcType="VARCHAR"/>
+            <result property="staffWechatNo" column="staff_wechat_no" jdbcType="VARCHAR"/>
+            <result property="staffPos" column="staff_pos" jdbcType="VARCHAR"/>
+            <result property="staffStatus" column="staff_status" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        staff_id,staff_type,staff_name,
+        staff_id_no,staff_phone-no,staff_wechat_no,
+        staff_pos,staff_status
+    </sql>
+    <select id="staffNameByStaffid" resultMap="BaseResultMap">
+        select * from staff where staff_id = #{staffid}
+    </select>
+</mapper>
diff --git a/front/app.js b/front/app.js
index 1ed57c4..d233341 100644
--- a/front/app.js
+++ b/front/app.js
@@ -14,6 +14,7 @@ App({
     })
   },
   globalData: {
-    userInfo: null
+    userInfo: null,
+    api:"http://localhost:8080"
   }
 })
diff --git a/front/app.json b/front/app.json
index 32e107e..f264f58 100644
--- a/front/app.json
+++ b/front/app.json
@@ -50,7 +50,9 @@
     "pages/employee/daily_paper/daily_paper",
     "pages/employee/write_paper/write_paper",
     "pages/employee/paper/paper",
-    "pages/employee/reimbursement/reimbursement"
+    "pages/employee/reimbursement/reimbursement",
+    "pages/firstparty/search_program/search_program",
+    "pages/firstparty/search_name/search_name"
   ],
   "window": {
     "navigationBarTextStyle": "black",
diff --git a/front/pages/employee/car/car.js b/front/pages/employee/car/car.js
index 4cfeeec..6eef8b1 100644
--- a/front/pages/employee/car/car.js
+++ b/front/pages/employee/car/car.js
@@ -1,28 +1,47 @@
 // pages/firstparty/car/car.js
+const app = getApp();
+
+const api = app.globalData.api;
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    cars:[
-      {
-        name:"中国重汽 SITRAK C5H 340马力",
-        start_time:"2024.06.10",
-        end_time:"2024.06.16",
-        image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
-        person:"张晓军",
-        info:"津A·88888"
-
-      }
-    ]
+    // cars:[
+    //   {
+    //     name:"中国重汽 SITRAK C5H 340马力",
+    //     start_time:"2024.06.10",
+    //     end_time:"2024.06.16",
+    //     image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
+    //     person:"张晓军",
+    //     info:"津A·88888"
+
+    //   }
+    // ]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    let that = this
+    console.log(options)
+        //查询房间详情
+        wx.request({
+          url: api+'/car/queryCarByProId?proId='+options.projectid, 
+          method:"GET",
+          success(res){
+            console.log(res)
+            that.setData({
+              cars:res.data.data,
+            })
+          },
+          fail(res)
+          {
+            console.log(res)
+          }
+        })
   },
 
   /**
diff --git a/front/pages/employee/car/car.wxml b/front/pages/employee/car/car.wxml
index e80d291..99f2880 100644
--- a/front/pages/employee/car/car.wxml
+++ b/front/pages/employee/car/car.wxml
@@ -5,17 +5,17 @@
 	<view class="car-name">
 		<t-image src="{{item.image}}" style="width:160rpx;height:160rpx" ></t-image>
 		<view style="margin-left: 24rpx;">
-		<view class="car-name-1">{{item.name}}</view>
-		<view class="car-time">使用时间:{{item.start_time}}-{{item.end_time}}</view>
+		<view class="car-name-1">{{item.carName}}</view>
+		<view class="car-time">使用时间:{{item.carStartTime}}至{{item.carEndTime}}</view>
 		</view>
 	</view>
 	<view class="car-info">
 	<view class="box">
-	<view>{{item.person}}</view>
+	<view>{{item.name}}</view>
 	<view class="remark">负责人</view>
 	</view>
 	<view class="box">
-	<view>{{item.info}}</view>
+	<view>{{item.carNumber}}</view>
 	<view class="remark">车辆信息</view>
 	</view>
 </view>
diff --git a/front/pages/employee/car/car.wxss b/front/pages/employee/car/car.wxss
index dcd8d10..f018e3b 100644
--- a/front/pages/employee/car/car.wxss
+++ b/front/pages/employee/car/car.wxss
@@ -6,12 +6,13 @@ page{
 {
 	margin: 12rpx 24rpx 0 24rpx;
 	padding: 0;
-	background-color: rgba(255, 255, 255, 1);
 }
 .car
 {
 	margin-top: 12rpx;
 	margin-bottom: 12rpx;
+	background-color: rgba(255, 255, 255, 1);
+	width: 700rpx;
 }
 .car-name
 {
diff --git a/front/pages/employee/program/program.js b/front/pages/employee/program/program.js
index 535b678..76955a5 100644
--- a/front/pages/employee/program/program.js
+++ b/front/pages/employee/program/program.js
@@ -114,10 +114,11 @@ Page({
     })
     console.log(this.data.value)
   },
-  gotodetail()
+  gotodetail(e)
   {
+    let name = e.currentTarget.dataset.key
     wx.navigateTo({
-      url: '/pages/employee/program_detail/program_detail',
+      url: '/pages/employee/program_detail/program_detail?name='+name,
     })
   }
 })
\ No newline at end of file
diff --git a/front/pages/employee/program/program.wxml b/front/pages/employee/program/program.wxml
index f47dda0..c4e3d3b 100644
--- a/front/pages/employee/program/program.wxml
+++ b/front/pages/employee/program/program.wxml
@@ -8,7 +8,7 @@
 </t-tabs>
 <!-- 高校 -->
 <view class='card' wx:if="{{value==0}}">
-	<view wx:for="{{unit_school}}" class="the-card" bind:tap="gotodetail">
+	<view wx:for="{{unit_school}}" class="the-card" bind:tap="gotodetail" data-key ="{{item.name}}">
 		<view class="image-1">
 			<t-image src="{{item.image}}" class="image"></t-image>
 		</view>
@@ -24,7 +24,7 @@
 </view>
 <!-- 企事业单位 -->
 <view class='card' wx:if="{{value==1}}">
-	<view wx:for="{{unit_conpany}}" class="the-card" bind:tap="gotodetail">
+	<view wx:for="{{unit_conpany}}" class="the-card" bind:tap="gotodetail" data-key ="{{item.name}}">
 		<view class="image-1">
 			<t-image src="{{item.image}}" class="image"></t-image>
 		</view>
diff --git a/front/pages/employee/program_detail/program_detail.js b/front/pages/employee/program_detail/program_detail.js
index 5cb67b0..7d86144 100644
--- a/front/pages/employee/program_detail/program_detail.js
+++ b/front/pages/employee/program_detail/program_detail.js
@@ -1,4 +1,8 @@
 // pages/firstparty/program_detail/program_detail.js
+const app = getApp();
+const api = app.globalData.api;
+
+
 Page({
 
   /**
@@ -6,35 +10,28 @@ Page({
    */
   data: {
     value:"",
-    program:[
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
-
-      }
-    ],
-    program_done:[
-      {
-        program_name:"总项目名称",
-        first_name:"甲方负责人名称",
-        second_name:"乙方负责人名称",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
-
-      }
-    ]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    const that = this
+    const unit  = options.name
+    wx.request({
+      url: api+'/project/queryProjectByUnit?projectUnit='+unit,
+      method:"GET",
+      success(res){
+        console.log(res)
+        that.setData({
+          program:res.data.data
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
   },
 
   /**
@@ -92,10 +89,11 @@ Page({
     })
     console.log(this.data.value)
   },
-  goto()
+  goto(e)
   {
+    const id = e.currentTarget.dataset.id
     wx.navigateTo({
-      url: '/pages/employee/program_detail_1/program_detail_1',
+      url: '/pages/employee/program_detail_1/program_detail_1?id='+id,
     })
   }
 })
\ No newline at end of file
diff --git a/front/pages/employee/program_detail/program_detail.wxml b/front/pages/employee/program_detail/program_detail.wxml
index 80396e7..60afc5e 100644
--- a/front/pages/employee/program_detail/program_detail.wxml
+++ b/front/pages/employee/program_detail/program_detail.wxml
@@ -3,24 +3,27 @@
   <t-search placeholder="请输入项目名称" shape="round"/>
 </view>
 <view class="card" wx:if="{{value==0}}">
-	<view class="detail" wx:for="{{program}}">
+	<view class="detail" wx:for="{{program}}" wx:key="index" wx:if="{{item.projectIsDone==0}}">
 	<view class="detail-container">
+	<view class="done">
 		<view class="program-name">
-		{{item.program_name}}
+			{{item.projectName}}
 		</view>
+		<t-icon name="delete" size="24" data-name="{{item}}" bind:tap="delete" data-key="showConfirm" data-index = "{{index}}"/>
+	</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方负责人：{{item.second_name}}</view>
+			<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -29,8 +32,17 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
+		<t-dialog
+  visible="{{showConfirm}}"
+	data-i="{{index}}"
+  title="确认删除"
+  confirm-btn="{{ confirmBtn }}"
+  cancel-btn="取消"
+  bind:confirm="confirmDialog"
+  bind:cancel="closeDialog"
+/>
 	</view>
 </view>
\ No newline at end of file
diff --git a/front/pages/employee/program_detail_1/program_detail_1.js b/front/pages/employee/program_detail_1/program_detail_1.js
index 1ec6db3..ec6fbc0 100644
--- a/front/pages/employee/program_detail_1/program_detail_1.js
+++ b/front/pages/employee/program_detail_1/program_detail_1.js
@@ -1,4 +1,7 @@
 // pages/firstparty/program_detail_1/program_detail_1.js
+const app = getApp();
+const api = app.globalData.api;
+
 Page({
 
   /**
@@ -10,50 +13,48 @@ Page({
     autosize:20,
     room_6:[],
     current_room:[],
-    room:[
-      {
-        number:"001",
-      },
-      {
-        number:"002",
-      },      
-      {
-        number:"003",
-      },
-      {
-        number:"004",
-      },
-      {
-        number:"005",
-      },
-      {
-        number:"006",
-      },      
-      {
-        number:"007",
-      },
-    ],
-    program:
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情"
-
-      },
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    let firstSix = this.data.room.slice(0, 6);
-    this.setData({
-      room_6:firstSix,
-      current_room:firstSix
+    const id = options.id
+    let that = this
+    //查询项目详情
+    wx.request({
+      url: api+'/project/queryProjectById?projectId='+id, 
+      method:"GET",
+      success(res){
+        that.setData({
+          program:res.data.data[0]
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
+    //查询房间详情
+    wx.request({
+      url: api+'/room/queryRoomByProjectId?projectId='+id, 
+      method:"GET",
+      success(res){
+        console.log(res)
+        let firstSix = res.data.data.slice(0, 6);
+        that.setData({
+          room:res.data.data,
+          room_6:firstSix,
+          current_room:firstSix
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
     })
+
+
   },
 
   /**
@@ -148,7 +149,7 @@ Page({
   },
   gotocar(){
     wx.navigateTo({
-      url: '/pages/employee/car/car',
+      url: '/pages/employee/car/car?projectid='+this.data.program.projectId,
     })
   },
   gotoequipment(){
diff --git a/front/pages/employee/program_detail_1/program_detail_1.wxml b/front/pages/employee/program_detail_1/program_detail_1.wxml
index 64545ab..ec2a83a 100644
--- a/front/pages/employee/program_detail_1/program_detail_1.wxml
+++ b/front/pages/employee/program_detail_1/program_detail_1.wxml
@@ -3,40 +3,26 @@
 	<view class="detail" >
 	<view class="detail-container">
 		<view class="program-name">
-		{{program.program_name}}
+		{{program.projectName}}
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{program.first_name}}</view>
-		<view class="theperson">乙方负责人：{{program.second_name}}</view>
+		<view class="theperson">甲方负责人：{{program.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{program.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{program.start_data}}-{{program.end_data}}</view>
+		<view>{{program.projectStartTime}}至{{program.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
 	wx:if="{{showon}}"
   t-class="external-class"
-  value="{{program.detail}}"
+  value="{{program.projectRemark}}"
 	maxcharacter="70"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
 	class="output"
-  disabled
-	/>
-	<view class="link-example" wx:if="{{showon}}" >
-	<view  bind:tap="changedetail" class="showon">展开</view>
-</view>
-		<t-textarea
-		wx:if="{{!showon}}"
-  t-class="external-class"
-  value="{{program.detail}}"
-	maxcharacter="200"
-  disableDefaultPadding="{{true}}"
-	autosize="{{autosize}}"
-	style=" padding: 16rpx;"
-	class="output"
   disabled
 	/>
 	<view class="link-example" wx:if="{{!showon}}" >
@@ -51,7 +37,7 @@
 	</view>	
 	<view class='room'>
 	<t-button theme="primary" variant="outline" size="small"wx:for="{{current_room}}" bind:tap="gotoroom">
-	房间编号{{item.number}}
+	房间编号{{item.roomId}}
 	</t-button>
 	</view>
 	<view class="on" wx:if="{{six}}" bind:tap="changeall">
diff --git a/front/pages/first/first.js b/front/pages/first/first.js
index 785b040..5552f65 100644
--- a/front/pages/first/first.js
+++ b/front/pages/first/first.js
@@ -113,32 +113,23 @@ Page({
   },
   login()
   {
-    // wx.login({
-    //   success: (res) => {
-    //     console.log(res)
-    //     wx.request({
-    //       url: 'http://localhost:8080/login/queryProjectInfo?code='+res.code,
-    //       method:'GET',
-    //       success(res){
-    //         console.log(res.data)
-    //       },
-    //       fail(res){
-    //         console.log(res)
-    //       }
-    //     })
-    //   },
-    // })
-    console.log("在线登录")
-    wx.request({
-      url: 'https://g423745u31.vicp.fun/project/queryProjectInfo',
-      method:'GET',
+    wx.login({
+      success: (res) => {
+        console.log(res)
+        wx.request({
+          url: 'http://localhost:8080/login/getLoginInfo?code='+res.code,
+          method:'GET',
           success(res){
             console.log(res.data)
           },
           fail(res){
             console.log(res)
           }
+        })
+      },
     })
+    console.log("在线登录")
+
   },
 
   firstparty()
diff --git a/front/pages/firstparty/car/car.js b/front/pages/firstparty/car/car.js
index 1bfb591..5c33a6a 100644
--- a/front/pages/firstparty/car/car.js
+++ b/front/pages/firstparty/car/car.js
@@ -1,28 +1,48 @@
 // pages/firstparty/car/car.js
+const app = getApp();
+
+const api = app.globalData.api;
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    cars:[
-      {
-        name:"中国重汽 SITRAK C5H 340马力",
-        start_time:"2024.06.10",
-        end_time:"2024.06.16",
-        image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
-        person:"张晓军",
-        info:"津A·88888"
-
-      }
-    ]
+    // cars:[
+    //   {
+    //     name:"中国重汽 SITRAK C5H 340马力",
+    //     start_time:"2024.06.10",
+    //     end_time:"2024.06.16",
+    //     image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
+    //     person:"张晓军",
+    //     info:"津A·88888"
+
+    //   }
+    // ]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    let that = this
+    console.log(options)
+        //查询房间详情
+        wx.request({
+          url: api+'/car/queryCarByProId?proId='+options.projectid, 
+          method:"GET",
+          success(res){
+            console.log(res)
+            that.setData({
+              cars:res.data.data,
+            })
+          },
+          fail(res)
+          {
+            console.log(res)
+          }
+        })
   },
 
   /**
diff --git a/front/pages/firstparty/car/car.wxml b/front/pages/firstparty/car/car.wxml
index 1cd9830..f33cdce 100644
--- a/front/pages/firstparty/car/car.wxml
+++ b/front/pages/firstparty/car/car.wxml
@@ -5,17 +5,17 @@
 	<view class="car-name">
 		<t-image src="{{item.image}}" style="width:160rpx;height:160rpx" ></t-image>
 		<view style="margin-left: 24rpx;">
-		<view class="car-name-1">{{item.name}}</view>
-		<view class="car-time">使用时间:{{item.start_time}}-{{item.end_time}}</view>
+		<view class="car-name-1">{{item.carName}}</view>
+		<view class="car-time">使用时间:{{item.carStartTime}}至{{item.carEndTime}}</view>
 		</view>
 	</view>
 	<view class="car-info">
 	<view class="box">
-	<view>{{item.person}}</view>
+	<view>{{item.name}}</view>
 	<view class="remark">负责人</view>
 	</view>
 	<view class="box">
-	<view>{{item.info}}</view>
+	<view>{{item.carNumber}}</view>
 	<view class="remark">车辆信息</view>
 	</view>
 </view>
diff --git a/front/pages/firstparty/car/car.wxss b/front/pages/firstparty/car/car.wxss
index 109517b..b7d9a0b 100644
--- a/front/pages/firstparty/car/car.wxss
+++ b/front/pages/firstparty/car/car.wxss
@@ -6,12 +6,13 @@ page{
 {
 	margin: 12rpx 24rpx 0 24rpx;
 	padding: 0;
-	background-color: rgba(255, 255, 255, 1);
 }
 .car
 {
 	margin-top: 12rpx;
 	margin-bottom: 12rpx;
+	background-color: rgba(255, 255, 255, 1);
+	width: 700rpx;
 }
 .car-name
 {
diff --git a/front/pages/firstparty/program/program.js b/front/pages/firstparty/program/program.js
index 8480e15..157b9e7 100644
--- a/front/pages/firstparty/program/program.js
+++ b/front/pages/firstparty/program/program.js
@@ -5,6 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    input:"",
     pageCur:"program",
     value:"0",
     unit_school:[
@@ -42,7 +43,18 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+      wx.request({
+        url: 'http://localhost:8080/project/queryProjectInfo',
+        method:"GET",
+        success(res)
+        {
+          console.log(res.data)
+        },
+        fail(res)
+        {
+          console.log(res.data)
+        }
+      })
   },
 
   /**
@@ -114,10 +126,24 @@ Page({
     })
     console.log(this.data.value)
   },
-  gotodetail()
+  gotodetail(e)
+  {
+    wx.navigateTo({
+      url: '/pages/firstparty/program_detail/program_detail?unit='+e.currentTarget.dataset.key,
+    })
+  },
+  onChangeValue(e)
+  {
+    console.log(e)
+    this.setData({
+      input:e.detail.value
+    })
+  },
+  submit(e)
   {
+    console.log("提交了")
     wx.navigateTo({
-      url: '/pages/firstparty/program_detail/program_detail',
+      url: '/pages/firstparty/search_program/search_program?value='+this.data.input,
     })
   }
 })
\ No newline at end of file
diff --git a/front/pages/firstparty/program/program.wxml b/front/pages/firstparty/program/program.wxml
index a779325..b329a9f 100644
--- a/front/pages/firstparty/program/program.wxml
+++ b/front/pages/firstparty/program/program.wxml
@@ -1,7 +1,7 @@
 <!--pages/manage/program/program.wxml-->
 <!--pages/firstparty/program/program.wxml-->
 <view class="search">
-  <t-search placeholder="请输入高校/企事业单位名称"  shape="round"/>
+  <t-search placeholder="请输入高校/企事业单位名称"  shape="round"  bind:change="onChangeValue" bind:submit="submit"/>
 </view>
 <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs">
   <t-tab-panel label="高校" value="0" />
@@ -9,7 +9,7 @@
 </t-tabs>
 <!-- 高校 -->
 <view class='card' wx:if="{{value==0}}">
-	<view wx:for="{{unit_school}}" class="the-card" bind:tap="gotodetail">
+	<view wx:for="{{unit_school}}" class="the-card" bind:tap="gotodetail" data-key = "{{item.name}}">
 		<view class="image-1">
 			<t-image src="{{item.image}}" class="image"></t-image>
 		</view>
@@ -25,7 +25,7 @@
 </view>
 <!-- 企事业单位 -->
 <view class='card' wx:if="{{value==1}}">
-	<view wx:for="{{unit_conpany}}" class="the-card" bind:tap="gotodetail">
+	<view wx:for="{{unit_conpany}}" class="the-card" bind:tap="gotodetail" data-key = "{{item.name}}">
 		<view class="image-1">
 			<t-image src="{{item.image}}" class="image"></t-image>
 		</view>
diff --git a/front/pages/firstparty/program_detail/program_detail.js b/front/pages/firstparty/program_detail/program_detail.js
index 8dc7dd8..bdcc3b4 100644
--- a/front/pages/firstparty/program_detail/program_detail.js
+++ b/front/pages/firstparty/program_detail/program_detail.js
@@ -1,41 +1,71 @@
 // pages/firstparty/program_detail/program_detail.js
+const app = getApp();
+
+const api = app.globalData.api;
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    name:"",
     pageCur:"program_detail",
     value:"",
-    program:[
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
-
-      }
-    ],
-    program_done:[
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
-
-      }
-    ]
+    program:"",
+    // program:[
+    //   {
+    //     program_name:"总项目名称",
+    //     first_name:"刘三",
+    //     second_name:"李四",
+    //     start_data:"2024.06.10",
+    //     end_data:"2024.06.16",
+    //     detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...",
+    //     projectIsDone:0,
+    //   },
+    //   {
+    //     program_name:"总项目名称",
+    //     first_name:"刘三1",
+    //     second_name:"李四1",
+    //     start_data:"2024.06.10",
+    //     end_data:"2024.06.16",
+    //     detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...",
+    //     projectIsDone:1,
+    //   }
+    // ],
+    // program_done:[
+    //   {
+    //     program_name:"总项目名称",
+    //     first_name:"刘三",
+    //     second_name:"李四",
+    //     start_data:"2024.06.10",
+    //     end_data:"2024.06.16",
+    //     detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
+
+    //   }
+    // ]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    const that = this
+    const unit  = options.unit
+    wx.request({
+      url: api+'/project/queryProjectByUnit?projectUnit='+unit,
+      method:"GET",
+      success(res){
+        console.log(res)
+        that.setData({
+          program:res.data.data
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
   },
 
   /**
@@ -93,10 +123,27 @@ Page({
     })
     console.log(this.data.value)
   },
-  goto()
+  goto(e)
+  {
+    const id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: '/pages/firstparty/program_detail_1/program_detail_1?id='+id,
+    })
+  },
+
+  //搜索框
+  onChangeValue(e)
+  {
+    console.log(e)
+    this.setData({
+      name:e.detail.value
+    })
+  },
+  submit(e)
   {
+    console.log("提交了")
     wx.navigateTo({
-      url: '/pages/firstparty/program_detail_1/program_detail_1',
+      url: '/pages/firstparty/search_name/search_name?value='+this.data.name,
     })
   }
 })
\ No newline at end of file
diff --git a/front/pages/firstparty/program_detail/program_detail.wxml b/front/pages/firstparty/program_detail/program_detail.wxml
index edfcba7..b237d6c 100644
--- a/front/pages/firstparty/program_detail/program_detail.wxml
+++ b/front/pages/firstparty/program_detail/program_detail.wxml
@@ -1,6 +1,6 @@
 <!--pages/firstparty/program_detail/program_detail.wxml-->
 <view class="search">
-  <t-search placeholder="请输入项目名称" shape="round"/>
+  <t-search placeholder="请输入项目名称" shape="round" bind:change="onChangeValue" bind:submit="submit"/>
 </view>
 <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs">
   <t-tab-panel label="未完成" value="0" />
@@ -8,24 +8,24 @@
 </t-tabs>
 <!-- 未完成的项目 -->
 <view class="card" wx:if="{{value==0}}">
-	<view class="detail" wx:for="{{program}}">
+	<view class="detail" wx:for="{{program}}"  wx:if="{{item.projectIsDone==0}}">
 	<view class="detail-container">
 		<view class="program-name">
-		{{item.program_name}}
+		{{item.projectName}}
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方负责人：{{item.second_name}}</view>
+		<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -34,34 +34,34 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
 	</view>
 </view>
 <!-- 已完成的项目 -->
 <view class="card" wx:if="{{value==1}}">
-	<view class="detail" wx:for="{{program_done}}">
+	<view class="detail" wx:for="{{program}}" wx:if="{{item.projectIsDone==1}}">
 	<view class="detail-container">
 		<view class="done">
 		<view class="program-name">
-		{{item.program_name}}
+			{{item.projectName}}
 		</view>
 		<view class="done-word">已完成</view>
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方负责人：{{item.second_name}}</view>
+			<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -70,7 +70,7 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
 	</view>
diff --git a/front/pages/firstparty/program_detail_1/program_detail_1.js b/front/pages/firstparty/program_detail_1/program_detail_1.js
index d117cfc..7440406 100644
--- a/front/pages/firstparty/program_detail_1/program_detail_1.js
+++ b/front/pages/firstparty/program_detail_1/program_detail_1.js
@@ -1,4 +1,7 @@
 // pages/firstparty/program_detail_1/program_detail_1.js
+const app = getApp();
+const api = app.globalData.api;
+
 Page({
 
   /**
@@ -10,29 +13,6 @@ Page({
     autosize:20,
     room_6:[],
     current_room:[],
-    room:[
-      {
-        number:"001",
-      },
-      {
-        number:"001",
-      },      
-      {
-        number:"001",
-      },
-      {
-        number:"001",
-      },
-      {
-        number:"001",
-      },
-      {
-        number:"001",
-      },      
-      {
-        number:"001",
-      },
-    ],
     program:
       {
         program_name:"总项目名称",
@@ -49,11 +29,42 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    let firstSix = this.data.room.slice(0, 6);
-    this.setData({
-      room_6:firstSix,
-      current_room:firstSix
+    const id = options.id
+    let that = this
+    //查询项目详情
+    wx.request({
+      url: api+'/project/queryProjectById?projectId='+id, 
+      method:"GET",
+      success(res){
+        that.setData({
+          program:res.data.data[0]
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
     })
+    //查询房间详情
+    wx.request({
+      url: api+'/room/queryRoomByProjectId?projectId='+id, 
+      method:"GET",
+      success(res){
+        console.log(res)
+        let firstSix = res.data.data.slice(0, 6);
+        that.setData({
+          room:res.data.data,
+          room_6:firstSix,
+          current_room:firstSix
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
+
+
   },
 
   /**
@@ -127,15 +138,17 @@ Page({
       current_room:this.data.room_6
     })
   },
-  gotoroom()
+  gotoroom(e)
   {
+    let id = e.currentTarget.dataset.id
+    let roomid = e.currentTarget.dataset.roomId
     wx.navigateTo({
-      url: '/pages/firstparty/room/room',
+      url: '/pages/firstparty/room/room?roomId='+roomid+"&projectid="+this.data.program.projectId+"&id="+id,
     })
   },
   gotocar(){
     wx.navigateTo({
-      url: '/pages/firstparty/car/car',
+      url: '/pages/firstparty/car/car?projectid='+this.data.program.projectId,
     })
   },
   gotoequipment(){
diff --git a/front/pages/firstparty/program_detail_1/program_detail_1.wxml b/front/pages/firstparty/program_detail_1/program_detail_1.wxml
index 67ab43a..4bba4f9 100644
--- a/front/pages/firstparty/program_detail_1/program_detail_1.wxml
+++ b/front/pages/firstparty/program_detail_1/program_detail_1.wxml
@@ -3,22 +3,22 @@
 	<view class="detail" >
 	<view class="detail-container">
 		<view class="program-name">
-		{{program.program_name}}
+		{{program.projectName}}
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{program.first_name}}</view>
-		<view class="theperson">乙方负责人：{{program.second_name}}</view>
+		<view class="theperson">甲方负责人：{{program.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{program.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{program.start_data}}-{{program.end_data}}</view>
+		<view>{{program.projectStartTime}}至{{program.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
 	wx:if="{{showon}}"
   t-class="external-class"
-  value="{{program.detail}}"
+  value="{{program.projectRemark}}"
 	maxcharacter="70"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -47,8 +47,8 @@
 	<view>
 	<view class="room-name">项目房间</view>
 	<view class='room'>
-	<t-button theme="primary" variant="outline" size="small"wx:for="{{current_room}}" bind:tap="gotoroom">
-	房间编号{{item.number}}
+	<t-button theme="primary" variant="outline" size="small"wx:for="{{current_room}}" bind:tap="gotoroom" data-id ="{{item.id}}" data-name="{{item.roomId}}">
+	房间{{item.roomId}}
 	</t-button>
 	</view>
 	<view class="on" wx:if="{{six}}" bind:tap="changeall">
diff --git a/front/pages/firstparty/room/room.js b/front/pages/firstparty/room/room.js
index cac4bb5..76e374e 100644
--- a/front/pages/firstparty/room/room.js
+++ b/front/pages/firstparty/room/room.js
@@ -1,4 +1,6 @@
 // pages/firstparty/room/room.js
+const app = getApp();
+const api = app.globalData.api;
 const steps=["各个等级设备检查符合项提交（搬迁前）","提交","拆机打包","装车","卸车","安装","各个等级级设备检查符合项提交（安装后）","提交","其他检查","全部完成"]
 Page({
 
@@ -6,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    number:"001",
+    number:"",
     name:"负责人名称",
     equipment:[
       {
@@ -27,7 +29,27 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    let that = this
+      this.setData({
+          number:options.roomid
+      })
+      let id = options.id
+      let projectid=options.projectid
+          //查询房间详情
+    wx.request({
+      url: api+'/equipment/queryEquipmentByRoomId?projectId='+projectid+"&roomId="+id, 
+      method:"GET",
+      success(res){
+        console.log(res)
+        that.setData({
+          equipment:res.data.data,
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
   },
 
   /**
diff --git a/front/pages/firstparty/search_name/search_name.js b/front/pages/firstparty/search_name/search_name.js
new file mode 100644
index 0000000..98ee24e
--- /dev/null
+++ b/front/pages/firstparty/search_name/search_name.js
@@ -0,0 +1,77 @@
+// pages/firstparty/search_name/search_name.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let value = options.value
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  onChangeValue(e)
+  {
+    console.log(e)
+    this.setData({
+      input:e.detail.value
+    })
+  },
+  submit(e)
+  {
+    console.log("提交了")
+  }
+})
\ No newline at end of file
diff --git a/front/pages/firstparty/search_name/search_name.json b/front/pages/firstparty/search_name/search_name.json
new file mode 100644
index 0000000..b87355f
--- /dev/null
+++ b/front/pages/firstparty/search_name/search_name.json
@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "custom-tab-bar": "/components/custom-tab-bar/custom-tab-bar",
+    "t-search": "/miniprogram_npm/tdesign-miniprogram/search/search",
+    "t-tabs": "/miniprogram_npm/tdesign-miniprogram/tabs/tabs",
+    "t-tab-panel": "/miniprogram_npm/tdesign-miniprogram/tab-panel/tab-panel",
+    "t-textarea": "/miniprogram_npm/tdesign-miniprogram/textarea/textarea",
+    "t-button": "/miniprogram_npm/tdesign-miniprogram/button/button"
+    }
+}
\ No newline at end of file
diff --git a/front/pages/firstparty/search_name/search_name.wxml b/front/pages/firstparty/search_name/search_name.wxml
new file mode 100644
index 0000000..80371ec
--- /dev/null
+++ b/front/pages/firstparty/search_name/search_name.wxml
@@ -0,0 +1,75 @@
+<!--pages/firstparty/program_detail/program_detail.wxml-->
+<view class="search">
+  <t-search placeholder="请输入项目名称" shape="round" bind:change="onChangeValue" bind:submit="submit"/>
+</view>
+
+<!-- 未完成的项目 -->
+<view class="card" >
+	<view class="detail" wx:for="{{program}}"  wx:if="{{item.projectIsDone==0}}">
+	<view class="detail-container">
+		<view class="program-name">
+		{{item.projectName}}
+		</view>
+		<view class="person">
+		<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
+		</view>
+		<view class="data">
+		<view>项目日期</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
+		</view>
+		<view>
+		<view class="detail-name">项目详情</view>
+		<t-textarea
+  t-class="external-class"
+  value="{{item.projectRemark}}"
+	maxcharacter="200"
+  disableDefaultPadding="{{true}}"
+	style="height: 120rpx; padding: 16rpx;"
+	class="output"
+  disabled
+	/>
+		</view>
+		<view class="button">
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
+		</view>
+		</view>
+	</view>
+</view>
+<!-- 已完成的项目 -->
+<view class="card">
+	<view class="detail" wx:for="{{program}}" wx:if="{{item.projectIsDone==1}}">
+	<view class="detail-container">
+		<view class="done">
+		<view class="program-name">
+			{{item.projectName}}
+		</view>
+		<view class="done-word">已完成</view>
+		</view>
+		<view class="person">
+			<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
+		</view>
+		<view class="data">
+		<view>项目日期</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
+		</view>
+		<view>
+		<view class="detail-name">项目详情</view>
+		<t-textarea
+  t-class="external-class"
+  value="{{item.projectRemark}}"
+	maxcharacter="200"
+  disableDefaultPadding="{{true}}"
+	style="height: 120rpx; padding: 16rpx;"
+	class="output"
+  disabled
+	/>
+		</view>
+		<view class="button">
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
+		</view>
+		</view>
+	</view>
+
+</view>
\ No newline at end of file
diff --git a/front/pages/firstparty/search_name/search_name.wxss b/front/pages/firstparty/search_name/search_name.wxss
new file mode 100644
index 0000000..81a86fd
--- /dev/null
+++ b/front/pages/firstparty/search_name/search_name.wxss
@@ -0,0 +1,102 @@
+/* pages/firstparty/program_detail/program_detail.wxss */
+page{
+	background-color:rgba(187, 194, 193, 0.493);
+}
+.search{
+	padding: 0rpx 24rpx 0rpx 24rpx;
+	background-color:rgba(255, 255, 255, 1);
+}
+.card{
+	padding: 12rpx 24rpx 0rpx 24rpx;
+}
+.detail
+{
+	height: 506rpx;
+	background-color: rgba(255, 255, 255, 1);
+	border-radius: 10rpx;
+}
+.detail-container
+{
+	padding: 32rpx;
+}
+.program-name
+{
+	font-size: 18px;
+	font-weight: 700;
+	letter-spacing: 0px;
+	line-height: 25.2px;
+	color: rgba(51, 51, 51, 1);
+	text-align: left;
+	vertical-align: top;
+}
+.person
+{
+	display: flex;
+	flex-direction: row;
+	margin-top: 12rpx;
+	margin-bottom: 12rpx;
+}
+.theperson
+{
+	border-radius: 2px;
+	background: rgba(245, 245, 245, 1);
+	display: flex;
+	justify-content: flex-start;
+	align-items: flex-start;
+	padding: 2rpx 12rpx 2rpx 12rpx;
+	font-size: 12px;
+	font-weight: 400;
+	letter-spacing: 0px;
+	line-height: 16.8px;
+	color: rgba(51, 51, 51, 1);
+	text-align: left;
+	vertical-align: top;
+}
+.data{
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	font-size: 12px;
+	font-weight: 400;
+	letter-spacing: 0px;
+	line-height: 16.8px;
+	color: rgba(102, 102, 102, 1);
+	text-align: left;
+	vertical-align: top;
+}
+.detail-name
+{
+	font-size: 16px;
+	font-weight: 700;
+	letter-spacing: 0px;
+	line-height: 22.4px;
+	color: rgba(51, 51, 51, 1);
+	text-align: left;
+	vertical-align: top;
+	margin-top: 40rpx;
+	margin-bottom: 8rpx;
+}
+.button
+{
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+	margin: 0rpx;
+	margin-top: 16rpx;
+}
+.done
+{
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+} 
+.done-word
+{
+	font-size: 14px;
+	font-weight: 400;
+	letter-spacing: 0px;
+	line-height: 19.6px;
+	color: rgba(0, 186, 74, 1);
+	text-align: left;
+	vertical-align: top;
+}
\ No newline at end of file
diff --git a/front/pages/firstparty/search_program/search_program.js b/front/pages/firstparty/search_program/search_program.js
new file mode 100644
index 0000000..f235de1
--- /dev/null
+++ b/front/pages/firstparty/search_program/search_program.js
@@ -0,0 +1,99 @@
+// pages/firstparty/search_program/search_program.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    value:"",
+    unit_school:[
+      {
+        image:"https://img.js.design/assets/img/62d4d34291c472110f55acfc.png",
+        name:"中国民航大学",
+        number:10
+      },
+      {
+        image:"https://img.js.design/assets/img/62d4d34291c472110f55acfc.png",
+        name:"天津大学",
+        number:20
+      },
+      {
+        image:"https://img.js.design/assets/img/62d4d34291c472110f55acfc.png",
+        name:"天津医科大学",
+        number:50
+      },
+      {
+        image:"https://img.js.design/assets/img/62d4d34291c472110f55acfc.png",
+        name:"南开大学",
+        number:120
+      }
+    ],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let value = options.value
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  onChangeValue(e)
+  {
+    console.log(e)
+    this.setData({
+      input:e.detail.value
+    })
+  },
+  submit(e)
+  {
+    console.log("提交了")
+  }
+})
\ No newline at end of file
diff --git a/front/pages/firstparty/search_program/search_program.json b/front/pages/firstparty/search_program/search_program.json
new file mode 100644
index 0000000..afb37da
--- /dev/null
+++ b/front/pages/firstparty/search_program/search_program.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "t-search": "/miniprogram_npm/tdesign-miniprogram/search/search"
+  }
+}
\ No newline at end of file
diff --git a/front/pages/firstparty/search_program/search_program.wxml b/front/pages/firstparty/search_program/search_program.wxml
new file mode 100644
index 0000000..7be966b
--- /dev/null
+++ b/front/pages/firstparty/search_program/search_program.wxml
@@ -0,0 +1,19 @@
+<!--pages/firstparty/search_program/search_program.wxml-->
+<view class="search">
+  <t-search placeholder="请输入高校/企事业单位名称"  shape="round"  bind:change="onChangeValue" bind:submit="submit"/>
+</view>
+<view class='card'>
+	<view wx:for="{{unit_school}}" class="the-card" bind:tap="gotodetail" data-key = "{{item.name}}">
+		<view class="image-1">
+			<t-image src="{{item.image}}" class="image"></t-image>
+		</view>
+		<view class="name">
+				<text class="unit-name">{{item.name}}</text>
+				<view class="number">
+					<t-icon name="folder" size="30rpx" class="unit-icon" style="color: rgba(204, 33, 41, 1);"/>
+					<text class="number-describer">项目数</text>
+					<text class="unit-number">{{item.number}}</text>
+				</view>
+			</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/front/pages/firstparty/search_program/search_program.wxss b/front/pages/firstparty/search_program/search_program.wxss
new file mode 100644
index 0000000..b15ff64
--- /dev/null
+++ b/front/pages/firstparty/search_program/search_program.wxss
@@ -0,0 +1,79 @@
+/* pages/firstparty/program/program.wxss */
+page{
+	background-color:rgba(187, 194, 193, 0.493);
+}
+.search{
+	padding: 0rpx 24rpx 0rpx 24rpx;
+	background-color: rgba(255, 255, 255, 1);
+}
+.card{
+	margin: 32rpx 32rpx 0 32rpx;
+}
+.the-card{
+	display: flex;
+	flex-direction: row;
+	border-radius: 5px;
+	background: rgba(255, 255, 255, 1);
+	margin: 32rpx 0 32rpx 0;
+	height: 204rpx;
+}
+.image{
+	width: 172rpx;
+	height: 172rpx;
+}
+.image-1{
+	width: 172rpx;
+	height: 172rpx;
+	margin: 16rpx;
+}
+.name{
+	display: flex;
+	flex-direction: column;
+	margin: 16rpx 0 24rpx 0rpx;
+}
+.number{
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	border-radius: 2px;
+	background: rgba(255, 242, 242, 1);
+	width: 192rpx;
+	height: 44rpx;
+	padding: 2rpx;
+}
+.unit-name{
+	font-size: 18px;
+	font-weight: 600;
+	letter-spacing: 0px;
+	line-height: 25.2px;
+	color: rgba(51, 51, 51, 1);
+	text-align: left;
+	vertical-align: top;
+	margin-bottom: 16rpx;
+}
+.number-describer
+{
+	font-size: 12px;
+	font-weight: 400;
+	letter-spacing: 0px;
+	line-height: 16.8px;
+	color: rgba(204, 33, 41, 1);
+	text-align: left;
+	vertical-align: top;
+	padding: 6rpx 0rpx 0rpx 0rpx;
+}
+.unit-number
+{
+	font-size: 18px;
+	width: 56rpx;
+	font-weight: 500;
+	letter-spacing: 0px;
+	line-height: 25.2px;
+	color: rgba(204, 33, 41, 1);
+	text-align: left;
+	vertical-align: top;
+}
+.unit-icon
+{
+	padding: 6rpx;
+}
\ No newline at end of file
diff --git a/front/pages/manage/add_program/add_program.js b/front/pages/manage/add_program/add_program.js
index eb12614..e184ac6 100644
--- a/front/pages/manage/add_program/add_program.js
+++ b/front/pages/manage/add_program/add_program.js
@@ -1,4 +1,7 @@
 // pages/manage/add_program/add_program.js
+const app = getApp();
+const api = app.globalData.api;
+
 Page({
 
   /**
@@ -60,7 +63,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
   },
 
   /**
@@ -164,9 +166,7 @@ Page({
   onConfirm(e) {
     const { value } = e.detail;
     const { mode } = this.data;
-
     console.log('confirm', value);
-
     this.setData({
       [mode]: value,
       [`${mode}Text`]: value,
@@ -229,6 +229,30 @@ Page({
   //   //直接给上移页面赋值
   //   back: true,
   // });
+  wx.request({
+    url: api+'/project/addProject',
+    method:"POST",
+    data:{
+      "projectGrade": 1,
+      "projectName": this.data.name2,
+      "projectFirstPerson": this.data.name3,
+      "projectSecondPerson": this.data.personText,
+      "projectStartTime": this.data.date1Text,
+      "projectEndTime": this.data.date2Text,
+      "projectRemark": this.data.remark,
+      "projectIsDone": 0,
+      "projectUnit": this.data.name1,
+      "projectUnitType": this.data.cityValue[0]
+    },
+    success(res){
+      console.log(res)
+    },
+    fail(res)
+    {
+      console.log(res)
+    }
+  })
+
   wx.navigateBack({
     //返回
     delta:1
diff --git a/front/pages/manage/car/car.js b/front/pages/manage/car/car.js
index 0f98c3a..0779b25 100644
--- a/front/pages/manage/car/car.js
+++ b/front/pages/manage/car/car.js
@@ -1,28 +1,47 @@
 // pages/firstparty/car/car.js
+const app = getApp();
+
+const api = app.globalData.api;
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    cars:[
-      {
-        name:"中国重汽 SITRAK C5H 340马力",
-        start_time:"2024.06.10",
-        end_time:"2024.06.16",
-        image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
-        person:"张晓军",
-        info:"津A·88888"
-
-      }
-    ]
+    // cars:[
+    //   {
+    //     name:"中国重汽 SITRAK C5H 340马力",
+    //     start_time:"2024.06.10",
+    //     end_time:"2024.06.16",
+    //     image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
+    //     person:"张晓军",
+    //     info:"津A·88888"
+
+    //   }
+    // ]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    let that = this
+    console.log(options)
+        //查询房间详情
+        wx.request({
+          url: api+'/car/queryCarByProId?proId='+options.projectid, 
+          method:"GET",
+          success(res){
+            console.log(res)
+            that.setData({
+              cars:res.data.data,
+            })
+          },
+          fail(res)
+          {
+            console.log(res)
+          }
+        })
   },
 
   /**
diff --git a/front/pages/manage/car/car.wxml b/front/pages/manage/car/car.wxml
index e80d291..99f2880 100644
--- a/front/pages/manage/car/car.wxml
+++ b/front/pages/manage/car/car.wxml
@@ -5,17 +5,17 @@
 	<view class="car-name">
 		<t-image src="{{item.image}}" style="width:160rpx;height:160rpx" ></t-image>
 		<view style="margin-left: 24rpx;">
-		<view class="car-name-1">{{item.name}}</view>
-		<view class="car-time">使用时间:{{item.start_time}}-{{item.end_time}}</view>
+		<view class="car-name-1">{{item.carName}}</view>
+		<view class="car-time">使用时间:{{item.carStartTime}}至{{item.carEndTime}}</view>
 		</view>
 	</view>
 	<view class="car-info">
 	<view class="box">
-	<view>{{item.person}}</view>
+	<view>{{item.name}}</view>
 	<view class="remark">负责人</view>
 	</view>
 	<view class="box">
-	<view>{{item.info}}</view>
+	<view>{{item.carNumber}}</view>
 	<view class="remark">车辆信息</view>
 	</view>
 </view>
diff --git a/front/pages/manage/car/car.wxss b/front/pages/manage/car/car.wxss
index dcd8d10..f018e3b 100644
--- a/front/pages/manage/car/car.wxss
+++ b/front/pages/manage/car/car.wxss
@@ -6,12 +6,13 @@ page{
 {
 	margin: 12rpx 24rpx 0 24rpx;
 	padding: 0;
-	background-color: rgba(255, 255, 255, 1);
 }
 .car
 {
 	margin-top: 12rpx;
 	margin-bottom: 12rpx;
+	background-color: rgba(255, 255, 255, 1);
+	width: 700rpx;
 }
 .car-name
 {
diff --git a/front/pages/manage/my_program_detail/my_program_detail.js b/front/pages/manage/my_program_detail/my_program_detail.js
index 2b851bd..747bbb4 100644
--- a/front/pages/manage/my_program_detail/my_program_detail.js
+++ b/front/pages/manage/my_program_detail/my_program_detail.js
@@ -1,4 +1,7 @@
 // pages/firstparty/program_detail/program_detail.js
+const app = getApp();
+const api = app.globalData.api;
+
 Page({
 
   /**
@@ -11,28 +14,28 @@ Page({
     unit:"",
     unit_number:"",
     value:"",
-    program:[
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
-
-      }
-    ],
-    program_done:[
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
-
-      }
-    ]
+    // program:[
+    //   {
+    //     program_name:"总项目名称",
+    //     first_name:"刘三",
+    //     second_name:"李四",
+    //     start_data:"2024.06.10",
+    //     end_data:"2024.06.16",
+    //     detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
+
+    //   }
+    // ],
+    // program_done:[
+    //   {
+    //     program_name:"总项目名称",
+    //     first_name:"刘三",
+    //     second_name:"李四",
+    //     start_data:"2024.06.10",
+    //     end_data:"2024.06.16",
+    //     detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情..."
+
+    //   }
+    // ]
   },
 
   /**
@@ -40,9 +43,22 @@ Page({
    */
   onLoad(options) {
     console.log(options)
-    this.setData({
-      unit:options.name,
-      unit_number:options.number
+    console.log(options)
+    const that = this
+    const unit  = options.name
+    wx.request({
+      url: api+'/project/queryProjectByUnit?projectUnit='+unit,
+      method:"GET",
+      success(res){
+        console.log(res)
+        that.setData({
+          program:res.data.data
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
     })
   },
 
@@ -111,10 +127,11 @@ Page({
     })
     console.log(this.data.value)
   },
-  goto()
+  goto(e)
   {
+    let id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: '/pages/manage/program_detail_1/program_detail_1',
+      url: '/pages/manage/program_detail_1/program_detail_1?id='+id,
     })
   },
   onIconTap(e)
diff --git a/front/pages/manage/my_program_detail/my_program_detail.wxml b/front/pages/manage/my_program_detail/my_program_detail.wxml
index a78fcf3..de83d26 100644
--- a/front/pages/manage/my_program_detail/my_program_detail.wxml
+++ b/front/pages/manage/my_program_detail/my_program_detail.wxml
@@ -8,27 +8,27 @@
 </t-tabs>
 <!-- 未完成的项目 -->
 <view class="card" wx:if="{{value==0}}">
-	<view class="detail" wx:for="{{program}}" wx:key="index">
+	<view class="detail" wx:for="{{program}}" wx:key="index" wx:if="{{item.projectIsDone==0}}">
 	<view class="detail-container">
 	<view class="done">
 		<view class="program-name">
-		{{item.program_name}}
+			{{item.projectName}}
 		</view>
 		<t-icon name="delete" size="24" data-name="{{item}}" bind:tap="delete" data-key="showConfirm" data-index = "{{index}}"/>
 	</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方负责人：{{item.second_name}}</view>
+			<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -37,7 +37,7 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
 		<t-dialog
@@ -53,27 +53,27 @@
 </view>
 <!-- 已完成的项目 -->
 <view class="card" wx:if="{{value==1}}">
-	<view class="detail" wx:for="{{program_done}}">
+	<view class="detail" wx:for="{{program}}" wx:if="{{item.projectIsDone==1}}">
 	<view class="detail-container">
 		<view class="done">
 		<view class="program-name">
-		{{item.program_name}}
+			{{item.projectName}}
 		</view>
 		<view class="done-word">已完成</view>
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方负责人：{{item.second_name}}</view>
+			<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -82,8 +82,9 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
 	</view>
-</view>
+
+</view>
\ No newline at end of file
diff --git a/front/pages/manage/program_detail/program_detail.js b/front/pages/manage/program_detail/program_detail.js
index 07c1023..2786b27 100644
--- a/front/pages/manage/program_detail/program_detail.js
+++ b/front/pages/manage/program_detail/program_detail.js
@@ -1,4 +1,7 @@
 // pages/firstparty/program_detail/program_detail.js
+const app = getApp();
+const api = app.globalData.api;
+
 Page({
 
   /**
@@ -35,6 +38,22 @@ Page({
    */
   onLoad(options) {
     console.log(options)
+    const that = this
+    const unit  = options.name
+    wx.request({
+      url: api+'/project/queryProjectByUnit?projectUnit='+unit,
+      method:"GET",
+      success(res){
+        console.log(res)
+        that.setData({
+          program:res.data.data
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
   },
 
   /**
@@ -92,10 +111,11 @@ Page({
     })
     console.log(this.data.value)
   },
-  goto()
+  goto(e)
   {
+    let id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: '/pages/manage/program_detail_1/program_detail_1',
+      url: '/pages/manage/program_detail_1/program_detail_1?id='+id,
     })
   }
 })
\ No newline at end of file
diff --git a/front/pages/manage/program_detail/program_detail.wxml b/front/pages/manage/program_detail/program_detail.wxml
index 0c704ba..5dc7d23 100644
--- a/front/pages/manage/program_detail/program_detail.wxml
+++ b/front/pages/manage/program_detail/program_detail.wxml
@@ -8,24 +8,24 @@
 </t-tabs>
 <!-- 未完成的项目 -->
 <view class="card" wx:if="{{value==0}}">
-	<view class="detail" wx:for="{{program}}">
+	<view class="detail" wx:for="{{program}}"  wx:if="{{item.projectIsDone==0}}">
 	<view class="detail-container">
 		<view class="program-name">
-		{{item.program_name}}
+		{{item.projectName}}
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方负责人：{{item.second_name}}</view>
+		<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -34,34 +34,34 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
 	</view>
 </view>
 <!-- 已完成的项目 -->
 <view class="card" wx:if="{{value==1}}">
-	<view class="detail" wx:for="{{program_done}}">
+	<view class="detail" wx:for="{{program}}" wx:if="{{item.projectIsDone==1}}">
 	<view class="detail-container">
 		<view class="done">
 		<view class="program-name">
-		{{item.program_name}}
+			{{item.projectName}}
 		</view>
 		<view class="done-word">已完成</view>
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{item.first_name}}</view>
-		<view class="theperson">乙方复制人：{{item.second_name}}</view>
+			<view class="theperson">甲方负责人：{{item.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{item.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{item.start_data}}-{{item.end_data}}</view>
+		<view>{{item.projectStartTime}}至{{item.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
   t-class="external-class"
-  value="{{item.detail}}"
+  value="{{item.projectRemark}}"
 	maxcharacter="200"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -70,7 +70,7 @@
 	/>
 		</view>
 		<view class="button">
-		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto">查看项目详情</t-button>
+		<t-button variant="outline"  theme="primary" shape="round" class="button" bind:tap="goto" data-id="{{item.projectId}}">查看项目详情</t-button>
 		</view>
 		</view>
 	</view>
diff --git a/front/pages/manage/program_detail_1/program_detail_1.js b/front/pages/manage/program_detail_1/program_detail_1.js
index 5a80e26..1d49ff1 100644
--- a/front/pages/manage/program_detail_1/program_detail_1.js
+++ b/front/pages/manage/program_detail_1/program_detail_1.js
@@ -1,4 +1,7 @@
 // pages/firstparty/program_detail_1/program_detail_1.js
+const app = getApp();
+const api = app.globalData.api;
+
 Page({
 
   /**
@@ -14,49 +17,78 @@ Page({
     autosize:20,
     room_6:[],
     current_room:[],
-    room:[
-      {
-        number:"001",
-      },
-      {
-        number:"002",
-      },      
-      {
-        number:"003",
-      },
-      {
-        number:"004",
-      },
-      {
-        number:"005",
-      },
-      {
-        number:"006",
-      },      
-      {
-        number:"007",
-      },
-    ],
-    program:
-      {
-        program_name:"总项目名称",
-        first_name:"刘三",
-        second_name:"李四",
-        start_data:"2024.06.10",
-        end_data:"2024.06.16",
-        detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情"
-
-      },
+    // room:[
+    //   {
+    //     number:"001",
+    //   },
+    //   {
+    //     number:"002",
+    //   },      
+    //   {
+    //     number:"003",
+    //   },
+    //   {
+    //     number:"004",
+    //   },
+    //   {
+    //     number:"005",
+    //   },
+    //   {
+    //     number:"006",
+    //   },      
+    //   {
+    //     number:"007",
+    //   },
+    // ],
+    // program:
+    //   {
+    //     program_name:"总项目名称",
+    //     first_name:"刘三",
+    //     second_name:"李四",
+    //     start_data:"2024.06.10",
+    //     end_data:"2024.06.16",
+    //     detail:"这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情...这是项目详情段落文本备注，这是项目详情段落文本这是项目详情段落文本，这是项目详情"
+
+    //   },
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    let firstSix = this.data.room.slice(0, 6);
-    this.setData({
-      room_6:firstSix,
-      current_room:firstSix
+    const id = options.id
+    let that = this
+    //查询项目详情
+    wx.request({
+      url: api+'/project/queryProjectById?projectId='+id, 
+      method:"GET",
+      success(res){
+        that.setData({
+          program:res.data.data[0]
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
+    })
+    //查询房间详情
+    wx.request({
+      url: api+'/room/queryRoomByProjectId?projectId='+id, 
+      method:"GET",
+      success(res){
+        console.log(res)
+        let firstSix = res.data.data.slice(0, 6);
+        that.setData({
+          room:res.data.data,
+          room_6:firstSix,
+          current_room:firstSix
+        })
+      },
+      fail(res)
+      {
+        console.log(res)
+      }
     })
   },
 
@@ -152,7 +184,7 @@ Page({
   },
   gotocar(){
     wx.navigateTo({
-      url: '/pages/manage/car/car',
+      url: '/pages/manage/car/car?projectid='+this.data.program.projectId,
     })
   },
   gotoequipment(){
@@ -163,7 +195,7 @@ Page({
   add_room()
   {
     wx.navigateTo({
-      url: '/pages/manage/add_room/add_room',
+      url: '/pages/manage/add_room/add_room?'
     })
   },
       //显示框
diff --git a/front/pages/manage/program_detail_1/program_detail_1.wxml b/front/pages/manage/program_detail_1/program_detail_1.wxml
index 1bb4bc7..dc14667 100644
--- a/front/pages/manage/program_detail_1/program_detail_1.wxml
+++ b/front/pages/manage/program_detail_1/program_detail_1.wxml
@@ -3,22 +3,22 @@
 	<view class="detail" >
 	<view class="detail-container">
 		<view class="program-name">
-		{{program.program_name}}
+		{{program.projectName}}
 		</view>
 		<view class="person">
-		<view class="theperson">甲方负责人：{{program.first_name}}</view>
-		<view class="theperson">乙方负责人：{{program.second_name}}</view>
+		<view class="theperson">甲方负责人：{{program.projectFirstPerson}}</view>
+		<view class="theperson">乙方负责人：{{program.projectSecondPerson}}</view>
 		</view>
 		<view class="data">
 		<view>项目日期</view>
-		<view>{{program.start_data}}-{{program.end_data}}</view>
+		<view>{{program.projectStartTime}}至{{program.projectEndTime}}</view>
 		</view>
 		<view>
 		<view class="detail-name">项目详情</view>
 		<t-textarea
 	wx:if="{{showon}}"
   t-class="external-class"
-  value="{{program.detail}}"
+  value="{{program.projectRemark}}"
 	maxcharacter="70"
   disableDefaultPadding="{{true}}"
 	style="height: 120rpx; padding: 16rpx;"
@@ -51,7 +51,7 @@
 	</view>	
 	<view class='room'>
 	<t-button theme="primary" variant="outline" size="small"wx:for="{{current_room}}" bind:tap="gotoroom">
-	房间编号{{item.number}}
+	房间编号{{item.roomId}}
 	</t-button>
 	</view>
 	<view class="on" wx:if="{{six}}" bind:tap="changeall">
diff --git a/front/project.private.config.json b/front/project.private.config.json
index faa35b2..dbff5d2 100644
--- a/front/project.private.config.json
+++ b/front/project.private.config.json
@@ -2,7 +2,8 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "miniprogram-7",
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": true,
+    "urlCheck": false
   },
   "libVersion": "2.27.3"
 }
\ No newline at end of file