解决冲突

src/styles/index.scss

@@ -101,6 +101,7 @@ div:focus {
   .el-input__inner, .el-input__inner:hover, .el-input__inner:focus {
     // border: none;
     box-shadow: none;
+    background-color: transparent;
   }
 }
 

src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="dialog" v-if="dialogVisible">
+    <div class="head_box">
+      <span class="title">{{ title }}</span>
+      <div>
+        <el-button v-if="!disabled" size="small" @click="save" type="primary" :loading="loading">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <FormMessage ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" :labelWidth='120'>
+        <!-- <template #zb>
+          <el-input v-model="formData.zb" placeholder="请选择巡逻路线">
+            <template #append><el-button type="primary" @click="chackLat">开始绘制</el-button></template>
+          </el-input>
+        </template> -->
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, reactive, getCurrentInstance } from 'vue'
+import { qcckPost } from "@/api/qcckApi.js";
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+
+const { proxy } = getCurrentInstance()
+const title = ref('新增培训人员')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dic: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const dialogVisible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const formList = reactive([
+  [
+    { label: "姓名", prop: "xm", type: "input" },
+    { label: "证件号码", prop: "sfzh", type: "select", options: props.dic.D_BZ_BXDLX },
+    { label: "联系电话", prop: "lxdh", type: "input" },
+  ],
+  [
+    { label: "居住地址", prop: "jzdz", type: "input" },
+    { label: "申请时间", prop: "rzsj", type: "date" },
+    { label: "岗位", prop: "ssbmdm", type: "select" },
+  ],
+  [
+    { label: "身份证正反面", prop: "ssbmdm", type: "upload", limit: 2 },
+  ],
+  [
+    { label: "体检报告", prop: "ssbmdm", type: "upload", limit: 1 },
+  ],
+  [
+    { label: "无犯罪记录证明", prop: "ssbmdm", type: "upload", limit: 1 },
+  ]
+])
+
+const rules = {
+  xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
+  sfzh: [{ required: true, message: "请输入证件号码", trigger: "change" }],
+  lxdh: [{ required: true, message: "请输入联系电话", trigger: "change" }],
+  jzdz: [{ required: true, message: "请输入居住地址", trigger: "change" }],
+  rzsj: [{ required: true, message: "请选择入职时间", trigger: "change" }],
+  pxgs: [{ required: true, message: "请选择所属保安公司", trigger: "change" }],
+}
+
+const formData = ref({})
+
+const close = () => {
+  dialogVisible.value = false
+}
+
+const open = (row = {}, type = 'add') => {
+  disabled.value = false
+  dialogVisible.value = true
+  formData.value = { ...row }
+  if (type === 'add') {
+    title.value = '新增申请人员'
+  } else if (type === 'upload') {
+    title.value = '上传资料'
+  } else {
+    disabled.value = true
+    title.value = '查看详情'
+  }
+}
+
+const save = () => {
+  FormRef.value.submit(() => {
+    loading.value = true;
+    const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
+    qcckPost(formData.value, url).then(() => {
+      loading.value = false;
+      proxy.$message.success("保存成功");
+      emits("refresh");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    })
+  });
+}
+
+defineExpose({ open })
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+
+.cntinfo{
+  height: calc(100% - 70px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.mapBox {
+  width: 100%;
+  height: 400px;
+  overflow: hidden;
+}
+</style>

src/views/Training/AnnualInspectionApplicants/components/selectTtaningDialog.vue

@@ -0,0 +1,77 @@
+<template>
+  <el-dialog class="dialogWerapper" width="30%" v-model="modelValue" :title="title" @close="handleClose">
+    <form-message ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" />
+
+    <template #footer>
+      <el-button type="primary" v-if="!disabled" :loading="loading" @click="handleSubmit">确定</el-button>
+      <el-button @click="handleClose">取消</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { computed, ref, reactive } from 'vue';
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const visible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const title = ref('选择培训公司')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+const formData = ref({})
+
+const formList = reactive([
+  [
+    { label: "培训公司", prop: "cj", type: "select" },
+  ],
+])
+
+const rules = {
+  cj: [{ required: true, message: "请输入考试成绩", trigger: "change" }],
+  jm: [{ required: true, message: "请输上传卷面", trigger: "change" }],
+}
+
+const open = (row = {}, type = 'updata') => {
+  FormRef.value?.reset()
+  visible.value = true
+  disabled.value = false
+  formData.value = { ...row }
+}
+
+const handleClose = () => {
+  visible.value = false
+}
+
+const handleSubmit = () => {
+  try {
+    loading.value = true
+    FormRef.value.submit(res => {
+      console.log(res)
+      visible.value = false
+    })
+  } catch (error) {
+    console.log(error)
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({ open })
+</script>

src/views/Training/AnnualInspectionApplicants/index.vue

@@ -151,4 +151,4 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
+</style>

src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue

@@ -1,9 +1,9 @@
 <template>
   <el-dialog class="dialogWerapper" v-model="modelValue" :title="title" @close="handleClose">
-    <form-message ref="FormRef" v-model="formData" :rules="rules" :formList="formList" />
+    <form-message ref="FormRef" :disabled="disabled" v-model="formData" :rules="rules" :formList="formList" />
 
     <template #footer>
-      <el-button type="primary" :loading="loading" @click="handleSubmit">确定</el-button>
+      <el-button type="primary" v-if="!disabled" :loading="loading" @click="handleSubmit">确定</el-button>
       <el-button @click="handleClose">取消</el-button>
     </template>
   </el-dialog>
@@ -14,10 +14,6 @@ import { computed, ref, reactive } from 'vue';
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 
 const props = defineProps({
-  title: {
-    type: String,
-    default: '上传成绩'
-  },
   modelValue: {
     type: Boolean,
     default: false
@@ -35,7 +31,9 @@ const visible = computed({
   }
 })
 
+const title = ref('上传成绩')
 const loading = ref(false)
+const disabled = ref(false)
 const FormRef = ref(null)
 const formData = ref({})
 
@@ -44,13 +42,26 @@ const formList = reactive([
     { label: "成绩", prop: "cj", type: "input" },
   ],
   [
-    { label: "卷面", prop: "ssbmdm", type: "upload", limit: 1 },
+    { label: "卷面", prop: "jm", type: "upload", limit: 1 },
   ],
 ])
 
 const rules = {
   cj: [{ required: true, message: "请输入考试成绩", trigger: "change" }],
-  sfzh: [{ required: true, message: "请输入证件号码", trigger: "change" }],
+  jm: [{ required: true, message: "请输上传卷面", trigger: "change" }],
+}
+
+const open = (row = {}, type = 'updata') => {
+  FormRef.value?.reset()
+  visible.value = true
+  disabled.value = false
+  formData.value = { ...row }
+  if (type === 'updata') {
+    title.value = '上传成绩'
+  } else {
+    disabled.value = true
+    title.value = '查看成绩'
+  }
 }
 
 const handleClose = () => {
@@ -70,14 +81,6 @@ const handleSubmit = () => {
     loading.value = false
   }
 }
-</script>
 
-<style lang="scss" scoped>
+defineExpose({ open })
-::v-deep {
+</script>
-  .dialogWerapper {
-    .el-dialog__header {
-      background: none !important;
-    }
-  }
-}
-</style>

src/views/securityManagement/examManagement/components/viewExamDetalis.vue

@@ -8,7 +8,8 @@
       </div>
     </div>
     <div class="cntinfo">
-      <el-descriptions column="2" border>
+      <template v-if="visible">
+        <el-descriptions column="2" border>
         <el-descriptions-item label="培训项目名称">{{ formData.xm }}</el-descriptions-item>
         <el-descriptions-item label="考试时间">{{ formData.sfzh }}</el-descriptions-item>
         <el-descriptions-item label="考试辖区">{{ formData.lxdh }}</el-descriptions-item>
@@ -16,6 +17,7 @@
         <el-descriptions-item label="监考民警">{{ formData.rzsj }}</el-descriptions-item>
         <el-descriptions-item label="考试方式">{{ formData.ssbmdm }}</el-descriptions-item>
       </el-descriptions>
+      </template>
 
       <!-- <el-descriptions title="考试人员" column="2" border class="mt20"> -->
       <div class="label">考试人员</div>
@@ -24,13 +26,16 @@
       >
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" @click="addEdit('updata', row)">上传成绩</el-link>
+          <el-link v-if="!visible">申请证件</el-link>
-          <el-link type="primary" @click="addEdit('view', row)">查看成绩</el-link>
+          <template v-else>
+            <el-link type="primary" @click="addEdit('updata', row)">上传成绩</el-link>
+            <el-link type="primary" @click="addEdit('view', row)">查看成绩</el-link>
+          </template>
         </template>
       </MyTable>
       <!-- </el-descriptions> -->
 
-      <view-and-upload-dialog v-model="viewAndUploadVisible" />
+      <view-and-upload-dialog ref="viewAndUploadRef" v-model="viewAndUploadVisible" />
     </div>
   </div>
 </template>
@@ -46,7 +51,9 @@ const title = ref('保安线下考试详情')
 const loading = ref(false)
 const disabled = ref(false)
 const FormRef = ref(null)
-const viewAndUploadVisible = ref(true)
+const visible = ref(true)
+const viewAndUploadRef = ref(null)
+const viewAndUploadVisible = ref(false)
 
 const props = defineProps({
   modelValue: {
@@ -104,13 +111,12 @@ const open = (row = {}, type = 'add') => {
   disabled.value = false
   dialogVisible.value = true
   formData.value = { ...row }
-  if (type === 'add') {
+  if (type === 'view') {
-    title.value = '新增从业人员'
+    title.value = '保安线下考试详情'
+    visible.value = true
   } else if (type === 'edit') {
-    title.value = '编辑从业人员'
+    title.value = '保安证申请'
-  } else {
+    visible.value = false
-    disabled.value = true
-    title.value = '查看详情'
   }
 }
 
@@ -129,6 +135,10 @@ const save = () => {
   });
 }
 
+const addEdit = (type, row) => {
+  viewAndUploadRef.value?.open(row, type)
+}
+
 defineExpose({ open })
 </script>
 

src/views/securityManagement/examManagement/index.vue

@@ -39,11 +39,10 @@ import Search from '@/components/aboutTable/Search.vue';
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import ViewExamDetalis from "./components/viewExamDetalis.vue";
-// import AddTrainerDialog from "./components/addTrainerDialog.vue";
 
 const trainerRef = ref(null);
 const queryFrom = ref({});
-const isVisible = ref(true);
+const isVisible = ref(false);
 const searchBox = ref(null);
 const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
@@ -62,7 +61,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [],
+  tableData: [{}],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -127,5 +126,9 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-
+::v-deep {
+  .el-dialog__header {
+    background: transparent !important;
+  }
+}
 </style>

src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="dialog" v-if="dialogVisible">
+    <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="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <el-descriptions column="2" border>
+        <el-descriptions-item label="培训项目名称">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="培训地址">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="详情地址">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="培训开始时间">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="培训结束时间">{{ formData.rzsj }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-descriptions column="2" border class="label">
+        <el-descriptions-item label="培训日期">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="培训时间">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="课程名称">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="组织单位">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="授课教员">{{ formData.rzsj }}</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="培训照片" :span="2"></el-descriptions-item>
+      </el-descriptions>
+
+      <!-- <el-descriptions title="考试人员" column="2" border class="mt20"> -->
+      <div class="label">培训保安人员</div>
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn"
+      :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+      >
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link type="warning" @click="addEdit('updata', row)">删除</el-link>
+        </template>
+      </MyTable>
+      <!-- </el-descriptions> -->
+
+      <!-- <view-and-upload-dialog ref="viewAndUploadRef" v-model="viewAndUploadVisible" /> -->
+    </div>
+  </div>
+</template>
+
+<script setup>
+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('保安培训项目详情')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+const visible = ref(true)
+const viewAndUploadRef = ref(null)
+const viewAndUploadVisible = ref(false)
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dic: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const dialogVisible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const pageData = reactive({
+  tableData: [{}],
+  keyCount: 0,
+  tableConfiger: {
+    haveControls: false,
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 10,
+    pageCurrent: 1
+  },
+  controlsWidth: 180,
+  tableColumn: [
+    { label: "姓名", prop: "xm" },
+    { label: "证件号码", prop: "sfzh" },
+    { label: "联系号码", prop: "lxdh" },
+    { label: "线上培训时长", prop: "sfzh" },
+    { label: "所属单位", prop: "lxdh" },
+  ]
+});
+
+const formData = ref({})
+
+const close = () => {
+  dialogVisible.value = false
+}
+
+const open = (row = {}, type = 'view') => {
+  disabled.value = false
+  dialogVisible.value = true
+  formData.value = { ...row }
+  if (type === 'view') {
+    title.value = '保安线下考试详情'
+    visible.value = true
+  } else if (type === 'edit') {
+    title.value = '保安证申请'
+    visible.value = false
+  }
+}
+
+const save = () => {
+  FormRef.value.submit(() => {
+    loading.value = true;
+    const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
+    qcckPost(formData.value, url).then(() => {
+      loading.value = false;
+      proxy.$message.success("保存成功");
+      emits("refresh");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    })
+  });
+}
+
+// const addEdit = (type, row) => {
+//   viewAndUploadRef.value?.open(row, type)
+// }
+
+defineExpose({ open })
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+
+.label {
+  margin-top: 20px;
+  color: #000;
+}
+
+.cntinfo {
+  padding: 2rem 12rem 0rem 12rem;
+  height: calc(100% - 70px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.mapBox {
+  width: 100%;
+  height: 400px;
+  overflow: hidden;
+}
+</style>

src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue

@@ -0,0 +1,158 @@
+<template>
+  <div class="dialog" v-if="dialogVisible">
+    <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="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <el-descriptions column="2" border>
+        <el-descriptions-item label="培训项目名称">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="考试时间">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="考试辖区">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="考试地址">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="监考民警">{{ formData.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="考试方式">{{ formData.ssbmdm }}</el-descriptions-item>
+      </el-descriptions>
+
+      <!-- <el-descriptions title="考试人员" column="2" border class="mt20"> -->
+      <div class="label">培训保安人员</div>
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn"
+      :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+      >
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link type="warning" @click="addEdit('updata', row)">删除</el-link>
+        </template>
+      </MyTable>
+      <!-- </el-descriptions> -->
+
+      <!-- <view-and-upload-dialog ref="viewAndUploadRef" v-model="viewAndUploadVisible" /> -->
+    </div>
+  </div>
+</template>
+
+<script setup>
+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('保安培训项目新增')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+const visible = ref(true)
+const viewAndUploadRef = ref(null)
+const viewAndUploadVisible = ref(false)
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dic: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const dialogVisible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const pageData = reactive({
+  tableData: [{}],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 10,
+    pageCurrent: 1
+  },
+  controlsWidth: 180,
+  tableColumn: [
+    { label: "姓名", prop: "xm" },
+    { label: "证件号码", prop: "sfzh" },
+    { label: "联系号码", prop: "lxdh" },
+    { label: "线上培训时长", prop: "sfzh" },
+    { label: "所属单位", prop: "lxdh" },
+  ]
+});
+
+const formData = ref({})
+
+const close = () => {
+  dialogVisible.value = false
+}
+
+const open = (row = {}, type = 'add') => {
+  disabled.value = false
+  dialogVisible.value = true
+  formData.value = { ...row }
+  if (type === 'view') {
+    title.value = '保安线下考试详情'
+    visible.value = true
+  } else if (type === 'edit') {
+    title.value = '保安证申请'
+    visible.value = false
+  }
+}
+
+const save = () => {
+  FormRef.value.submit(() => {
+    loading.value = true;
+    const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
+    qcckPost(formData.value, url).then(() => {
+      loading.value = false;
+      proxy.$message.success("保存成功");
+      emits("refresh");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    })
+  });
+}
+
+const addEdit = (type, row) => {
+  viewAndUploadRef.value?.open(row, type)
+}
+
+defineExpose({ open })
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+
+.label {
+  margin-top: 20px;
+  color: #000;
+}
+
+.cntinfo {
+  padding: 2rem 12rem 0rem 12rem;
+  height: calc(100% - 70px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.mapBox {
+  width: 100%;
+  height: 400px;
+  overflow: hidden;
+}
+</style>

src/views/securityManagement/trainingManagement/trainingProject/index.vue

@@ -27,7 +27,8 @@
       }"></Pages>
     </div>
 
-    <!-- <add-trainer-dialog v-model="isVisible" ref="trainerRef" @refresh="getList" /> -->
+    <view-project-details-dialog ref="viewProjectDetailsRef" v-model="isVisible" />
+    <preject-details-dialog ref="prejectDetailsRef" v-model="dialogVisible" />
   </div>
 </template>
 
@@ -38,11 +39,14 @@ import Pages from '@/components/aboutTable/Pages.vue';
 import Search from '@/components/aboutTable/Search.vue';
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
-// import AddTrainerDialog from "./components/addTrainerDialog.vue";
+import ViewProjectDetailsDialog from "./components/viewProjectDetailsDialog.vue";
+import PrejectDetailsDialog from "./components/prejectDetailsDialog.vue";
 
-const trainerRef = ref(null);
+const prejectDetailsRef = ref(null);
+const viewProjectDetailsRef = ref(null)
 const queryFrom = ref({});
 const isVisible = ref(false);
+const dialogVisible = ref(false)
 const searchBox = ref(null);
 const D_BZ_BXDLX = ref([]);
 const searchConfiger = ref([
@@ -61,7 +65,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [],
+  tableData: [{}],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -93,7 +97,11 @@ const tabHeightFn = () => {
 };
 
 const addEdit = (type, row) => {
-  trainerRef.value.open(row, type);
+  if (type === 'view') {
+    prejectDetailsRef.value.open(row, type);
+    return
+  }
+  viewProjectDetailsRef.value.open(row, type);
 };
 
 const onSearch = (value) => {

src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue

@@ -0,0 +1,157 @@
+<template>
+  <div class="dialog" v-if="dialogVisible">
+    <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="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <el-descriptions column="2" border>
+        <el-descriptions-item label="单位名称(营业执照登记名称)">{{ formData.xm }}</el-descriptions-item>
+        <el-descriptions-item label="统一社会信用代码">{{ formData.sfzh }}</el-descriptions-item>
+        <el-descriptions-item label="保安单位类型">{{ formData.lxdh }}</el-descriptions-item>
+        <el-descriptions-item label="场所名称">{{ formData.jzdz }}</el-descriptions-item>
+        <el-descriptions-item label="场所代码">{{ formData.rzsj }}</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="场所经营地址" :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-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>
+</template>
+
+<script setup>
+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('保安培训项目新增')
+const loading = ref(false)
+const disabled = ref(false)
+const FormRef = ref(null)
+const visible = ref(true)
+const viewAndUploadRef = ref(null)
+const viewAndUploadVisible = ref(false)
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dic: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emits = defineEmits(['update:modelValue'])
+
+const dialogVisible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emits('update:modelValue', val)
+  }
+})
+
+const pageData = reactive({
+  tableData: [{}],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 10,
+    pageCurrent: 1
+  },
+  controlsWidth: 180,
+  tableColumn: [
+    { label: "姓名", prop: "xm" },
+    { label: "证件号码", prop: "sfzh" },
+    { label: "联系号码", prop: "lxdh" },
+    { label: "线上培训时长", prop: "sfzh" },
+    { label: "所属单位", prop: "lxdh" },
+  ]
+});
+
+const formData = ref({})
+
+const close = () => {
+  dialogVisible.value = false
+}
+
+const open = (row = {}, type = 'add') => {
+  disabled.value = false
+  dialogVisible.value = true
+  formData.value = { ...row }
+  if (type === 'view') {
+    title.value = '保安线下考试详情'
+    visible.value = true
+  } else if (type === 'edit') {
+    title.value = '保安证申请'
+    visible.value = false
+  }
+}
+
+const save = () => {
+  FormRef.value.submit(() => {
+    loading.value = true;
+    const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
+    qcckPost(formData.value, url).then(() => {
+      loading.value = false;
+      proxy.$message.success("保存成功");
+      emits("refresh");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    })
+  });
+}
+
+const addEdit = (type, row) => {
+  viewAndUploadRef.value?.open(row, type)
+}
+
+defineExpose({ open })
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+
+.label {
+  margin-top: 20px;
+  color: #000;
+}
+
+.cntinfo {
+  padding: 2rem 12rem 0rem 12rem;
+  height: calc(100% - 70px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.mapBox {
+  width: 100%;
+  height: 400px;
+  overflow: hidden;
+}
+</style>

src/views/securityManagement/unitInformation/index.vue

@@ -40,6 +40,7 @@ import MyTable from '@/components/aboutTable/MyTable.vue';
 import Pages from '@/components/aboutTable/Pages.vue';
 import Search from '@/components/aboutTable/Search.vue';
 import PageTitle from '@/components/aboutTable/PageTitle.vue';
+import viewDetailsDialog from "./components/viewDetailsDialog.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 
 const searchBox = ref(null);
@@ -60,7 +61,7 @@ const searchConfiger = ref([
 ]);
 
 const pageData = reactive({
-  tableData: [],
+  tableData: [{}],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,