From 03ec8346df7159139a5b8a9612b2989b22b9e55b Mon Sep 17 00:00:00 2001
From: wangjie <931696759@qq.com>
Date: Fri, 25 Apr 2025 20:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZdryFjyp/components/deepIn.vue            | 100 +++++++++++++++++-
 .../backOfficeSystem/MeetingRoom/index.vue    |  29 ++++-
 2 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/src/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/components/deepIn.vue b/src/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/components/deepIn.vue
index 0bb6e71..45eda33 100644
--- a/src/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/components/deepIn.vue
+++ b/src/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/components/deepIn.vue
@@ -21,6 +21,12 @@
             :controlsWidth="pageData.controlsWidth"
             @chooseData="chooseData"
           >
+            <template #cjhx>
+              <img width="60" height="60" :src="pro" alt="" />
+            </template>
+            <template #ytp>
+              <img width="60" height="60" :src="pro" alt="" />
+            </template>
             <template #controls="{ row }">
               <el-link size="small" type="success" @click="addEdit('edit', row)">研判确认</el-link>
               <el-link size="small" type="primary">查看</el-link>
@@ -58,7 +64,7 @@
         </div>
       </div>
       <el-divider direction="vertical" style="height: 100%" />
-      <div class="right">
+      <div class="right noScollLine">
         <div class="title">轨迹信息</div>
 
         <div>
@@ -106,6 +112,38 @@
   };
   const pageData = reactive({
     tableData: [
+      {
+        tpzy: "GBJD01",
+        dwmc: "工布江达重点人",
+        zylyxz: "涉稳",
+        cjhx: "系统新增",
+        ytp: "低级",
+        rxxsd: "2025/05/05"
+      },
+      {
+        tpzy: "GBJD01",
+        dwmc: "工布江达重点人",
+        zylyxz: "涉稳",
+        cjhx: "系统新增",
+        ytp: "低级",
+        rxxsd: "2025/05/05"
+      },
+      {
+        tpzy: "GBJD01",
+        dwmc: "工布江达重点人",
+        zylyxz: "涉稳",
+        cjhx: "系统新增",
+        ytp: "低级",
+        rxxsd: "2025/05/05"
+      },
+      {
+        tpzy: "GBJD01",
+        dwmc: "工布江达重点人",
+        zylyxz: "涉稳",
+        cjhx: "系统新增",
+        ytp: "低级",
+        rxxsd: "2025/05/05"
+      },
       {
         tpzy: "GBJD01",
         dwmc: "工布江达重点人",
@@ -116,6 +154,11 @@
       }
     ],
     tableDataPeople: [
+      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
+      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
+      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
+      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
+      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
       { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" }
     ],
     keyCount: 0,
@@ -134,8 +177,8 @@
       { label: "图片资源", prop: "tpzy" },
       { label: "单位名称", prop: "dwmc" },
       { label: "资源来源详址", prop: "zylyxz" },
-      { label: "采集画像", prop: "cjhx" },
-      { label: "原图片", prop: "ytp" },
+      { label: "采集画像", prop: "cjhx", showSolt: true },
+      { label: "原图片", prop: "ytp", showSolt: true },
       { label: "人像相似度", prop: "rxxsd" }
     ],
 
@@ -151,6 +194,54 @@
     ]
   });
   const stepList = ref([
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
+    {
+      time: "2025-4-25 16:40",
+      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+    },
     {
       time: "2025-4-25 16:40",
       sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
@@ -214,7 +305,8 @@
       }
       .right {
         width: 400px;
-        padding: 10px;
+        padding: 10px 0;
+        overflow: auto;
         .step {
           //   position: relative;
           display: flex;
diff --git a/src/views/backOfficeSystem/MeetingRoom/index.vue b/src/views/backOfficeSystem/MeetingRoom/index.vue
index 070f921..0359344 100644
--- a/src/views/backOfficeSystem/MeetingRoom/index.vue
+++ b/src/views/backOfficeSystem/MeetingRoom/index.vue
@@ -9,10 +9,14 @@
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <div class="btns">
-        <el-button type="primary">新增</el-button>
-        <el-button type="danger">删除</el-button>
+      <div class="flexcb">
+        <div class="btns">
+          <el-button type="primary">新增</el-button>
+          <el-button type="danger">删除</el-button>
+        </div>
+        <Search :searchArr="searchArrMeet" @submit="onSearch" :key="pageData.keyCount + 1" class="search" />
       </div>
+
       <div class="list noScollLine">
         <div class="list-item" v-for="(item, index) in pageData.tableData" :key="`tableData${index}`" @onmouseover="">
           <div class="top">
@@ -96,6 +100,14 @@
       showType: "input"
     }
   ]);
+  const searchArrMeet = ref([
+    {
+      label: "",
+      prop: "title",
+      placeholder: "请输入关键字",
+      showType: "input"
+    }
+  ]);
 
   const queryFrom = ref({});
   const pageData = reactive({
@@ -252,6 +264,17 @@
   .el-loading-mask {
     background: rgba(0, 0, 0, 0.5) !important;
   }
+  .tabBox {
+    .pageSearch {
+      margin-bottom: 0 !important;
+      .box {
+        align-items: center !important;
+      }
+    }
+    :deep(.pageSearch .box .item) {
+      margin-bottom: 0 !important;
+    }
+  }
   .btns {
     padding: 10px 20px;
   }