diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
index 7295e41..9f5b869 100644
--- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
+++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
@@ -51,7 +51,12 @@
                 AND tpc.file_resource_id IS NOT NULL
             </if>
             <if test="searchType == 1">
-                AND tcq.title LIKE CONCAT('%',#{imgPath},'%')
+                <if test="keyWord!=null and keyWord!=''">
+                    AND (
+                    SUBSTRING(sfr.source_type_name, LOCATE('-', sfr.source_type_name) + 1) = #{keyWord} OR
+                    INSTR(tcq.title,#{keyWord}) > 0
+                    )
+                </if>
             </if>
             <if test="searchType == 2">
                 <if test="uploadType!=0">
@@ -60,7 +65,10 @@
             </if>
             <if test="searchType == 3">
                 <if test="keyWord!=null and keyWord!=''">
-
+                    AND(
+                        SUBSTRING(sfr.source_type_name, LOCATE('-', sfr.source_type_name) + 1) = #{keyWord} OR
+                        INSTR(tcq.title,#{keyWord}) > 0
+                    )
                 </if>
                 <if test="proId!=null">
                     AND tcq.pro_id = #{proId}
@@ -74,29 +82,38 @@
                 <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
                     AND DATE_FORMAT(sfr.create_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
                 </if>
-                <if test="vioPlace!=null and vioPlace!=''">
-                    AND INSTR(tcq.vio_place,#{vioPlace}) > 0 AND tcq.upload_type = '1'
+                <if test="(vioPlace!=null and vioPlace!='') or (vioDesc!=null and vioDesc!='') or (rectDesc!=null and rectDesc!='')">
+                    <if test="vioPlace!=null and vioPlace!=''">
+                        AND INSTR(tcq.vio_place,#{vioPlace}) > 0
+                    </if>
+                    <if test="vioDesc!=null and vioDesc!=''">
+                        AND INSTR(tcq.vio_desc,#{vioDesc}) > 0
+                    </if>
+                    <if test="rectDesc!=null and rectDesc!=''">
+                        AND INSTR(tcq.rect_desc,#{rectDesc}) > 0
+                    </if>
+                    AND tcq.upload_type = '1'
                 </if>
-                <if test="vioDesc!=null and vioDesc!=''">
-                    AND INSTR(tcq.vio_desc,#{vioDesc}) > 0 AND tcq.upload_type = '1'
+                <if test="(checkPlace2!=null and checkPlace2!='') or (checkDesc2!=null and checkDesc2!='') or (rectDesc2!=null and rectDesc2!='')">
+                    <if test="checkPlace2!=null and checkPlace2!=''">
+                        AND INSTR(tcq.vio_place,#{checkPlace2}) > 0
+                    </if>
+                    <if test="checkDesc2!=null and checkDesc2!=''">
+                        AND INSTR(tcq.vio_desc,#{checkDesc2}) > 0
+                    </if>
+                    <if test="rectDesc2!=null and rectDesc2!=''">
+                        AND INSTR(tcq.rect_desc,#{rectDesc2}) > 0
+                    </if>
+                    AND tcq.upload_type = '2'
                 </if>
-                <if test="rectDesc!=null and rectDesc!=''">
-                    AND INSTR(tcq.rect_desc,#{rectDesc}) > 0 AND tcq.upload_type = '1'
-                </if>
-                <if test="checkPlace2!=null and checkPlace2!=''">
-                    AND INSTR(tcq.vio_place,#{checkPlace2}) > 0 AND tcq.upload_type = '2'
-                </if>
-                <if test="checkDesc2!=null and checkDesc2!=''">
-                    AND INSTR(tcq.vio_desc,#{checkDesc2}) > 0 AND tcq.upload_type = '2'
-                </if>
-                <if test="rectDesc2!=null and rectDesc2!=''">
-                    AND INSTR(tcq.rect_desc,#{rectDesc2}) > 0 AND tcq.upload_type = '2'
-                </if>
-                <if test="checkDesc3!=null and checkDesc3!=''">
-                    AND INSTR(tcq.vio_desc,#{checkDesc3}) > 0 AND tcq.upload_type = '3'
-                </if>
-                <if test="rectDesc3!=null and rectDesc3!=''">
-                    AND INSTR(tcq.rect_desc,#{rectDesc3}) > 0 AND tcq.upload_type = '3'
+                <if test="(checkDesc3!=null and checkDesc3!='') or (rectDesc3!=null and rectDesc3!='')">
+                    <if test="checkDesc3!=null and checkDesc3!=''">
+                        AND INSTR(tcq.vio_desc,#{checkDesc3}) > 0
+                    </if>
+                    <if test="rectDesc3!=null and rectDesc3!=''">
+                        AND INSTR(tcq.rect_desc,#{rectDesc3}) > 0
+                    </if>
+                    AND tcq.upload_type = '3'
                 </if>
                 <if test="buildPlace!=null and buildPlace!=''">
                     AND INSTR(tcq.vio_place,#{buildPlace}) > 0 AND tcq.upload_type = '4'
diff --git a/src/main/resources/static/js/select.js b/src/main/resources/static/js/select.js
index 3362005..57f75db 100644
--- a/src/main/resources/static/js/select.js
+++ b/src/main/resources/static/js/select.js
@@ -24,7 +24,7 @@ function getDictSelect(value) {
     let data = [];
     let url = dataUrl + "/sys/select/getDictSelect"
     let obj = {
-        'value':value
+        'value': value
     }
     let params = {
         encryptedData: encryptCBC(JSON.stringify(obj))
@@ -184,7 +184,7 @@ function setSelectValue2(list, selectName) {
 }
 
 // 设置下拉多选
-function setFormSelects(selName,list) {
+function setFormSelects(selName, list) {
     let keys = [];
     $.each(list, function (index, item) {
         let temp = {
@@ -200,7 +200,7 @@ function setFormSelects(selName,list) {
 }
 
 // 设置门禁-下拉许安多
-function setFormSelects2(selName,list) {
+function setFormSelects2(selName, list) {
     let keys = [];
     $.each(list, function (index, item) {
         let temp = {
@@ -215,66 +215,20 @@ function setFormSelects2(selName,list) {
     layui.form.render();
 }
 
-/**
- * 获取单位下拉选
- */
-function getCustomNameSelected() {
-    let url = dataUrl + '/samples/allCustomName';
-    ajaxRequest(url, "POST", null, true, function () {
-    }, function (result) {
-        if (result.code === 200) {
-            setSelectValue(result.data, 'customName');
-        } else {
-            layer.alert(result.msg, {icon: 2})
-        }
-    }, function (xhr) {
-        error(xhr)
-    });
+function setSelectValueName(list, selectName, placeholder) {
+    let html = '<option value="" selected>' + placeholder + '</option>';
+    $.each(list, function (index, item) {
+        html += '<option value="' + item.id + '">' + item.name + '</option>';
+    })
+    $('#' + selectName).empty().append(html);
+    layui.form.render();
 }
 
-/**
- * 获取设备类型数据
- */
-function getToolsSelected() {
-    let url = dataUrl + '/samples/all';
-    ajaxRequest(url, "POST", null, true, function () {
-    }, function (result) {
-        if (result.code === 200) {
-            setSelectValue(result.data, 'sampleTools');
-        } else {
-            layer.alert(result.msg, {icon: 2})
-        }
-    }, function (xhr) {
-        error(xhr)
-    });
-}
-
-/**
- * 获取部门下拉选
- */
-function getDeptSelectedById(customId) {
-    let url = dataUrl + '/samples/getDeptSelectedById';
-    let obj = {
-        customId:customId
-    }
-    let params = {
-        encryptedData: encryptCBC(JSON.stringify(obj))
-    }
-    ajaxRequest(url, "POST", params, true, function () {
-        }, function (result) {
-            if (result.code === 200) {
-                setSelectValue(result.data, 'sampleDepartment');
-            } else {
-            }
-        }
-    )
-}
-
-/**字典表下拉选*/
-function getDictsSelect(value) {
+// 工程下拉选
+function getProsSelect() {
     let data = [];
-    let url = dataUrl + "/sys/select/getDicts"
-    let obj = {"code":value}
+    let url = dataUrl + "/sys/select/getProsSelect"
+    let obj = {}
     let params = {
         encryptedData: encryptCBC(JSON.stringify(obj))
     }
@@ -291,22 +245,45 @@ function getDictsSelect(value) {
     return data;
 }
 
-/**字典表下拉选赋值*/
-function setDictSelectValue(list, selectName) {
-    let html = '<option value="" selected>请选择</option>';
-    $.each(list, function (index, item) {
-        html += '<option value="' + item.value + '">' + item.name + '</option>';
-    })
-    $('#' + selectName).empty().append(html);
-    layui.form.render();
+function getMajorsSelect() {
+    let data = [];
+    let url = dataUrl + "/sys/select/getMajorsSelect"
+    let obj = {}
+    let params = {
+        encryptedData: encryptCBC(JSON.stringify(obj))
+    }
+    ajaxRequest(url, "POST", params, false, function () {
+    }, function (result) {
+        if (result.status === 200) {
+            data = result.data;
+        } else if (result.status === 500) {
+            layer.alert(result.msg, {icon: 2})
+        }
+    }, function (xhr) {
+        error(xhr)
+    });
+    return data;
 }
 
-
-function setSelectValueName(list, selectName, placeholder) {
-    let html = '<option value="" selected>'+placeholder+'</option>';
-    $.each(list, function (index, item) {
-        html += '<option value="' + item.id + '">' + item.name + '</option>';
-    })
-    $('#' + selectName).empty().append(html);
-    layui.form.render();
+/**工序下拉选*/
+function getGxsSelect(major) {
+    let data = [];
+    let url = dataUrl + "/sys/select/getGxsSelect"
+    let obj = {
+        id: major
+    }
+    let params = {
+        encryptedData: encryptCBC(JSON.stringify(obj))
+    }
+    ajaxRequest(url, "POST", params, false, function () {
+    }, function (result) {
+        if (result.status === 200) {
+            data = result.data;
+        } else if (result.status === 500) {
+            layer.alert(result.msg, {icon: 2})
+        }
+    }, function (xhr) {
+        error(xhr)
+    });
+    return data;
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/synthesisQuery/highSearchForm.js b/src/main/resources/static/js/synthesisQuery/highSearchForm.js
index a087f60..4726038 100644
--- a/src/main/resources/static/js/synthesisQuery/highSearchForm.js
+++ b/src/main/resources/static/js/synthesisQuery/highSearchForm.js
@@ -40,4 +40,6 @@ function searchData() {
 /**重置数据*/
 function resetData() {
     $('#formInfo2')[0].reset();
+    let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引
+    window.parent.highSearchValue(JSON.stringify({}));
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/synthesisQuery/synthesisQuery.js b/src/main/resources/static/js/synthesisQuery/synthesisQuery.js
index c74a71e..b199a3c 100644
--- a/src/main/resources/static/js/synthesisQuery/synthesisQuery.js
+++ b/src/main/resources/static/js/synthesisQuery/synthesisQuery.js
@@ -50,6 +50,7 @@ function dataFlow(queryParams) {
 /*切换查询类型*/
 function changeType(type, that) {
     resetData();
+    highSearchData = {};
     queryType = type;
     $(that).removeClass("noCheckedElement");
     if ($(that).hasClass("checkedElement") && type === 1) {
@@ -191,13 +192,14 @@ function highSearch() {
 
 /**标题查询*/
 function titleSearch() {
+    highSearchData = {};
     resetData();
     let queryParams = {
         pageNum: pageNum,
         pageSize: pageSize,
         queryType: queryType,
         searchType: 1,
-        uploadType: $('#uploadType').val()
+        keyWord: $('#keyWord').val()
     }
     searchData(queryParams);
 }
@@ -205,6 +207,7 @@ function titleSearch() {
 
 /*图片类型查询*/
 function queryByType(that, type) {
+    highSearchData = {};
     resetData();
     $(that).addClass('type-num-check');
     let queryParams = {
diff --git a/src/main/resources/static/pages/synthesisQuery/highSearchForm.html b/src/main/resources/static/pages/synthesisQuery/highSearchForm.html
index 4b87fca..afc4eae 100644
--- a/src/main/resources/static/pages/synthesisQuery/highSearchForm.html
+++ b/src/main/resources/static/pages/synthesisQuery/highSearchForm.html
@@ -9,6 +9,7 @@
     <script src="../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../js/layui-v2.9.14/layui/layui.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../js/publicJs.js"></script>
+    <script src="../../js/select.js"></script>
     <script src="../../js/commonUtils.js"></script>
     <script src="../../js/openIframe.js"></script>
     <script src="../../js/my/aes.js"></script>
diff --git a/src/main/resources/static/pages/synthesisQuery/synthesisQuery.html b/src/main/resources/static/pages/synthesisQuery/synthesisQuery.html
index f77db89..65763a4 100644
--- a/src/main/resources/static/pages/synthesisQuery/synthesisQuery.html
+++ b/src/main/resources/static/pages/synthesisQuery/synthesisQuery.html
@@ -21,7 +21,7 @@
         <form class="layui-form">
             <div class="layui-form-item layout">
                 <div class="layui-input-group">
-                    <input style="width: 600px;" type="text" id="uploadType" name="uploadType" placeholder="搜索标题"
+                    <input style="width: 600px;" type="text" id="keyWord" name="keyWord" placeholder="搜索标题"
                            autocomplete="off" class="layui-input" lay-affix="clear">
                     <div class="layui-input-split layui-input-suffix" style="cursor: pointer;background-color: #fff;">
                         <i class="layui-icon layui-icon-search" onclick="titleSearch()"></i>
diff --git a/src/main/resources/static/pages/system/child/doorLockForm.html b/src/main/resources/static/pages/system/child/doorLockForm.html
deleted file mode 100644
index 5cac399..0000000
--- a/src/main/resources/static/pages/system/child/doorLockForm.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="../../../js/layui-v2.6.8/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../../css/dataForm.css">
-    <script src="../../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../../js/my/aes.js"></script>
-    <script src="../../../js/publicJs.js"></script>
-    <script src="../../../js/ajaxRequest.js"></script>
-    <script src="../../../js/commonUtils.js"></script>
-    <title>门禁配置-新增/修改</title>
-</head>
-<body>
-<div id="main-box">
-    <form class="layui-form" onsubmit="return false;">
-        <input hidden id="id">
-        <div class="layui-form-item" style="margin-top: 2%;">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门锁编码</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="lockNumber" name="lockNumber" autocomplete="off"
-                       lay-verify="required|isLockNumberRepeat" maxlength="30">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门锁名称</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="lockName" name="lockName" autocomplete="off"
-                       lay-verify="required|isLockNameRepeat" maxlength="40">
-            </div>
-        </div>
-        <button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
-                style="display: none;"></button>
-    </form>
-
-</div>
-<div class="btn-box">
-    <button class="layui-btn layui-btn-norma save" onclick="saveData2()">确定</button>
-    <button class="layui-btn layui-btn-primary cancel" onclick="closePage()">取消</button>
-</div>
-</body>
-<script src="../../../js/system/child/doorLockForm.js" charset="UTF-8" type="text/javascript"></script>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/static/pages/system/child/sysDoorConfigForm.html b/src/main/resources/static/pages/system/child/sysDoorConfigForm.html
deleted file mode 100644
index 85b2f18..0000000
--- a/src/main/resources/static/pages/system/child/sysDoorConfigForm.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="../../../js/layui-v2.6.8/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../../css/dataForm.css">
-    <script src="../../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../../js/my/aes.js"></script>
-    <script src="../../../js/publicJs.js"></script>
-    <script src="../../../js/ajaxRequest.js"></script>
-    <script src="../../../js/commonUtils.js"></script>
-    <title>门禁配置-新增/修改</title>
-</head>
-<body>
-<div id="main-box">
-    <form class="layui-form" onsubmit="return false;">
-        <input hidden id="id">
-        <div class="layui-form-item" style="margin-top: 2%;">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门禁IP</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="ip" name="ip" autocomplete="off"
-                       lay-verify="required|isIpRepeat" maxlength="30">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门禁端口</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="port" name="port" autocomplete="off"
-                       lay-verify="required|isPort" maxlength="30">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门禁用户</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="userName" name="userName" autocomplete="off"
-                       lay-verify="required" maxlength="30">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门禁密码</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="pwd" name="pwd" autocomplete="off"
-                       lay-verify="required" maxlength="30">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"><i style="padding: 0 10px;">*</i>门禁名称</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" id="name" name="name" autocomplete="off"
-                       lay-verify="required|isNameRepeat" maxlength="50">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">是否启用</label>
-            <div class="layui-input-inline">
-                <input type="checkbox" checked="" name="status" lay-skin="switch" lay-filter="switchTest" title="是否">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">备注</label>
-            <div class="layui-input-inline">
-                <textarea style="height: 100px;" class="layui-input" id="remarks" name="remarks" autocomplete="off"
-                          maxlength="100"></textarea>
-            </div>
-        </div>
-        <button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
-                style="display: none;"></button>
-    </form>
-
-</div>
-<div class="btn-box">
-    <button class="layui-btn layui-btn-norma save" onclick="saveData2()">确定</button>
-    <button class="layui-btn layui-btn-primary cancel" onclick="closePage()">取消</button>
-</div>
-</body>
-<script src="../../../js/system/child/sysDoorConfigForm.js" charset="UTF-8" type="text/javascript"></script>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/static/pages/system/doorLockMge.html b/src/main/resources/static/pages/system/doorLockMge.html
deleted file mode 100644
index 0f99822..0000000
--- a/src/main/resources/static/pages/system/doorLockMge.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="../../js/layui-v2.6.8/css/layui.css">
-    <link rel="stylesheet" href="../../css/table-common2.css">
-    <script src="../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../js/publicJs.js"></script>
-    <script src="../../js/commonUtils.js"></script>
-    <script src="../../js/openIframe.js"></script>
-    <script src="../../js/my/aes.js"></script>
-    <script src="../../js/ajaxRequest.js"></script>
-    <title>门锁管理</title>
-</head>
-<body>
-<div id="content">
-    <div class="basic-search-box layout">
-        <form class="layui-form basic-form" onsubmit="return false;">
-            <div class="layui-form-item">
-                <div class="layui-inline" style="padding: 0 0 0 10px;">
-                    <div class="layui-input-inline">
-                        <input type="text" id="lockNumber" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入门锁编码">
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <div class="layui-input-inline">
-                        <input type="text" id="lockName" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入门锁名称">
-                    </div>
-                </div>
-                <div class="layui-inline btns">
-                    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
-                    </button>
-                    <button type="button" class="layui-btn layui-btn-primary layui-btn-sm btn-2"
-                            onclick="addData(null)">
-                        <div class="layout" style="justify-content: space-around;"><img
-                                src="../../img/form/add_icon3.png">
-                            <p>新增</p></div>
-                    </button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="table-box" table-responsive style="z-index: 1;">
-        <table id="table_data" class="table" lay-filter="table_data"></table>
-        <div id="voi-page" class="layout"></div>
-    </div>
-</div>
-</body>
-<style>
-    .layui-table-init {
-        background-color: transparent !important;
-    }
-</style>
-
-<script src="../../js/system/doorLockMge.js" charset="UTF-8" type="text/javascript"></script>
-</html>
\ No newline at end of file