From 811fd410701df55a276de8bcd7a9a502733ff291 Mon Sep 17 00:00:00 2001
From: esacpe <12345678>
Date: Mon, 22 Sep 2025 18:11:34 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 40 ++++++++------
 src/styles/index.scss                         |  2 +-
 src/views/Training/AnnualInspection/index.vue |  3 +-
 src/views/login/index.vue                     | 53 ++++++++++---------
 .../components/addTrainerDialog.vue           |  0
 .../components/selectTtaningDialog.vue        |  0
 .../applicantPersonnel/index.vue              |  0
 .../components/addPractitionerDialog.vue      |  2 +
 .../practitioner/index.vue                    |  2 +-
 .../components/viewDetailsDialog.vue          | 20 +++++--
 .../unitInformation/index.vue                 | 11 ++--
 11 files changed, 80 insertions(+), 53 deletions(-)
 rename src/views/securityManagement/{ => personnelManagement}/applicantPersonnel/components/addTrainerDialog.vue (100%)
 rename src/views/securityManagement/{ => personnelManagement}/applicantPersonnel/components/selectTtaningDialog.vue (100%)
 rename src/views/securityManagement/{ => personnelManagement}/applicantPersonnel/index.vue (100%)
 rename src/views/securityManagement/{ => personnelManagement}/practitioner/components/addPractitionerDialog.vue (98%)
 rename src/views/securityManagement/{ => personnelManagement}/practitioner/index.vue (99%)

diff --git a/src/router/index.js b/src/router/index.js
index 161f7a3..8d59637 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -316,24 +316,34 @@ export const publicRoutes = [
         },
       },
       {
-        path: "/practitioner",
-        name: "practitioner",
-        component: () =>
-          import("@/views/securityManagement/practitioner/index"),
+        path: "/personnelManagement",
+        name: "personnelManagement",
         meta: {
-          title: "从业人员管理",
+          title: "人员管理",
           icon: "personnel"
         },
-      },
-      {
-        path: "/trainingManagement/applicantPersonnel",
-        name: "applicantPersonnel",
-        component: () =>
-          import("@/views/securityManagement/applicantPersonnel/index"),
-        meta: {
-          title: "申请人员",
-          icon: "personnel"
-        }
+        children: [
+          {
+            path: "/personnelManagement/practitioner",
+            name: "practitioner",
+            component: () =>
+              import("@/views/securityManagement/personnelManagement/practitioner/index"),
+            meta: {
+              title: "从业人员管理",
+              icon: "personnel"
+            },
+          },
+          {
+            path: "/personnelManagement/applicantPersonnel",
+            name: "applicantPersonnel",
+            component: () =>
+              import("@/views/securityManagement/personnelManagement/applicantPersonnel/index"),
+            meta: {
+              title: "申请人员",
+              icon: "personnel"
+            }
+          },
+        ]
       },
       {
         path: "/trainingManagement",
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 97d3b34..8ee4c59 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -99,7 +99,7 @@ div:focus {
 
 ::v-deep {
   .el-input__inner, .el-input__inner:hover, .el-input__inner:focus {
-    // border: none;
+    border: none !important;
     box-shadow: none;
     background-color: transparent;
   }
diff --git a/src/views/Training/AnnualInspection/index.vue b/src/views/Training/AnnualInspection/index.vue
index 9cd6f96..70c0aff 100644
--- a/src/views/Training/AnnualInspection/index.vue
+++ b/src/views/Training/AnnualInspection/index.vue
@@ -40,7 +40,6 @@ import DetailForm from "./components/detailForm.vue";
 import Pxgs from "./components/pxgs.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { el } from "element-plus/es/locale.mjs";
 const { proxy } = getCurrentInstance();
 const activeTab = ref(2)
 const detailDiloag = ref();
@@ -153,4 +152,4 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 26ad227..0ab21a8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -5,20 +5,32 @@
         <h3 class="title">用户登录</h3>
       </div>
       <el-form-item prop="userName">
-        <span class="svg-container">
-          <svg-icon icon="user" />
-        </span>
-        <el-input placeholder="请输入账号" name="userName" type="text" v-model="loginForm.userName" />
+        <el-input placeholder="请输入账号" name="userName" type="text" v-model="loginForm.userName">
+          <template #prepend>
+             <span class="svg-container">
+              <svg-icon icon="user" />
+            </span>
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item prop="password1">
-        <span class="svg-container">
+        <!-- <span class="svg-container">
           <svg-icon icon="password" />
-        </span>
-        <el-input placeholder="请输入密码" name="password" :type="passwordType" v-model="loginForm.password" />
-        <span class="show-pwd">
-          <svg-icon @click="onChangePwdType" :icon="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
+        </span> -->
+        <el-input placeholder="请输入密码" name="password" :type="passwordType" v-model="loginForm.password">
+          <template #prepend>
+             <span class="svg-container">
+              <svg-icon icon="password" />
+            </span>
+          </template>
+          <template #append>
+            <span class="show-pwd">
+              <svg-icon @click="onChangePwdType" :icon="passwordType === 'password' ? 'eye' : 'eye-open'" />
+            </span>
+          </template>
+        </el-input>
+
       </el-form-item>
 
       <el-form-item v-if="isShowKaptCha" prop="kaptcha">
@@ -191,22 +203,15 @@ $cursor: #fff;
       color: #454545;
     }
 
-    &::v-deep .el-input {
-      display: inline-block;
-      height: 47px;
-      width: 85%;
-
-      input {
-        background: transparent;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 12px 5px 12px 15px;
-        color: $light_gray;
-        height: 47px;
-        caret-color: $cursor;
+    ::v-deep {
+      .el-input__wrapper, .el-input-group__append, .el-input-group__prepend {
+        background-color: transparent !important;
+        box-shadow: none !important;
       }
     }
+    &::v-deep .el-input {
+      height: 44px;
+    }
   }
 
   .tips {
diff --git a/src/views/securityManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
similarity index 100%
rename from src/views/securityManagement/applicantPersonnel/components/addTrainerDialog.vue
rename to src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
diff --git a/src/views/securityManagement/applicantPersonnel/components/selectTtaningDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
similarity index 100%
rename from src/views/securityManagement/applicantPersonnel/components/selectTtaningDialog.vue
rename to src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
diff --git a/src/views/securityManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
similarity index 100%
rename from src/views/securityManagement/applicantPersonnel/index.vue
rename to src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
diff --git a/src/views/securityManagement/practitioner/components/addPractitionerDialog.vue b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
similarity index 98%
rename from src/views/securityManagement/practitioner/components/addPractitionerDialog.vue
rename to src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
index 6483e0d..e6d220c 100644
--- a/src/views/securityManagement/practitioner/components/addPractitionerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
@@ -101,12 +101,14 @@ const close = () => {
 
 const open = (row = {}, type = 'add') => {
   dialogVisible.value = true
+  disabled.value = false
   formData.value = { ...row }
   if (type === 'add') {
     title.value = '新增从业人员'
   } else if (type === 'edit') {
     title.value = '编辑从业人员'
   } else {
+    disabled.value = true
     title.value = '查看详情'
   }
 }
diff --git a/src/views/securityManagement/practitioner/index.vue b/src/views/securityManagement/personnelManagement/practitioner/index.vue
similarity index 99%
rename from src/views/securityManagement/practitioner/index.vue
rename to src/views/securityManagement/personnelManagement/practitioner/index.vue
index e541616..4e35b2f 100644
--- a/src/views/securityManagement/practitioner/index.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/index.vue
@@ -78,7 +78,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [],
+  tableData: [{}],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
diff --git a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue
index 02c3412..110f72b 100644
--- a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue
+++ b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue
@@ -3,7 +3,7 @@
     <div class="head_box">
       <span class="title">{{ title }}</span>
       <div>
-        <el-button size="small" @click="save" type="primary" :loading="loading">保存</el-button>
+        <!-- <el-button size="small" @click="save" type="primary" :loading="loading">保存</el-button> -->
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
@@ -28,6 +28,18 @@
         <el-descriptions-item label="场所负责人联系方式">{{ formData.ssbmdm }}</el-descriptions-item>
         <el-descriptions-item label="场所负责人居住地址">{{ formData.ssbmdm }}</el-descriptions-item>
         <el-descriptions-item label="场所负责人身份证号">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安服务公司名称" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人身份证号码">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安负责人联系方式">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="保安人员数量">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="场所面积" :span="2">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="营业执照照片">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="武装押运证书">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="备案编号">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="备案机构名称">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营许可证号码">{{ formData.ssbmdm }}</el-descriptions-item>
+        <el-descriptions-item label="经营许可证发证机构">{{ formData.ssbmdm }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
@@ -37,7 +49,6 @@
 import { ref, computed, reactive, getCurrentInstance } from 'vue'
 import { qcckPost } from "@/api/qcckApi.js";
 import MyTable from '@/components/aboutTable/MyTable.vue';
-// import viewAndUploadDialog from './viewAndUploadDialog.vue';
 
 const { proxy } = getCurrentInstance()
 const title = ref('保安培训项目新增')
@@ -104,7 +115,7 @@ const open = (row = {}, type = 'add') => {
   dialogVisible.value = true
   formData.value = { ...row }
   if (type === 'view') {
-    title.value = '保安线下考试详情'
+    title.value = '查看详情'
     visible.value = true
   } else if (type === 'edit') {
     title.value = '保安证申请'
@@ -144,8 +155,7 @@ defineExpose({ open })
 
 .cntinfo {
   padding: 2rem 12rem 0rem 12rem;
-  height: calc(100% - 70px);
-  overflow: hidden;
+  height: calc(100% - 270px);
   overflow-y: auto;
 }
 
diff --git a/src/views/securityManagement/unitInformation/index.vue b/src/views/securityManagement/unitInformation/index.vue
index 4044798..9777671 100644
--- a/src/views/securityManagement/unitInformation/index.vue
+++ b/src/views/securityManagement/unitInformation/index.vue
@@ -2,7 +2,6 @@
   <div>
     <div class="titleBox">
       <page-title title="单位管理" />
-      <el-button type="primary" @click="addEdit('add', row)">新增</el-button>
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
@@ -20,9 +19,7 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
-          <el-link type="danger" @click="handleDelete([row.id])">删除</el-link>
-          <el-link type="warning" @click="handleXfrw(row)">下发任务</el-link>
+          <el-link type="primary" @click="addEdit('view', row)">详情</el-link>
         </template>
       </MyTable>
 
@@ -31,7 +28,7 @@
         total: pageData.total
       }"></Pages>
 
-      <ViewDetailsDialog v-model="visible" />
+      <ViewDetailsDialog ref="detailsRef" v-model="visible" />
     </div>
   </div>
 </template>
@@ -47,6 +44,7 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 
 const visible = ref(false);
 const searchBox = ref(null);
+const detailsRef = ref(null);
 const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
   {
@@ -110,6 +108,9 @@ const getList = async () => {
   }
 };
 
+const addEdit = (type, row) => {
+  detailsRef.value.open(row, type);
+}
 
 onMounted(() => {
   tabHeightFn();