diff --git a/pom.xml b/pom.xml
index 9f69201f6cc4ad36947eeb3d5bec202669cd2e23..7f7412d77c1265f55bd17e2e28e82a4aadacf06a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.luckyframe</groupId>
@@ -32,7 +32,7 @@
 		<commons.io.version>2.5</commons.io.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
 		<bitwalker.version>1.19</bitwalker.version>
-<!--		<lombok.version>1.16.18</lombok.version>-->
+		<!--		<lombok.version>1.16.18</lombok.version>-->
 		<velocity.version>1.7</velocity.version>
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<swagger.version>2.7.0</swagger.version>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<!-- <exclusions> <exclusion> <artifactId>spring-boot-starter-tomcat</artifactId> 
+			<!-- <exclusions> <exclusion> <artifactId>spring-boot-starter-tomcat</artifactId>
 				<groupId>org.springframework.boot</groupId> </exclusion> </exclusions> -->
 		</dependency>
 
@@ -286,11 +286,11 @@
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+	</dependencies>
 	<!--排除版本管理警告-->
 	<dependencyManagement>
 		<dependencies>
@@ -345,16 +345,16 @@
 					</execution>
 				</executions>
 			</plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
-        </plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
+		</plugins>
 	</build>
 
 	<repositories>
diff --git a/src/main/java/com/luckyframe/common/netty/ServerHandler.java b/src/main/java/com/luckyframe/common/netty/ServerHandler.java
index 9f316f77b68953103b0c432143a75b5b6889cefd..6db632e18c100514a4453bbef598ea817e7679d7 100644
--- a/src/main/java/com/luckyframe/common/netty/ServerHandler.java
+++ b/src/main/java/com/luckyframe/common/netty/ServerHandler.java
@@ -263,7 +263,7 @@ public class ServerHandler extends ChannelHandlerAdapter {
             JSONObject tmp = new JSONObject();
             tmp.put(CLIENT_METHOD, "upload");
             tmp.put(CLIENT_SUCCESS, "1");
-            if(IMG_NAME.endsWith(".png")){
+            if(json.get(IMG_NAME).toString().endsWith(".png")){
                 FileUploadFile ef = re.getFileUploadFile();
                 byte[] bytes = ef.getBytes();
                 int byteRead = ef.getEndPos();
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java
index 7de3528a3446d67d0d2c79870a4e712311d2d86e..57bed93bbee66e5e4e8cb39f25074e9de414e5f3 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java
@@ -1,5 +1,6 @@
 package com.luckyframe.project.testmanagmt.projectPageObject.mapper;
 
+import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase;
 import com.luckyframe.project.testmanagmt.projectPageObject.domain.ProjectPageObject;
 
 import java.util.List;
@@ -59,5 +60,8 @@ public interface ProjectPageObjectMapper
      * @return 结果
      */
 	public int deleteProjectPageObjectByIds(String[] projectIds);
-	
+
+	public List<ProjectCase> selectProjectCaseByPageId(int  pageId);
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java
index 0cd75d14b2d978b99014cc618a84c03d15b7446b..ca0650d838ab049dde765276268a1449fa2ca847 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java
@@ -1,5 +1,6 @@
 package com.luckyframe.project.testmanagmt.projectPageObject.service;
 
+import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase;
 import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCaseSteps;
 import com.luckyframe.project.testmanagmt.projectPageObject.domain.ProjectPageObject;
 
@@ -61,5 +62,6 @@ public interface IProjectPageObjectService {
      */
     public List<ProjectPageObject> getAllPageObject2(int projectId);
 
+    public List<ProjectCase> selectProjectCaseByPageId(int pageId);
 
 }
diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java
index 554d1431d17063609a172aa17fb307d6becdd392..c621504a8ec6a531539f24c957049463d633ce95 100644
--- a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java
+++ b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java
@@ -1,13 +1,16 @@
 package com.luckyframe.project.testmanagmt.projectPageObject.service;
 
 import com.luckyframe.common.constant.Constants;
+import com.luckyframe.common.exception.BusinessException;
 import com.luckyframe.common.support.Convert;
+import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase;
 import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCaseSteps;
 import com.luckyframe.project.testmanagmt.projectPageDetail.domain.ProjectPageDetail;
 import com.luckyframe.project.testmanagmt.projectPageDetail.mapper.ProjectPageDetailMapper;
 import com.luckyframe.project.testmanagmt.projectPageObject.domain.IbasePageObject;
 import com.luckyframe.project.testmanagmt.projectPageObject.domain.ProjectPageObject;
 import com.luckyframe.project.testmanagmt.projectPageObject.mapper.ProjectPageObjectMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +21,7 @@ import java.util.Map;
 
 /**
  * 页面配置管理 服务层实现
+ *
  * @author YSS陈再兴
  * @date 2022-03-10
  */
@@ -81,6 +85,23 @@ public class ProjectPageObjectServiceImpl implements IProjectPageObjectService,
      */
     @Override
     public int deleteProjectPageObjectByIds(String ids) {
+        //增加判断，如果关联了用例，则不能进行删除
+        String[] idss = ids.split(",");
+        StringBuilder sb = new StringBuilder();
+        for (String id : idss) {
+            List<ProjectCase> list = projectPageObjectMapper.selectProjectCaseByPageId(Integer.parseInt(id));
+            if (CollectionUtils.isNotEmpty(list)) {
+                StringBuilder stringBuilder = new StringBuilder();
+                for (ProjectCase projectCase : list) {
+                    stringBuilder.append(projectCase.getCaseName()).append(";");
+                }
+                ProjectPageObject pageObject = projectPageObjectMapper.selectProjectPageObjectById(Integer.parseInt(id));
+                sb.append("页面不能被删除,页面:" + pageObject.getPageName() + "关联了用例:" + stringBuilder.toString()).append(";");
+            }
+        }
+        if (sb.length() != 0) {
+            throw new BusinessException(sb.toString());
+        }
         return projectPageObjectMapper.deleteProjectPageObjectByIds(Convert.toStrArray(ids));
     }
 
@@ -98,4 +119,9 @@ public class ProjectPageObjectServiceImpl implements IProjectPageObjectService,
         }
         return projectPageObjectsList;
     }
+
+    @Override
+    public List<ProjectCase> selectProjectCaseByPageId(int pageId) {
+        return projectPageObjectMapper.selectProjectCaseByPageId(pageId);
+    }
 }
diff --git a/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml b/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml
index 089ce23074d20761e483605dccb3b5a4134d649b..af37c4117eb7b4b8a82f311f906ed8123bf90b88 100644
--- a/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml
+++ b/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml
@@ -1,74 +1,94 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.luckyframe.project.testmanagmt.projectPageObject.mapper.ProjectPageObjectMapper">
-    
-    <resultMap type="ProjectPageObject" id="ProjectPageObjectResult">
-        <result property="projectId"    column="project_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="pageId"    column="page_id"    />
-        <result property="pageName"    column="page_name"    />
-        <result property="pageParentMenu"    column="page_parentmenu"    />
-        <result property="pageMenu"    column="page_menu"    />
 
+    <resultMap type="ProjectPageObject" id="ProjectPageObjectResult">
+        <result property="projectId" column="project_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="pageId" column="page_id"/>
+        <result property="pageName" column="page_name"/>
+        <result property="pageParentMenu" column="page_parentmenu"/>
+        <result property="pageMenu" column="page_menu"/>
+    </resultMap>
 
+    <resultMap type="ProjectCase" id="ProjectCaseResult">
+        <result property="caseId" column="case_id"/>
+        <result property="caseSerialNumber" column="case_serial_number"/>
+        <result property="caseSign" column="case_sign"/>
+        <result property="caseName" column="case_name"/>
+        <result property="projectId" column="project_id"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="caseType" column="case_type"/>
+        <result property="failcontinue" column="failcontinue"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
-	
-	<sql id="selectProjectPageObjectVo">
+
+    <sql id="selectProjectPageObjectVo">
         select project_id, create_by, create_time, update_by, update_time, remark, page_id, page_name,page_parentmenu,page_menu  from project_page_object
     </sql>
-	
+
     <select id="selectProjectPageObjectList" parameterType="ProjectPageObject" resultMap="ProjectPageObjectResult">
         <include refid="selectProjectPageObjectVo"/>
-        <where>  
-            <if test="projectId != null "> and project_id = #{projectId}</if>
-             <if test="createBy != null  and createBy != '' "> and create_by = #{createBy}</if>
-             <if test="createTime != null "> and create_time = #{createTime}</if>
-             <if test="updateBy != null  and updateBy != '' "> and update_by = #{updateBy}</if>
-             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-             <if test="remark != null  and remark != '' "> and remark = #{remark}</if>
-             <if test="pageId != null "> and page_id = #{pageId}</if>
-             <if test="pageName != null  and pageName != '' "> and page_name = #{pageName}</if>
-            <if test="pageParentMenu != null  and pageParentMenu != '' "> and page_parentmenu = #{pageParentMenu}</if>
-            <if test="pageMenu != null  and pageMenu != '' "> and page_menu = #{pageMenu}</if>
+        <where>
+            <if test="projectId != null ">and project_id = #{projectId}</if>
+            <if test="createBy != null  and createBy != '' ">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != '' ">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="remark != null  and remark != '' ">and remark = #{remark}</if>
+            <if test="pageId != null ">and page_id = #{pageId}</if>
+            <if test="pageName != null  and pageName != '' ">and page_name = #{pageName}</if>
+            <if test="pageParentMenu != null  and pageParentMenu != '' ">and page_parentmenu = #{pageParentMenu}</if>
+            <if test="pageMenu != null  and pageMenu != '' ">and page_menu = #{pageMenu}</if>
 
         </where>
     </select>
-    
+
     <select id="selectProjectPageObjectById" parameterType="Integer" resultMap="ProjectPageObjectResult">
         <include refid="selectProjectPageObjectVo"/>
         where page_id = #{pageId}
     </select>
-        
+
+
+    <select id="selectProjectCaseByPageId" parameterType="Integer" resultMap="ProjectCaseResult">
+        select  a.case_name from project_case a left join project_case_steps b on a.case_id=b.case_id
+        where b.step_path like concat(#{pageId},'.%')
+    </select>
+
     <insert id="insertProjectPageObject" parameterType="ProjectPageObject">
         insert into project_page_object
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="projectId != null  ">project_id,</if>
-			<if test="createBy != null  and createBy != ''  ">create_by,</if>
-			<if test="createTime != null  ">create_time,</if>
-			<if test="updateBy != null  and updateBy != ''  ">update_by,</if>
-			<if test="updateTime != null  ">update_time,</if>
-			<if test="remark != null  and remark != ''  ">remark,</if>
-			<if test="pageId != null  ">page_id,</if>
-			<if test="pageName != null  and pageName != ''  ">page_name,</if>
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null  ">project_id,</if>
+            <if test="createBy != null  and createBy != ''  ">create_by,</if>
+            <if test="createTime != null  ">create_time,</if>
+            <if test="updateBy != null  and updateBy != ''  ">update_by,</if>
+            <if test="updateTime != null  ">update_time,</if>
+            <if test="remark != null  and remark != ''  ">remark,</if>
+            <if test="pageId != null  ">page_id,</if>
+            <if test="pageName != null  and pageName != ''  ">page_name,</if>
             <if test="pageParentMenu != null  and pageParentMenu != ''  ">page_parentmenu,</if>
             <if test="pageMenu != null  and pageMenu != ''  ">page_menu,</if>
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-			<if test="projectId != null  ">#{projectId},</if>
-			<if test="createBy != null  and createBy != ''  ">#{createBy},</if>
-			<if test="createTime != null  ">#{createTime},</if>
-			<if test="updateBy != null  and updateBy != ''  ">#{updateBy},</if>
-			<if test="updateTime != null  ">#{updateTime},</if>
-			<if test="remark != null  and remark != ''  ">#{remark},</if>
-			<if test="pageId != null  ">#{pageId},</if>
-			<if test="pageName != null  and pageName != ''  ">#{pageName},</if>
+            <if test="projectId != null  ">#{projectId},</if>
+            <if test="createBy != null  and createBy != ''  ">#{createBy},</if>
+            <if test="createTime != null  ">#{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''  ">#{updateBy},</if>
+            <if test="updateTime != null  ">#{updateTime},</if>
+            <if test="remark != null  and remark != ''  ">#{remark},</if>
+            <if test="pageId != null  ">#{pageId},</if>
+            <if test="pageName != null  and pageName != ''  ">#{pageName},</if>
             <if test="pageParentMenu != null  and pageParentMenu != ''  ">#{pageParentMenu},</if>
             <if test="pageMenu != null  and pageMenu != ''  ">#{pageMenu},</if>
 
@@ -91,15 +111,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where page_id = #{pageId}
     </update>
 
-	<delete id="deleteProjectPageObjectById" parameterType="Integer">
+    <delete id="deleteProjectPageObjectById" parameterType="Integer">
         delete from project_page_object where page_id = #{page_id}
     </delete>
-	
+
     <delete id="deleteProjectPageObjectByIds" parameterType="String">
         delete from project_page_object where page_id in
         <foreach item="pageId" collection="array" open="(" separator="," close=")">
             #{pageId}
         </foreach>
     </delete>
-    
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html b/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html
index 884f3f7868b4bcd294b5a65e27a65705d8b7526d..3bbb51bb408707c4c59331725ed3f0bba38c5e88 100644
--- a/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html
+++ b/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html
@@ -21,7 +21,13 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">定位类型，支持xpath等：</label>
 				<div class="col-sm-8">
-					<input id="type" name="type" th:field="*{type}" class="form-control" type="text">
+					<select name="type" id="type" class="form-control" type="text" th:field="*{type}">
+						<option text="xpath" value="xpath">xpath</option>
+						<option text="id" value="id">id</option>
+						<option text="name" value="name">name</option>
+						<option text="linktext" value="linktext">linktext</option>
+						<option text="tagname" value="tagname">tagname</option>
+					</select>
 				</div>
 			</div>
 			<div class="form-group">
diff --git a/src/main/resources/templates/testmanagmt/projectPageObject/add.html b/src/main/resources/templates/testmanagmt/projectPageObject/add.html
index 4025fd047eaad167950baaa702316fcd36ae3b29..c2368de1fe4332dfc6e9fb859ad8ebaeceb6e3f2 100644
--- a/src/main/resources/templates/testmanagmt/projectPageObject/add.html
+++ b/src/main/resources/templates/testmanagmt/projectPageObject/add.html
@@ -8,14 +8,12 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">项目：</label>
             <div class="col-sm-8">
-                <select id="projectId" name="projectId" style="width: 200px;" th:with="type=${projects}">
-                    <option th:each="projects : ${type}" th:text="${projects.projectName}"
-                            th:value="${projects.projectId}"
-                            th:selected="${projects.projectId == defaultProjectId}"></option>
+                <select id="projectId" class="form-control m-b" name="projectId" th:with="type=${projects}">
+                    <option th:each="project : ${type}" th:text="${project.projectName}"
+                            th:value="${project.projectId}"></option>
                 </select>
-			</div>
+            </div>
         </div>
-
         <div class="form-group">
             <label class="col-sm-3 control-label">页面名称：</label>
             <div class="col-sm-8">
diff --git a/src/main/resources/templates/testmanagmt/projectPageObject/edit.html b/src/main/resources/templates/testmanagmt/projectPageObject/edit.html
index 0eb534e731adedb85ce4ec55a5b82ea1791a7a0f..7104fb32fb6b3fcb11eba88ff8fcdd7e0bc9cf13 100644
--- a/src/main/resources/templates/testmanagmt/projectPageObject/edit.html
+++ b/src/main/resources/templates/testmanagmt/projectPageObject/edit.html
@@ -9,10 +9,9 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">项目：</label>
             <div class="col-sm-8">
-                <select id="projectId" name="projectId" style="width: 200px;" th:with="type=${projects}">
-                    <option th:value="*{projectId}" th:text="*{projectName}" selected="selected"></option>
-                    <option th:each="projects : ${type}" th:text="${projects.projectName}"
-                            th:value="${projects.projectId}"></option>
+                <select id="projectId" class="form-control m-b" name="projectId" th:with="type=${projects}">
+                    <option th:each="project : ${type}" th:text="${project.projectName}" th:value="${project.projectId}"
+                            th:selected="${project.projectId == projectPageObject.projectId}"></option>
                 </select>
             </div>
         </div>