diff --git a/src/components/MyComponents/Department/index.vue b/src/components/MyComponents/Department/index.vue
index e1c1265..f5c1ff1 100644
--- a/src/components/MyComponents/Department/index.vue
+++ b/src/components/MyComponents/Department/index.vue
@@ -18,15 +18,7 @@
 <script setup>
 import { COMPONENT_WIDTH } from "@/constant";
 import { qcckPost, qcckGet, qcckFlvGet } from "@/api/qcckApi.js";
-import {
-  ref,
-  defineProps,
-  defineEmits,
-  defineExpose,
-  computed,
-  onMounted,
-  watch
-} from "vue";
+import { ref, defineProps, defineEmits, defineExpose, computed, onMounted, watch } from "vue";
 import { selectDeptPage } from "@/api/user-manage";
 const props = defineProps({
   //获取组件传值
diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue
index 02c4c5f..fa72e3d 100644
--- a/src/components/aboutTable/FormMessage.vue
+++ b/src/components/aboutTable/FormMessage.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="elform" :model="listQuery" :label-width="140" :rules="props.rules" :inline="true" label-position="right">
+  <el-form ref="elform" :model="listQuery" :label-width="props.labelWidth" :rules="props.rules" :inline="true" label-position="right">
     <el-form-item v-for="item in props.formList" :style="{ width: item.width }" :prop="item.prop" :label="item.label" :label-width="item.labelWidth"   :key="item">
       <!-- input表单 input-->
       <MOSTY.Other v-if="item.type == 'input'" width="100%" clearable v-model="listQuery[item.prop]" :placeholder="`请输入${item.label}`"/>
@@ -26,11 +26,11 @@
       </el-radio-group>
 
       <!-- 时间选择 -->
-      <el-time-picker v-else-if="item.type == 'time'" v-model="listQuery[item.prop]" placeholder="选择时间"/>
-      <el-date-picker v-else-if="item.type == 'date'" v-model="listQuery[item.prop]" type="date" value-format="YYYY-MM-DD" :placeholder="请选择时间"/>
-      <el-date-picker v-else-if="item.type == 'datetime'" v-model="listQuery[item.prop]" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="请选择时间"/>
-      <el-date-picker v-else-if="item.type == 'datetimerange'" v-model="listQuery[item.prop]" type="datetimerange" :shortcuts="shortcuts" range-separator="To" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="选择开始时间" end-placeholder="选择结束时间"/>
-      <el-date-picker v-else-if="item.type == 'daterange'" v-model="listQuery[item.prop]" type="daterange" range-separator="To" value-format="YYYY-MM-DD" start-placeholder="选择开始日期" end-placeholder="选择开始日期" />
+      <el-time-picker v-else-if="item.type == 'time'" v-model="listQuery[item.prop]" placeholder="选择时间" style="width:100%;" />
+      <el-date-picker v-else-if="item.type == 'date'" v-model="listQuery[item.prop]" type="date" value-format="YYYY-MM-DD" :placeholder="请选择时间" style="width:100%;" />
+      <el-date-picker v-else-if="item.type == 'datetime'" v-model="listQuery[item.prop]" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="请选择时间" style="width:100%;" />
+      <el-date-picker v-else-if="item.type == 'datetimerange'" v-model="listQuery[item.prop]" type="datetimerange" :shortcuts="shortcuts" range-separator="To" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="选择开始时间" end-placeholder="选择结束时间" style="width:100%;" />
+      <el-date-picker v-else-if="item.type == 'daterange'" v-model="listQuery[item.prop]" type="daterange" range-separator="To" value-format="YYYY-MM-DD" start-placeholder="选择开始日期" end-placeholder="选择开始日期" style="width:100%;" />
       
       <el-switch v-else-if="item.type == 'switch'" v-model="listQuery[item.prop]" class="ml-2" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"/>
       
@@ -53,6 +53,10 @@ const props = defineProps({
     default: {},
     type: Object
   },
+  labelWidth: {
+    default: "140px",
+    type: String
+  },
   modelValue: {
     type: Object,
     default: {}
diff --git a/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/components/detailForm.vue
index a678d33..fa8d35f 100644
--- a/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/components/detailForm.vue
@@ -1,161 +1,91 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">爆破事故登记{{ title }}</span>
+      <span class="title">爆破事故登记{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="爆破事故登记业务流水号">
-            <el-input v-model="listQuery.ywlsh" placeholder="请输入业务流水号"/>
-          </el-form-item>
-          <el-form-item label="发生时间">
-            <el-date-picker v-model="listQuery.fssj" type="datetime" style="width:100%" placeholder="请选择发生时间"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="民用爆炸物品发生环节">
-            <el-input v-model="listQuery.mybzwpfshj" placeholder="请输入发生环节"/>
-          </el-form-item>
-          <el-form-item label="事故发生地">
-            <el-input v-model="listQuery.sgfsd" placeholder="请输入事故发生地"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="死亡人数">
-            <el-input-number v-model="listQuery.swrs" :min="0" style="width:100%;" placeholder="请输入死亡人数"/>
-          </el-form-item>
-          <el-form-item label="受伤人数">
-            <el-input-number v-model="listQuery.ssrs" :min="0" style="width:100%;" placeholder="请输入受伤人数"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="损失价值（人民币万元）">
-            <el-input-number v-model="listQuery.ssjz" :min="0" style="width:100%;" :precision="2" placeholder="请输入损失价值"/>
-          </el-form-item>
-          <el-form-item label="民用爆炸物品爆炸事故原因">
-            <el-input v-model="listQuery.mybzwpbzsgyy" placeholder="请输入事故原因"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="民用爆炸物品爆炸事故发生区域">
-            <el-input v-model="listQuery.mybzwpbzsgfsqy" placeholder="请输入事故发生区域"/>
-          </el-form-item>
-          <el-form-item label="民用爆炸物品爆炸事故性质">
-            <el-input v-model="listQuery.mybzwpbzsgxz" placeholder="请输入事故性质"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记人姓名">
-            <el-input v-model="listQuery.djrxm" placeholder="请输入登记人姓名"/>
-          </el-form-item>
-          <el-form-item label="登记单位名称">
-            <el-input v-model="listQuery.djdwmc" placeholder="请输入登记单位名称"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="发生场所部位详细情况">
-            <el-input type="textarea" v-model="listQuery.fscsxq" :rows="3" placeholder="请输入详细情况"/>
-          </el-form-item>
-        </div>
-
-
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" labelWidth="220px" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "爆破事故登记业务流水号", prop: "ywlsh",  type: "input",width: "48%" },
+  { label: "发生时间", prop: "ssxq", type: "datetime", width: "48%"},
+  { label: "民用爆炸物品发生环节", prop: "mybzwpfshj",  type: "input",width: "48%" },
+  { label: "事故发生地", prop: "sgfsd",  type: "input",width: "48%" },
+  { label: "死亡人数", prop: "swrs",  type: "number" ,width: "48%"},
+  { label: "受伤人数", prop: "ssrs",  type: "number" ,width: "48%"},
+  { label: "损失价值（人民币万元）", prop: "ssjz",  type: "number",width: "48%" },
+  { label: "民用爆炸物品爆炸事故原因", prop: "mybzwpbzsgyy",  type: "textarea" ,width: "100%"},
+  { label: "民用爆炸物品爆炸事故发生区域", prop: "mybzwpbzsgfsqy",  type: "input",width: "48%" },
+  { label: "民用爆炸物品爆炸事故性质", prop: "mybzwpbzsgxz",  type: "input",width: "48%" },
+  { label: "登记人姓名", prop: "djrxm",  type: "input",width: "48%" },
+  { label: "登记单位名称", prop: "djdwmc",  type: "input",width: "48%" },
+  { label: "发生场所部位详细情况", prop: "djdwmc",  type: "textarea" ,width: "100%"  },
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-    .image-group {
-      display: flex;
-      gap: 10px;
-      flex-wrap: wrap;
-    
-      .image-item {
-        width: 150px;
-        height: 150px;
-        border: 1px solid #dcdfe6;
-        
-        .el-image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/index.vue b/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/index.vue
index 2d30c92..aee4f12 100644
--- a/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/BlastingAccidents/index.vue
@@ -42,9 +42,9 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" @click="delDictItem([row.id])" type="danger">删除</el-button >
+          <el-link size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" link @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" @click="delDictItem([row.id])" type="danger">删除</el-link >
         </template>
       </MyTable>
       <Pages
@@ -118,7 +118,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 80,
+  controlsWidth: 180,
   tableColumn: [
     { label: "爆破事故登记业务流水号", prop: "flowNumber" },
     { label: "发生时间", prop: "accidentTime" },
diff --git a/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/components/detailForm.vue
index 63a0b5e..a699731 100644
--- a/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/components/detailForm.vue
@@ -6,121 +6,61 @@
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="爆破作业项目业务流水号">
-            <el-input v-model="listQuery.ywlsh" placeholder="请输入业务流水号"/>
-          </el-form-item>
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.xzqh" placeholder="请输入行政区划"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="项目名称">
-            <el-input v-model="listQuery.xmmc" placeholder="请输入项目名称"/>
-          </el-form-item>
-          <el-form-item label="项目级别">
-            <el-input v-model="listQuery.xmjb" placeholder="请输入项目级别"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="委托单位名称">
-            <el-input v-model="listQuery.wtdwmc" placeholder="请输入委托单位名称"/>
-          </el-form-item>
-          <el-form-item label="作业开始时间">
-            <el-date-picker v-model="listQuery.zyksrq" type="datetime" style="width:100%" placeholder="请选择作业开始时间"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="作业结束时间">
-            <el-date-picker v-model="listQuery.zyjsrq" type="datetime" style="width:100%" placeholder="请选择作业结束时间"/>
-          </el-form-item>
-          <el-form-item label="设计施工单位">
-            <el-input v-model="listQuery.sjsgdw" placeholder="请输入设计施工单位"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="安全评估单位">
-            <el-input v-model="listQuery.aqpgdw" placeholder="请输入安全评估单位"/>
-          </el-form-item>
-          <el-form-item label="安全监理单位">
-            <el-input v-model="listQuery.aqjldw" placeholder="请输入安全监理单位"/>
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" labelWidth="180px"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "爆破作业项目业务流水号", prop: "ywlsh",  type: "input",width: "30%"  },
+  { label: "行政区划", prop: "xzqh", type: "input",width: "30%" },
+  { label: "项目名称", prop: "xmmc",  type: "input",width: "30%"},
+  { label: "项目级别", prop: "xmjb",  type: "input",width: "30%"},
+  { label: "委托单位名称", prop: "wtdwmc",  type: "input",width: "30%"},
+  { label: "作业开始时间", prop: "zyksrq",  type: "datetime",width: "30%"},
+  { label: "作业结束时间", prop: "zyjsrq",  type: "datetime",width: "30%"},
+  { label: "设计施工单位", prop: "sjsgdw",  type: "input",width: "30%" },
+  { label: "安全评估单位", prop: "aqpgdw",  type: "input",width: "30%" },
+  { label: "安全监理单位", prop: "aqjldw",  type: "input",width: "30%" },
+]);
+const listQuery = ref({}); //表单
+const elform = ref();
 
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    listQuery.value = { ...row };
-  } else {
-    listQuery.value = {};
-  }
+  if (row) getDataById(row.id);
 };
-
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
+};
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/index.vue b/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/index.vue
index fd50ddd..da4cdb0 100644
--- a/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/BlastingOperations/index.vue
@@ -5,7 +5,11 @@
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      />
     </div>
     <!-- 表格 -->
     <div class="tabBox">
@@ -29,8 +33,8 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button type="primary" link @click="addEdit('detail', row)"
-            >详情</el-button
+          <el-link type="primary" link @click="addEdit('detail', row)"
+            >详情</el-link
           >
         </template>
       </MyTable>
diff --git a/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/components/detailForm.vue
index 4ff5332..4741ad7 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/components/detailForm.vue
@@ -1,122 +1,85 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">爆炸事故单位信息{{ title }}</span>
+      <span class="title">爆炸事故单位信息{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.xzqh" placeholder="请输入行政区划"/>
-          </el-form-item>
-          <el-form-item label="事故业务流水号码">
-            <el-input v-model="listQuery.ywlsh" placeholder="请输入事故业务流水号码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记日期">
-            <el-date-picker v-model="listQuery.djrq" type="date" style="width:100%" placeholder="请选择登记日期"/>
-          </el-form-item>
-          <el-form-item label="单位编号_顺序号">
-            <el-input v-model="listQuery.dwbh" placeholder="请输入单位编号_顺序号"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="单位名称">
-            <el-input v-model="listQuery.dwmc" placeholder="请输入单位名称"/>
-          </el-form-item>
-          <el-form-item label="单位地址">
-            <el-input v-model="listQuery.dwdz" placeholder="请输入单位地址"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="处理详细情况" label-width="230">
-            <el-input
-              type="textarea"
-              v-model="listQuery.clxxqk"
-              :rows="4"
-              placeholder="请输入处理详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "行政区划", prop: "xzqh",  type: "input" },
+  { label: "事故业务流水号码", prop: "ywlsh",  type: "input" },
+  { label: "登记日期", prop: "djrq", type: "date",},
+  { label: "单位编号_顺序号", prop: "dwbh",  type: "input" },
+  { label: "单位名称", prop: "dwmc",  type: "input" },
+  { label: "单位地址", prop: "dwdz",  type: "input" },
+  { label: "处理详细情况", prop: "clxxqk",  type: "textarea" ,width: "100%"},
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/index.vue b/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/index.vue
index d25004d..822ff0f 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ExplosionAccidents/index.vue
@@ -34,9 +34,9 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" @click="delDictItem([row.id])" type="danger">删除</el-button >
+          <el-link size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" link @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" @click="delDictItem([row.id])" type="danger">删除</el-link >
         </template>
       </MyTable>
       <Pages
@@ -136,7 +136,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 80,
+  controlsWidth: 180,
   tableColumn: [
     { label: "单位名称", prop: "unitName" },
     { label: "行政区划", prop: "administrativeArea" },
diff --git a/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/components/detailForm.vue
index 24c0573..3b9e191 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/components/detailForm.vue
@@ -1,75 +1,15 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">图片详情</span>
+      <span class="title">涉爆从业单位管理详情</span>
       <div>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
+    <div class="form_cnt">
       <el-tabs v-model="activeName">
         <el-tab-pane label="图片基本信息" name="first">
-          <el-form :model="listQuery" :label-width="230" label-position="left">
-            <div class="form-row">
-              <el-form-item label="图片名称">
-                <el-input v-model="listQuery.imageName" disabled/>
-              </el-form-item>
-              <el-form-item label="图片类型">
-                <el-input v-model="listQuery.imageType" disabled/>
-              </el-form-item>
-            </div>
-
-            <div class="form-row">
-              <el-form-item label="上传时间">
-                <el-input v-model="listQuery.uploadTime" disabled/>
-              </el-form-item>
-              <el-form-item label="文件大小">
-                <el-input v-model="listQuery.fileSize" disabled/>
-              </el-form-item>
-            </div>
-
-            <div class="form-row">
-              <el-form-item label="图片分辨率">
-                <el-input v-model="listQuery.resolution" disabled/>
-              </el-form-item>
-              <el-form-item label="图片格式">
-                <el-input v-model="listQuery.format" disabled/>
-              </el-form-item>
-            </div>
-
-            <div class="form-row">
-              <el-form-item label="拍摄设备">
-                <el-input v-model="listQuery.device" disabled/>
-              </el-form-item>
-              <el-form-item label="拍摄时间">
-                <el-input v-model="listQuery.shootTime" disabled/>
-              </el-form-item>
-            </div>
-
-            <div class="form-row">
-              <el-form-item label="拍摄地点">
-                <el-input v-model="listQuery.location" disabled/>
-              </el-form-item>
-              <el-form-item label="图片标签">
-                <el-input v-model="listQuery.tags" disabled/>
-              </el-form-item>
-            </div>
-
-            <div class="form-row">
-              <el-form-item label="图片描述" :label-width="460">
-                <el-input type="textarea" v-model="listQuery.description" disabled rows="3"/>
-              </el-form-item>
-            </div>
-
-            <div class="form-row">
-              <el-form-item label="图片预览" :label-width="460">
-                <div class="image-preview">
-                  <img :src="listQuery.imageUrl" alt="图片预览" v-if="listQuery.imageUrl"/>
-                  <div class="no-image" v-else>暂无图片</div>
-                </div>
-              </el-form-item>
-            </div>
-          </el-form>
+          <FormMessage :formList="formData" ref="elform"></FormMessage>
         </el-tab-pane>
         <el-tab-pane label="图片处理记录" name="second">图片处理记录</el-tab-pane>
         <el-tab-pane label="使用历史" name="third">使用历史</el-tab-pane>
@@ -79,92 +19,60 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
 const activeName = ref('first');
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "图片名称", prop: "imageName",  type: "input" },
+  { label: "图片类型", prop: "imageType",  type: "input" },
+  { label: "上传时间", prop: "uploadTime", type: "date",},
+  { label: "文件大小", prop: "fileSize",  type: "input" },
+  { label: "图片分辨率", prop: "resolution",  type: "input" },
+  { label: "图片格式", prop: "format",  type: "input" },
+  { label: "拍摄设备", prop: "device",  type: "input" },
+  { label: "拍摄时间", prop: "shootTime",  type: "date" },
+  { label: "拍摄地点", prop: "location",  type: "input" },
+  { label: "图片标签", prop: "tags",  type: "input" },
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const elform = ref();
+const title = ref("");
 
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    listQuery.value = { ...row };
-  } else {
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-  .image-preview {
-    width: 100%;
-    min-height: 300px;
-    border: 1px solid #E3E7ED;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    
-    img {
-      max-width: 100%;
-      max-height: 500px;
-      object-fit: contain;
-    }
-    
-    .no-image {
-      color: #999;
-      font-size: 14px;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/index.vue b/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/index.vue
index 901f922..53ca661 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ExplosivesRelated/index.vue
@@ -20,8 +20,8 @@
       >
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button type="primary" link @click="addEdit('detail', row)"
-            >详情</el-button
+          <el-link type="primary" @click="addEdit('detail', row)"
+            >详情</el-link
           >
         </template>
       </MyTable>
diff --git a/src/views/backOfficeSystem/CivilExplosives/Illegal/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/Illegal/components/detailForm.vue
index fb211c9..12f4088 100644
--- a/src/views/backOfficeSystem/CivilExplosives/Illegal/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/Illegal/components/detailForm.vue
@@ -1,126 +1,84 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">涉爆违章项目信息{{ title }}</span>
+      <span class="title">涉爆违章项目信息{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.xzqh" placeholder="请输入行政区划"/>
-          </el-form-item>
-          <el-form-item label="统一社会信用代码">
-            <el-input v-model="listQuery.tyshxydm" placeholder="请输入统一社会信用代码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记日期">
-            <el-date-picker v-model="listQuery.djrq" type="date" style="width:100%" placeholder="请选择登记日期"/>
-          </el-form-item>
-          <el-form-item label="顺序号">
-            <el-input v-model="listQuery.sxh" placeholder="请输入顺序号"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="主要内容顺序号">
-            <el-input v-model="listQuery.zynrsxh" placeholder="请输入主要内容顺序号"/>
-          </el-form-item>
-          <el-form-item label="违章登记日期">
-            <el-date-picker v-model="listQuery.wzdjrq" type="date" style="width:100%" placeholder="请选择违章登记日期"/>
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "行政区划", prop: "xzqh",  type: "input" },
+  { label: "统一社会信用代码", prop: "tyshxydm",  type: "input" },
+  { label: "登记日期", prop: "djrq", type: "date",},
+  { label: "顺序号", prop: "dwbh",  type: "input" },
+  { label: "主要内容顺序号", prop: "dwmc",  type: "input" },
+  { label: "违章登记日期", prop: "dwdz",  type: "date" },
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-    .image-group {
-      display: flex;
-      gap: 10px;
-      flex-wrap: wrap;
-    
-      .image-item {
-        width: 150px;
-        height: 150px;
-        border: 1px solid #dcdfe6;
-        
-        .el-image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/Illegal/index.vue b/src/views/backOfficeSystem/CivilExplosives/Illegal/index.vue
index a1b8e89..afdfca9 100644
--- a/src/views/backOfficeSystem/CivilExplosives/Illegal/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/Illegal/index.vue
@@ -42,9 +42,9 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" @click="delDictItem([row.id])" type="danger">删除</el-button >
+          <el-link size="small" type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" @click="delDictItem([row.id])" type="danger">删除</el-link >
         </template>
       </MyTable>
       <Pages
diff --git a/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/components/detailForm.vue
index 1acf5b9..032db85 100644
--- a/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/components/detailForm.vue
@@ -1,218 +1,102 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">涉爆重点人员{{ title }}</span>
+      <span class="title">涉爆重点人员{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="业务流水号">
-            <el-input v-model="listQuery.ywlsh" placeholder="请输入业务流水号"/>
-          </el-form-item>
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.xzqh" placeholder="请输入行政区划"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="单位名称">
-            <el-input v-model="listQuery.dwmc" placeholder="请输入单位名称"/>
-          </el-form-item>
-          <el-form-item label="姓名">
-            <el-input v-model="listQuery.xm" placeholder="请输入姓名"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="别名">
-            <el-input v-model="listQuery.bm" placeholder="请输入别名"/>
-          </el-form-item>
-          <el-form-item label="性别">
-            <el-select v-model="listQuery.xb" placeholder="请选择性别" style="width:100%">
-              <el-option label="男" value="男"/>
-              <el-option label="女" value="女"/>
-            </el-select>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="出生日期">
-            <el-date-picker v-model="listQuery.csrq" type="date" style="width:100%" placeholder="请选择出生日期"/>
-          </el-form-item>
-          <el-form-item label="民族">
-            <el-input v-model="listQuery.mz" placeholder="请输入民族"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="文化程度">
-            <el-input v-model="listQuery.whcd" placeholder="请输入文化程度"/>
-          </el-form-item>
-          <el-form-item label="职业">
-            <el-input v-model="listQuery.zy" placeholder="请输入职业"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="身份证号">
-            <el-input v-model="listQuery.sfzh" placeholder="请输入身份证号"/>
-          </el-form-item>
-          <el-form-item label="户籍地址">
-            <el-input v-model="listQuery.hjdz" placeholder="请输入户籍地址"/>
-          </el-form-item>
-        </div>
-        <div class="form-row">
-          <el-form-item label="居住地址">
-            <el-input v-model="listQuery.jzdz" placeholder="请输入居住地址"/>
-          </el-form-item>
-          <el-form-item label="身高">
-            <el-input v-model="listQuery.sg" placeholder="请输入身高"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="口音">
-            <el-input v-model="listQuery.ky" placeholder="请输入口音"/>
-          </el-form-item>
-          <el-form-item label="移动电话">
-            <el-input v-model="listQuery.yddh" placeholder="请输入移动电话"/>
-          </el-form-item>
-        </div>
-
-       
-
-        <div class="form-row">
-          <el-form-item label="重点人员体貌特征">
-            <el-input v-model="listQuery.zdrytz" placeholder="请输入体貌特征"/>
-          </el-form-item>
-          <el-form-item label="列管依据_详细情况">
-            <el-input v-model="listQuery.lgyj" placeholder="请输入列管依据"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="列管日期">
-            <el-date-picker v-model="listQuery.lgrq" type="date" style="width:100%" placeholder="请选择列管日期"/>
-          </el-form-item>
-          <el-form-item label="填报人姓名">
-            <el-input v-model="listQuery.tbrxm" placeholder="请输入填报人姓名"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="填报日期">
-            <el-date-picker v-model="listQuery.tbrq" type="date" style="width:100%" placeholder="请选择填报日期"/>
-          </el-form-item>
-          <el-form-item label="填报单位名称">
-            <el-input v-model="listQuery.tbdwmc" placeholder="请输入填报单位名称"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="备注">
-            <el-input type="textarea" v-model="listQuery.bz" :rows="3" placeholder="请输入备注"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="照片">
-            <div class="image-group">
-              <div v-for="(url, index) in listQuery.photos" :key="index" class="image-item">
-                <el-image :src="url" fit="cover"/>
-              </div>
-            </div>
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "业务流水号", prop: "ywlsh",  type: "input" },
+  { label: "行政区划", prop: "xzqh",  type: "input" },
+  { label: "单位名称", prop: "dwmc",  type: "input" },
+  { label: "姓名", prop: "xm",  type: "input" },
+  { label: "别名", prop: "bm",  type: "input" },
+  { label: "性别", prop: "xb",  type: "select",options: [{ label: "男", value: "1" }, { label: "女", value: "2" }]  },
+  { label: "出生日期", prop: "csrq", type: "date",},
+  { label: "民族", prop: "mz",  type: "input" },
+  { label: "文化程度", prop: "whcd",  type: "input" },
+  { label: "职业", prop: "zy",  type: "input" },
+  { label: "身份证号", prop: "sfzh",  type: "input" },
+  { label: "户籍地址", prop: "hjdz",  type: "input" },
+  { label: "居住地址", prop: "jzdz",  type: "input" },
+  { label: "身高", prop: "sg",  type: "input" },
+  { label: "口音", prop: "ky",  type: "input" },
+  { label: "移动电话", prop: "yddh",  type: "input" },
+  { label: "重点人员体貌特征", prop: "zdrytz",  type: "input" },
+  { label: "列管依据_详细情况", prop: "lgyj",  type: "input" },
+  { label: "列管日期", prop: "lgrq",  type: "date" },
+  { label: "填报人姓名", prop: "tbrxm",  type: "input" },
+  { label: "填报日期", prop: "tbrq",  type: "date" },
+  { label: "填报单位名称", prop: "tbdwmc",  type: "input" },
+  { label: "备注", prop: "bz",  type: "textarea",width: '100%'   },
+  { label: "照片", prop: "zp",  type: "upload",width: '100%'   },
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-    .image-group {
-      display: flex;
-      gap: 10px;
-      flex-wrap: wrap;
-    
-      .image-item {
-        width: 150px;
-        height: 150px;
-        border: 1px solid #dcdfe6;
-        
-        .el-image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/index.vue b/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/index.vue
index aeb8154..5b3c0c8 100644
--- a/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/KeyPersonnel/index.vue
@@ -46,22 +46,20 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button
+          <el-link
             size="small"
             type="primary"
-            link
             @click="addEdit('edit', row)"
-            >编辑</el-button
+            >编辑</el-link
           >
-          <el-button
+          <el-link
             size="small"
             type="primary"
-            link
             @click="addEdit('detail', row)"
-            >详情</el-button
+            >详情</el-link
           >
-          <el-button size="small" @click="delDictItem([row.id])" type="danger"
-            >删除</el-button
+          <el-link size="small" @click="delDictItem([row.id])" type="danger"
+            >删除</el-link
           >
         </template>
       </MyTable>
diff --git a/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/components/detailForm.vue
index 16258c6..3a4851c 100644
--- a/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/components/detailForm.vue
@@ -1,134 +1,87 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">爆炸事故人员信息{{ title }}</span>
+      <span class="title">爆炸事故人员信息{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.xzqh" placeholder="请输入行政区划"/>
-          </el-form-item>
-          <el-form-item label="事故业务流水号码">
-            <el-input v-model="listQuery.ywlsh" placeholder="请输入事故业务流水号码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记日期">
-            <el-date-picker v-model="listQuery.djrq" type="date" style="width:100%" placeholder="请选择登记日期"/>
-          </el-form-item>
-          <el-form-item label="人员顺序号">
-            <el-input v-model="listQuery.ryxh" placeholder="请输入人员顺序号"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="姓名">
-            <el-input v-model="listQuery.xm" placeholder="请输入姓名"/>
-          </el-form-item>
-          <el-form-item label="性别">
-            <el-select v-model="listQuery.xb" placeholder="请选择性别" style="width:100%">
-              <el-option label="男" value="男"/>
-              <el-option label="女" value="女"/>
-            </el-select>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="年龄">
-            <el-input-number v-model="listQuery.nl" :min="0" style="width:100%" placeholder="请输入年龄"/>
-          </el-form-item>
-          <el-form-item label="公民身份证号码">
-            <el-input v-model="listQuery.sfzh" placeholder="请输入公民身份证号码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="处理详细情况" label-width="230">
-            <el-input
-              type="textarea"
-              v-model="listQuery.clxxqk"
-              :rows="4"
-              placeholder="请输入处理详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "行政区划", prop: "xzqh",  type: "input" },
+  { label: "事故业务流水号码", prop: "ywlsh",  type: "input" },
+  { label: "登记日期", prop: "djrq", type: "date",},
+  { label: "人员顺序号", prop: "ryxh",  type: "input" },
+  { label: "姓名", prop: "xm",  type: "input" },
+  { label: "性别", prop: "xb",  type: "select",options: [{ label: "男", value: "1" }, { label: "女", value: "2" }] },
+  { label: "年龄", prop: "nl",  type: "input" },
+  { label: "公民身份证号码", prop: "sfzh",  type: "input" },
+  { label: "处理详细情况", prop: "clxxqk",  type: "textarea" ,width: "100%"},
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  xm: [{ required: true, message: "请输入姓名", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/index.vue b/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/index.vue
index 285fdd2..682590a 100644
--- a/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/PersonnelInformation/index.vue
@@ -34,9 +34,9 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" @click="delDictItem([row.id])" type="danger">删除</el-button >
+          <el-link size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" link @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" @click="delDictItem([row.id])" type="danger">删除</el-link >
         </template>
       </MyTable>
       <Pages
@@ -136,7 +136,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 80,
+  controlsWidth: 180,
   tableColumn: [
     { label: "姓名", prop: "name" },
     { label: "事故业务流水号码", prop: "accidentSerialNumber" },
diff --git a/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/components/detailForm.vue
index ed34a94..4796e5d 100644
--- a/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/components/detailForm.vue
@@ -1,173 +1,94 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">停产停业信息{{ title }}</span>
+      <span class="title">停产停业信息{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="停产停业业务流水号">
-            <el-input v-model="listQuery.ywlsh" placeholder="请输入停产停业业务流水号"/>
-          </el-form-item>
-          <el-form-item label="统一社会信用代码">
-            <el-input v-model="listQuery.tyshxydm" placeholder="请输入统一社会信用代码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="检查人姓名">
-            <el-input v-model="listQuery.jcrxm" placeholder="请输入检查人姓名"/>
-          </el-form-item>
-          <el-form-item label="填发人姓名">
-            <el-input v-model="listQuery.tfrxm" placeholder="请输入填发人姓名"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="批准人姓名">
-            <el-input v-model="listQuery.pzrxm" placeholder="请输入批准人姓名"/>
-          </el-form-item>
-          <el-form-item label="批准文件证件号码">
-            <el-input v-model="listQuery.pzwjzjhm" placeholder="请输入批准文件证件号码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="被通知人姓名">
-            <el-input v-model="listQuery.btzrxm" placeholder="请输入被通知人姓名"/>
-          </el-form-item>
-          <el-form-item label="填发时间">
-            <el-date-picker v-model="listQuery.tfsj" type="datetime" style="width:100%" placeholder="请选择填发时间"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记人姓名">
-            <el-input v-model="listQuery.djrxm" placeholder="请输入登记人姓名"/>
-          </el-form-item>
-          <el-form-item label="登记单位名称">
-            <el-input v-model="listQuery.djdwmc" placeholder="请输入登记单位名称"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="受理行政区划单位名称">
-            <el-input v-model="listQuery.slxzqhdwmc" placeholder="请输入受理行政区划单位名称"/>
-          </el-form-item>
-          <el-form-item label="办案单位名称">
-            <el-input v-model="listQuery.badwmc" placeholder="请输入办案单位名称"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="具体修正项目详细情况">
-            <el-input
-              type="textarea"
-              v-model="listQuery.jtxzxmxxqk"
-              :rows="4"
-              placeholder="请输入具体修正项目详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="执法依据详细情况">
-            <el-input
-              type="textarea"
-              v-model="listQuery.zfyjxxqk"
-              :rows="4"
-              placeholder="请输入执法依据详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="违法犯罪经历描述">
-            <el-input
-              type="textarea"
-              v-model="listQuery.wffzjlms"
-              :rows="4"
-              placeholder="请输入违法犯罪经历描述"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" labelWidth="160px" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "停产停业业务流水号", prop: "ywlsh",  type: "input" },
+  { label: "统一社会信用代码", prop: "xzqh",  type: "input" },
+  { label: "检查人姓名", prop: "jcrxm",  type: "input" },
+  { label: "填发人姓名", prop: "tfrxm",  type: "input" },
+  { label: "批准人姓名", prop: "pzrxm",  type: "input" },
+  { label: "批准文件证件号码", prop: "pzwjzjhm",  type: "input" },
+  { label: "被通知人姓名", prop: "btzrxm",  type: "input" },
+  { label: "填发时间", prop: "tfsj",  type: "datetime" },
+  { label: "登记人姓名", prop: "djrxm",  type: "input" },
+  { label: "登记单位名称", prop: "djdwmc",  type: "input" },
+  { label: "受理行政区划单位名称", prop: "slxzqhdwmc",  type: "input" },
+  { label: "办案单位名称", prop: "badwmc",  type: "input" },
+  { label: "具体修正项目详细情况", prop: "jtxzxmxxqk",  type: "textarea",width: '100%'   },
+  { label: "执法依据详细情况", prop: "zfyjxxqk",  type: "textarea" ,width: '100%'},
+  { label: "违法犯罪经历描述", prop: "wffzjlms",  type: "textarea" ,width: '100%'},
 
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/index.vue b/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/index.vue
index ccf492f..9f2d104 100644
--- a/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/SuspensionInfo/index.vue
@@ -25,9 +25,9 @@
       >
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" type="primary" link>详细</el-button>
+          <el-link size="small" type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" type="primary">详细</el-link>
         </template>
       </MyTable>
       <Pages
@@ -132,7 +132,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 180,
   tableColumn: [
     { label: "停产停业业务流水号", prop: "suspensionSerialNumber" },
     { label: "受理行政区划单位名称", prop: "administrativeUnit" },
diff --git a/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/components/detailForm.vue
index 9b7b9e4..a4c8c57 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/components/detailForm.vue
@@ -1,165 +1,92 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">违章人员信息{{ title }}</span>
+      <span class="title">违章人员信息{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.administrativeArea" placeholder="请输入行政区划"/>
-          </el-form-item>
-          <el-form-item label="统一社会信用代码">
-            <el-input v-model="listQuery.socialCreditCode" placeholder="请输入统一社会信用代码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记日期">
-            <el-date-picker v-model="listQuery.registrationDate" type="date" style="width:100%" placeholder="请选择登记日期"/>
-          </el-form-item>
-          <el-form-item label="顺序号">
-            <el-input v-model="listQuery.sequenceNumber" placeholder="请输入顺序号"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="人员顺序号">
-            <el-input v-model="listQuery.personSequenceNumber" placeholder="请输入人员顺序号"/>
-          </el-form-item>
-          <el-form-item label="姓名">
-            <el-input v-model="listQuery.name" placeholder="请输入姓名"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="性别">
-            <el-select v-model="listQuery.gender" placeholder="请选择性别" style="width:100%">
-              <el-option label="男" value="男"/>
-              <el-option label="女" value="女"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="年龄">
-            <el-input-number v-model="listQuery.age" :min="0" style="width:100%" placeholder="请输入年龄"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="身份证号码">
-            <el-input v-model="listQuery.idNumber" placeholder="请输入身份证号码"/>
-          </el-form-item>
-          <el-form-item label="联系电话">
-            <el-input v-model="listQuery.phoneNumber" placeholder="请输入联系电话"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="批准人姓名">
-            <el-input v-model="listQuery.approverName" placeholder="请输入批准人姓名"/>
-          </el-form-item>
-          <el-form-item label="经办人姓名">
-            <el-input v-model="listQuery.handlerName" placeholder="请输入经办人姓名"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="违章详细情况">
-            <el-input
-              type="textarea"
-              v-model="listQuery.violationDetails"
-              :rows="4"
-              placeholder="请输入违章详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="处理详细情况">
-            <el-input
-              type="textarea"
-              v-model="listQuery.processingDetails"
-              :rows="4"
-              placeholder="请输入处理详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
-
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "行政区划", prop: "administrativeArea",  type: "input" },
+  { label: "统一社会信用代码", prop: "socialCreditCode",  type: "input" },
+  { label: "登记日期", prop: "registrationDate",  type: "date" },
+  { label: "顺序号", prop: "sequenceNumber",  type: "input" },
+  { label: "人员顺序号", prop: "personSequenceNumber",  type: "number" },
+  { label: "姓名", prop: "name",  type: "input" },
+  { label: "性别", prop: "gender",  type: "select",options: [{value: '男', label: '男'},{value: '女', label: '女'}]  },
+  { label: "年龄", prop: "age",  type: "number" },
+  { label: "身份证号码", prop: "idNumber",  type: "input" },
+  { label: "联系电话", prop: "phoneNumber",  type: "input" },
+  { label: "批准人姓名", prop: "approverName",  type: "input" },
+  { label: "经办人姓名", prop: "handlerName",  type: "input" },
+  { label: "违章详细情况", prop: "violationDetails",  type: "textarea",width: '100%'   },
+  { label: "处理详细情况", prop: "processingDetails",  type: "textarea" ,width: '100%'},
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/index.vue b/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/index.vue
index 54c8893..076f5e5 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ViolationPersonnel/index.vue
@@ -25,9 +25,9 @@
       >
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" type="primary" link>详细</el-button>
+          <el-link size="small" type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" type="primary">详细</el-link>
         </template>
       </MyTable>
       <Pages
@@ -101,7 +101,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 180,
   tableColumn: [
     { label: "违章人姓名", prop: "violatorName" },
     { label: "统一社会信用代码", prop: "socialCreditCode" },
diff --git a/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/components/detailForm.vue b/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/components/detailForm.vue
index d9d109e..28aec6b 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/components/detailForm.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/components/detailForm.vue
@@ -1,141 +1,87 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">违章登记信息{{ title }}</span>
+      <span class="title">违章登记信息{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="行政区划">
-            <el-input v-model="listQuery.administrativeArea" placeholder="请输入行政区划"/>
-          </el-form-item>
-          <el-form-item label="统一社会信用代码">
-            <el-input v-model="listQuery.socialCreditCode" placeholder="请输入统一社会信用代码"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记日期">
-            <el-date-picker v-model="listQuery.registrationDate" type="date" style="width:100%" placeholder="请选择登记日期"/>
-          </el-form-item>
-          <el-form-item label="顺序号">
-            <el-input v-model="listQuery.sequenceNumber" placeholder="请输入顺序号"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="违章人数">
-            <el-input-number v-model="listQuery.violatorCount" :min="0" style="width:100%;" placeholder="请输入违章人数"/>
-          </el-form-item>
-          <el-form-item label="登记人姓名">
-            <el-input v-model="listQuery.registrantName" placeholder="请输入登记人姓名"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="登记单位">
-            <el-input v-model="listQuery.registrationUnit" placeholder="请输入登记单位"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="违章详细情况">
-            <el-input
-              type="textarea"
-              v-model="listQuery.violationDetails"
-              :rows="4"
-              placeholder="请输入违章详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="处理详细情况">
-            <el-input
-              type="textarea"
-              v-model="listQuery.processingDetails"
-              :rows="4"
-              placeholder="请输入处理详细情况"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-const title = ref('');
-
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "行政区划", prop: "administrativeArea",  type: "input" },
+  { label: "统一社会信用代码", prop: "socialCreditCode",  type: "input" },
+  { label: "登记日期", prop: "registrationDate",  type: "date" },
+  { label: "顺序号", prop: "sequenceNumber",  type: "input" },
+  { label: "违章人数", prop: "violatorCount",  type: "number" },
+  { label: "登记人姓名", prop: "registrantName",  type: "input" },
+  { label: "登记单位", prop: "registrationUnit",  type: "input" },
+  { label: "违章详细情况", prop: "violationDetails",  type: "textarea",width: '100%'   },
+  { label: "处理详细情况", prop: "processingDetails",  type: "textarea" ,width: '100%'},
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  if (row) {
-    title.value = type === 'edit' ? '编辑' : '详情';
-    listQuery.value = { ...row };
-  } else {
-    title.value = '新增';
-    listQuery.value = {};
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
-  dialogForm.value = false;
   listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init});
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/index.vue b/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/index.vue
index c523a6b..e144b39 100644
--- a/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/index.vue
+++ b/src/views/backOfficeSystem/CivilExplosives/ViolationRegistration/index.vue
@@ -25,9 +25,9 @@
       >
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" type="primary" link @click="addEdit('edit', row)">编辑</el-button>
-          <el-button size="small" type="primary" link @click="addEdit('detail', row)">详情</el-button>
-          <el-button size="small" type="primary" link>详细</el-button>
+          <el-link size="small" type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" type="primary">详细</el-link>
         </template>
       </MyTable>
       <Pages
@@ -137,7 +137,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 180,
   tableColumn: [
     { label: "违章人数", prop: "violatorCount" },
     { label: "统一社会信用代码", prop: "socialCreditCode" },
diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue
index 383fd76..95130a8 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue
@@ -1,202 +1,97 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">情报信息流转{{ title }}</span>
+      <span class="title">情报信息流转{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="130" label-position="right">
-        <div class="form-row">
-          <el-form-item label="线索标题">
-            <el-input v-model="listQuery.xsbt" placeholder="请输入线索标题" />
-          </el-form-item>
-          <el-form-item label="线索编号">
-            <el-input v-model="listQuery.xsbh" placeholder="请输入线索编号" />
-          </el-form-item>
-          <el-form-item label="线索类型">
-            <el-select v-model="listQuery.xslx" placeholder="请选择线索类型">
-              <el-option label="类型1" value="1" />
-              <el-option label="类型2" value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="线索来源">
-            <el-input v-model="listQuery.xsly" placeholder="请输入线索来源" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="开始时间">
-            <el-date-picker v-model="listQuery.kssj" type="datetime" placeholder="请选择开始时间" />
-          </el-form-item>
-          <el-form-item label="结束时间">
-            <el-date-picker v-model="listQuery.jssj" type="datetime" placeholder="请选择结束时间" />
-          </el-form-item>
-          <el-form-item label="指向地点">
-            <el-input v-model="listQuery.zxdd" placeholder="请输入指向地点" />
-          </el-form-item>
-          <el-form-item label="群体名称">
-            <el-input v-model="listQuery.qtmc" placeholder="请输入群体名称" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="群体类型">
-            <el-input v-model="listQuery.qtlx" placeholder="请输入群体类型" />
-          </el-form-item>
-          <el-form-item label="线索细类">
-            <el-input v-model="listQuery.xslx" placeholder="请输入线索细类" />
-          </el-form-item>
-          <el-form-item label="风险等级">
-            <el-input v-model="listQuery.fxdj" placeholder="请输入风险等级" />
-          </el-form-item>
-          <el-form-item label="是否初报">
-            <el-input v-model="listQuery.qtmc" placeholder="请输入是否初报" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="线索内容" class="full-width">
-            <el-input type="textarea" v-model="listQuery.xsnr" :rows="4" placeholder="请输入线索内容" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="报送编号">
-            <el-input v-model="listQuery.bsbh" placeholder="请输入报送编号" />
-          </el-form-item>
-          <el-form-item label="编制单位">
-            <el-input v-model="listQuery.bzdw" placeholder="请输入编制单位" />
-          </el-form-item>
-          <el-form-item label="上报单位">
-            <el-input v-model="listQuery.sbdw" placeholder="请输入上报单位" />
-          </el-form-item>
-          <el-form-item label="抄送单位">
-            <el-input v-model="listQuery.csdw" placeholder="请输入抄送单位" />
-          </el-form-item>
-        </div>
-        <div class="form-row">
-          <el-form-item label="承办人">
-            <el-input v-model="listQuery.cbr" placeholder="请输入承办人" />
-          </el-form-item>
-          <el-form-item label="审核人">
-            <el-input v-model="listQuery.shr" placeholder="请输入审核人" />
-          </el-form-item>
-          <el-form-item label="签发人">
-            <el-input v-model="listQuery.qfr" placeholder="请输入签发人" />
-          </el-form-item>
-          <el-form-item label=""></el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import MyTable from "@/components/aboutTable/MyTable.vue";
-import { ref,reactive } from "vue";
-
-const dialogForm = ref(false);
-const title = ref("");
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "线索标题", prop: "xsbt", type: "input", },
+  { label: "线索编号", prop: "xsbh",  type: "input" },
+  { label: "线索类型", prop: "xslx",  type: "select", options: []  },
+  { label: "线索来源", prop: "xsly",  type: "input" },
+  { label: "开始时间", prop: "kssj",  type: "datetime"},
+  { label: "结束时间", prop: "jssj",  type: "datetime"},
+  { label: "指向地点", prop: "zxdd",  type: "input" },
+  { label: "群体名称", prop: "qtmc",  type: "input"  },
+  { label: "群体类型", prop: "qtlx",  type: "input"  },
+  { label: "线索细类", prop: "xslx",  type: "input"  },
+  { label: "风险等级", prop: "fxdj",  type: "input"  },
+  { label: "是否初报", prop: "qtmc",  type: "input"  },
+  { label: "线索内容", prop: "nr",  type: "textarea",width: '100%' },
+  { label: "报送编号", prop: "bsbh",  type: "input",},
+  { label: "上报单位", prop: "sbdw",  type: "input",},
+  { label: "抄送单位", prop: "csdw",  type: "input",},
+  { label: "承办人", prop: "cbr",  type: "input",},
+  { label: "审核人", prop: "shr",  type: "input",},
+  { label: "签发人", prop: "qfr",  type: "input",},
+]);
 const listQuery = ref({
-  xgry: []
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
 });
-const pageForm = reactive({
-  tableData: [
-    {
-      xm: "张三",
-      xb: "男",
-      sfzh: "51018319969699999",
-      hjd: "",
-      hjdpcs: "",
-      bq: "重点人员"
-    }
-  ],
-  keyCount: 0,
-  tableConfiger: {
-    rowHieght: 61,
-    showSelectType: "checkBox",
-    loading: false
-  },
-  controlsWidth: 220,
-  tableColumn: [
-    { label: "姓名", prop: "xm" },
-    { label: "性别", prop: "xb" },
-    { label: "身份证号", prop: "sfzh" },
-    { label: "户籍地", prop: "hjd" },
-    { label: "户籍地派出所", prop: "hjdpcs" },
-    { label: "标签", prop: "bq" }
-  ]
-});
-
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  title.value = type === "add" ? "新增" : "编辑";
-  if (type === "edit" && row) {
-    listQuery.value = { ...row };
-  } else {
-    listQuery.value = {
-      xgry: []
-    };
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
-const close = () => {
-  dialogForm.value = false;
-};
-
-const handleAdd = () => {
-  listQuery.value.xgry.push({
-    xm: "",
-    zjhm: "",
-    lxdh: ""
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
   });
 };
 
-const handleDelete = (index) => {
-  listQuery.value.xgry.splice(index, 1);
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
 defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo {
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 20px;
-
-    .el-form-item {
-      flex: 1;
-      min-width: 300px;
-      margin-right: 20px;
-
-      &.full-width {
-        flex: 0 0 100%;
-      }
-    }
-  }
-
-  :deep(.el-divider__text) {
-    font-size: 16px;
-    font-weight: bold;
-  }
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue
index 082a478..1f8d3be 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/components/addForm.vue
@@ -1,154 +1,86 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">社会信息人员建设管理{{ title }}</span>
+      <span class="title">社会信息人员建设管理{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="130" label-position="right">
-        <div class="form-row">
-          <el-form-item label="管线部门">
-            <el-input v-model="listQuery.gxbm" placeholder="请输入管线部门" />
-          </el-form-item>
-          <el-form-item label="所属辖区">
-            <el-input v-model="listQuery.ssxq" placeholder="请输入所属辖区" />
-          </el-form-item>
-          <el-form-item label="信息员姓名">
-            <el-input v-model="listQuery.xm" placeholder="请输入信息员姓名" />
-          </el-form-item>
-          <el-form-item label="身份证号">
-            <el-input v-model="listQuery.sfzh" placeholder="请输入身份证号" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="性别">
-            <el-select v-model="listQuery.xb" placeholder="请选择性别">
-              <el-option label="类型1" value="1" />
-              <el-option label="类型2" value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="年龄">
-            <el-input v-model="listQuery.age" placeholder="请输入年龄" />
-          </el-form-item>
-          <el-form-item label="联系方式">
-            <el-input v-model="listQuery.lxfs" placeholder="请输入联系方式" />
-          </el-form-item>
-          <el-form-item label="考核得分">
-            <el-input v-model="listQuery.kgdf" placeholder="请输入考核得分" />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import MyTable from "@/components/aboutTable/MyTable.vue";
-import { ref,reactive } from "vue";
-
-const dialogForm = ref(false);
-const title = ref("");
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "管线部门", prop: "gxbm",  type: "input" },
+  { label: "所属辖区", prop: "ssxq", type: "input", },
+  { label: "信息员姓名", prop: "xm",  type: "input" },
+  { label: "身份证号", prop: "sfzh",  type: "input" },
+  { label: "性别", prop: "xb",  type: "select", options: []  },
+  { label: "年龄", prop: "age",  type: "input" },
+  { label: "联系方式", prop: "lxfs",  type: "input" },
+  { label: "考核得分", prop: "kgdf",  type: "input" },
+]);
 const listQuery = ref({
-  xgry: []
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
 });
-const pageForm = reactive({
-  tableData: [
-    {
-      xm: "张三",
-      xb: "男",
-      sfzh: "51018319969699999",
-      hjd: "",
-      hjdpcs: "",
-      bq: "重点人员"
-    }
-  ],
-  keyCount: 0,
-  tableConfiger: {
-    rowHieght: 61,
-    showSelectType: "checkBox",
-    loading: false
-  },
-  controlsWidth: 220,
-  tableColumn: [
-    { label: "姓名", prop: "xm" },
-    { label: "性别", prop: "xb" },
-    { label: "身份证号", prop: "sfzh" },
-    { label: "户籍地", prop: "hjd" },
-    { label: "户籍地派出所", prop: "hjdpcs" },
-    { label: "标签", prop: "bq" }
-  ]
-});
-
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  title.value = type === "add" ? "新增" : "编辑";
-  if (type === "edit" && row) {
-    listQuery.value = { ...row };
-  } else {
-    listQuery.value = {
-      xgry: []
-    };
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
-const close = () => {
-  dialogForm.value = false;
-};
-
-const handleAdd = () => {
-  listQuery.value.xgry.push({
-    xm: "",
-    zjhm: "",
-    lxdh: ""
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
   });
 };
 
-const handleDelete = (index) => {
-  listQuery.value.xgry.splice(index, 1);
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
 defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo {
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 20px;
-
-    .el-form-item {
-      flex: 1;
-      min-width: 300px;
-      margin-right: 20px;
-
-      &.full-width {
-        flex: 0 0 100%;
-      }
-    }
-  }
-
-  :deep(.el-divider__text) {
-    font-size: 16px;
-    font-weight: bold;
-  }
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue
index b2c24d0..83f4b82 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue
@@ -1,176 +1,88 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">人力情报信息搜索任务调度{{ title }}</span>
+      <span class="title">人力情报信息搜索任务调度{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="130" label-position="right">
-        <div class="form-row">
-          <el-form-item label="任务编号">
-            <el-input v-model="listQuery.rwbh" placeholder="请输入任务编号" />
-          </el-form-item>
-          <el-form-item label="任务标题">
-            <el-input v-model="listQuery.rwbt" placeholder="请输入任务标题" />
-          </el-form-item>
-          <el-form-item label="任务类型">
-            <el-select v-model="listQuery.rwlx" placeholder="请选择任务类型">
-              <el-option label="类型1" value="1" />
-              <el-option label="类型2" value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="任务来源">
-            <el-input v-model="listQuery.rwly" placeholder="请输入任务来源" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="反馈截止时间">
-            <el-date-picker v-model="listQuery.fkjzsj" type="datetime" placeholder="请选择反馈截止时间" />
-          </el-form-item>
-          <el-form-item label="严重程度">
-            <el-select v-model="listQuery.yzcd" placeholder="请选择严重程度">
-              <el-option label="一般" value="1" />
-              <el-option label="严重" value="2" />
-              <el-option label="特别严重" value="3" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="任务类型细类">
-            <el-select v-model="listQuery.rwlxxl" placeholder="请选择任务类型细类">
-              <el-option label="细类1" value="1" />
-              <el-option label="细类2" value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select v-model="listQuery.cpcd" placeholder="请选择产品程度">
-              <el-option label="一般" value="1" />
-              <el-option label="重要" value="2" />
-            </el-select>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="任务内容" class="full-width">
-            <el-input type="textarea" v-model="listQuery.rwnr" :rows="4" placeholder="请输入任务内容" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="备注" class="full-width">
-            <el-input type="textarea" v-model="listQuery.bz" :rows="2" placeholder="请输入备注" />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import MyTable from "@/components/aboutTable/MyTable.vue";
-import { ref,reactive } from "vue";
-
-const dialogForm = ref(false);
-const title = ref("");
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "任务标题", prop: "rwbt",  type: "input" },
+  { label: "任务编号", prop: "rwbh", type: "input", },
+  { label: "任务类型", prop: "rwlx",  type: "select", options: []  },
+  { label: "任务来源", prop: "xsly",  type: "input" },
+  { label: "反馈截止时间", prop: "kssj",  type: "datetime"},
+  { label: "严重程度", prop: "yzcd",  type: "select", options: []},
+  { label: "任务类型细类", prop: "rwlxxl",  type: "select", options: []},
+  { label: "状态", prop: "cpcd",  type: "select", options: []},
+  { label: "任务内容", prop: "nr",  type: "textarea",width: '100%' },
+  { label: "备注", prop: "bz",  type: "textarea",width: '100%' },
+]);
 const listQuery = ref({
-  xgry: []
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
 });
-const pageForm = reactive({
-  tableData: [
-    {
-      xm: "张三",
-      xb: "男",
-      sfzh: "51018319969699999",
-      hjd: "",
-      hjdpcs: "",
-      bq: "重点人员"
-    }
-  ],
-  keyCount: 0,
-  tableConfiger: {
-    rowHieght: 61,
-    showSelectType: "checkBox",
-    loading: false
-  },
-  controlsWidth: 220,
-  tableColumn: [
-    { label: "姓名", prop: "xm" },
-    { label: "性别", prop: "xb" },
-    { label: "身份证号", prop: "sfzh" },
-    { label: "户籍地", prop: "hjd" },
-    { label: "户籍地派出所", prop: "hjdpcs" },
-    { label: "标签", prop: "bq" }
-  ]
-});
-
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  title.value = type === "add" ? "新增" : "编辑";
-  if (type === "edit" && row) {
-    listQuery.value = { ...row };
-  } else {
-    listQuery.value = {
-      xgry: []
-    };
-  }
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
-const close = () => {
-  dialogForm.value = false;
-};
-
-const handleAdd = () => {
-  listQuery.value.xgry.push({
-    xm: "",
-    zjhm: "",
-    lxdh: ""
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
   });
 };
 
-const handleDelete = (index) => {
-  listQuery.value.xgry.splice(index, 1);
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
 };
-
 defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo {
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 20px;
-
-    .el-form-item {
-      flex: 1;
-      min-width: 300px;
-      margin-right: 20px;
-
-      &.full-width {
-        flex: 0 0 100%;
-      }
-    }
-  }
-
-  :deep(.el-divider__text) {
-    font-size: 16px;
-    font-weight: bold;
-  }
-}
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
index bf3d02b..233ed4d 100644
--- a/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="systemBox">
+    <GdMap></GdMap>
     <!-- 头部筛选 -->
     <div class="topSearch">
       <el-form v-model="listQuery">
@@ -11,7 +12,6 @@
       </el-form>
       <el-button type="primary">搜索</el-button>
     </div>
-    <div></div>
     <!-- 左边列表 -->
     <div class="leftList">
       <div class="hed flex just-between align center">
@@ -69,6 +69,7 @@
 </template>
 
 <script setup>
+import GdMap from "@/components/GdMap/index.vue";
 import * as MOSTY from "@/components/MyComponents/index";
 import YjItem from "./components/yjItem.vue";
 import WarningCount from "./components/WarningCount.vue";
@@ -192,6 +193,7 @@ const active1 = ref("人员身份标签统计");
     height: 60px;
     display: flex;
     align-items: center;
+    z-index: 9;
     .el-form {
       display: flex;
       ::v-deep .el-input__inner{
@@ -209,6 +211,7 @@ const active1 = ref("人员身份标签统计");
     height: calc(100% - 20px);
     border-radius: 6px 6px 6px 6px;
     background: rgba(0, 29, 75, 0.4);
+    z-index: 9;
     .listContent {
       height: calc(100% - 96px);
       overflow: hidden;
@@ -232,6 +235,7 @@ const active1 = ref("人员身份标签统计");
     top: 10px;
     width: 427px;
     height: calc(100% - 20px);
+    z-index: 9;
     .model-commom{
       height: calc((100% / 4) - 10px);
     }
@@ -247,6 +251,7 @@ const active1 = ref("人员身份标签统计");
     transform: translateX(-50%);
     display: flex;
     align-items: center;
+    z-index: 9;
     .footItem{
       width: 195px;
       height: 42px;
diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue
index c2a1072..c34dcd1 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue
@@ -1,158 +1,91 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">新增指令</span>
+      <span class="title">指令{{ title }} </span>
       <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="120" label-position="right">
-        <div class="form-row">
-          <el-form-item label="指令标题">
-            <MOSTY.Other width="100%" v-model="listQuery.title" placeholder="请输入指令标题" />
-          </el-form-item>
-          <el-form-item label="是否生成指令号">
-            <MOSTY.Select width="100%" v-model="listQuery.generateNumber" :dictEnum="[{lable:'是',value:1}]" />
-          </el-form-item>
-          <el-form-item label="指令类型">
-            <MOSTY.Select width="100%" v-model="listQuery.type" :dictEnum="[{lable:'类型1',value:1}]" />
-          </el-form-item>
-          <el-form-item label="指令等级">
-            <MOSTY.Select width="100%" v-model="listQuery.type" :dictEnum="[{lable:'等级1',value:1}]" />
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="指令发起人">
-            <el-input v-model="listQuery.initiator" placeholder="请输入发起人"/>
-          </el-form-item>
-          <el-form-item label="发起部门">
-            <el-input v-model="listQuery.department" placeholder="请输入发起部门"/>
-          </el-form-item>
-
-          <el-form-item label="联系人">
-            <el-input v-model="listQuery.contact" placeholder="请输入联系人"/>
-          </el-form-item>
-          <el-form-item label="联系电话">
-            <el-input v-model="listQuery.phone" placeholder="请输入联系电话"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="关联线索" class="full-width">
-            <div class="flex" style="width:100%;">
-              <el-input v-model="listQuery.relatedClues" placeholder="请输入关联线索"/>
-              <span type="primary" size="small" class="add-btn">+</span>
-            </div>
-          </el-form-item>
-          <el-form-item label="主送单位" class="full-width">
-            <div class="flex" style="width:100%;">
-              <el-input v-model="listQuery.mainUnit" placeholder="请输入主送单位"/>
-              <span type="primary" size="small" class="add-btn">+</span>
-            </div>
-          </el-form-item>
-          <el-form-item label="抄送单位" class="full-width">
-            <div class="flex" style="width:100%;">
-              <el-input v-model="listQuery.ccUnit" placeholder="请输入抄送单位"/>
-              <span type="primary" size="small" class="add-btn">+</span>
-            </div>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="指令内容" class="full-width">
-            <el-input type="textarea" v-model="listQuery.content" :rows="6" placeholder="请输入指令内容"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="附件" class="full-width">
-            <!-- Upload选择 -->
-            <MOSTY.Upload width="100%" v-model="listQuery.tpdz" />
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import * as MOSTY from "@/components/MyComponents/index";
-import { ref, reactive } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({
-  title: '',
-  generateNumber: true,
-  type: '',
-  level: '',
-  initiator: '',
-  department: '',
-  contact: '',
-  phone: '',
-  relatedClues: '',
-  mainUnit: '',
-  ccUnit: '',
-  content: '',
-  attachments: []
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
 });
-
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "指令标题", prop: "title", type: "input", },
+  { label: "是否生成指令号", prop: "generateNumber",  type: "select", options: []  },
+  { label: "指令类型", prop: "type",  type: "select", options: []  },
+  { label: "指令等级", prop: "dj",  type: "select", options: []  },
+  { label: "指令发起人", prop: "fqr",  type: "input" },
+  { label: "发起部门", prop: "dep",  type: "input" },
+  { label: "联系人", prop: "contact",  type: "input"  },
+  { label: "联系电话", prop: "phone",  type: "input"  },
+  { label: "关联线索", prop: "relatedClues",  type: "input"  },
+  { label: "主送单位", prop: "mainUnit",  type: "input"  },
+  { label: "抄送单位", prop: "ccUnit",  type: "input"  },
+  { label: "指令内容", prop: "nr",  type: "textarea",width: '100%' },
+  { label: "附件", prop: "tpdz",  type: "upload",width: '100%' },
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  bqmc: [{ required: true, message: "请输入标签名称", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  // 根据type和row初始化表单数据
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
 
+// 提交
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
+};
+
+// 关闭
 const close = () => {
+  listQuery.value = {};
   dialogForm.value = false;
+  loading.value = false;
 };
-
-defineExpose({init})
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-  .full-width {
-    width: 100%;
-    margin-right: 0 !important;
-
-    .el-input {
-      width: calc(100% - 40px);
-      margin-right: 8px;
-    }
-
-    .add-btn {
-      display: inline-block;
-      background: #0072ff;
-      color: #fff;
-      font-size: 36px;
-      text-align: center;
-      width: 60px;
-    }
-  }
-
-}
-
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue
index 801d804..1a11144 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue
@@ -1,124 +1,82 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">情报语义分析{{ title }}</span>
+      <span class="title">情报语义分析{{ title }} </span>
       <div>
-        <el-button type="primary" v-if="title != '详情'" size="small" :loading="loading" @click="submit">保存</el-button>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" ref="elform" :label-width="120" label-position="right">
-        <div class="form-row">
-          <el-form-item label="语义名称">
-            <el-input v-model="listQuery.yymc" placeholder="请输入语义名称"/>
-          </el-form-item>
-          <el-form-item label="要素类型">
-            <el-input v-model="listQuery.ddwplb" placeholder="请输入要素类型"/>
-          </el-form-item>
-          <el-form-item label="要素名称">
-            <el-input v-model="listQuery.ysmc" placeholder="请输入要素名称"/>
-          </el-form-item>
-        </div>
-        <div class="form-row">
-          <el-form-item label="要素描述">
-            <el-input v-model="listQuery.ysms" type="textarea" rows="3" placeholder="要素描述"/>
-          </el-form-item>
-        </div>
-      </el-form>
+    <div class="form_cnt">
+      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
-const elform = ref();
-const dialogForm = ref(false);
-const listQuery = ref({
-  plateImages: [
-    {img:require('@/assets/images/person.png')},
-    {img:require('@/assets/images/person.png')},
-    {img:require('@/assets/images/person.png')},
-  ]
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
 });
-const title = ref('');
-
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "语义名称", prop: "bqmc", type: "input", },
+  { label: "要素类型", prop: "sfbqdl",  type: "select", options: []  },
+  { label: "要素名称", prop: "sfbqxl",  type: "input", options: []  },
+  { label: "要素描述", prop: "ysms",  type: "textarea", width: "100%"  },
+]);
+const listQuery = ref({
+  sfbqdj: []
+}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  bqmc: [{ required: true, message: "请输入标签名称", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
 // 初始化数据
-const init = (type, row) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  title.value = '新增'
-  if(row){
-    title.value = type == 'edit' ? '编辑' :'详情';
-  }
-  // 根据type和row初始化表单数据
+  title.value = type == 'add' ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
-
 
 // 提交
-const submit = ()=>{
-  elform.value.validate((valid) => {
-    if (!valid) return false;
-    // loading.value = true;
-    let params = { ...listQuery.value}
-    let url = title.value == '新增' ? '/mosty-lzcj/tbDwYy/insert' :'/mosty-lzcj/tbDwYy/update'
+const submit = () => {
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
     // qcckPost(params, url).then((res) => {
-    //   proxy.$message({ type: "success", message: title.value+'成功'});
-    //   close()
-    //   emit("updateDate",modelLx.value);
-    // }).catch(()=>{
-    //   loading.value = false;
-    // });
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
   });
-}
-
-const close = () => {
-  dialogForm.value = false;
 };
 
-defineExpose({init})
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-  .image-group {
-    display: flex;
-    gap: 10px;
-    flex-wrap: wrap;
-  
-    
-    .image-item {
-      width: 150px;
-      height: 150px;
-      border: 1px solid #dcdfe6;
-      
-      .el-image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-
-}
-
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
 </style>
diff --git a/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue
index 4a38cdf..3b927ac 100644
--- a/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue
@@ -23,15 +23,7 @@
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import * as rule from "@/utils/rules.js";
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
@@ -39,100 +31,18 @@ const props = defineProps({
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
 const formData = ref([
-  {
-    text: "组合标签名称",
-    prop: "bqmc",
-    type: "input",
-    required: true
-  },
-  {
-    text: "身份标签大类",
-    prop: "sfbqdl",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "身份标签细类",
-    prop: "sfbqxl",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "身份标签等级",
-    prop: "sfbqdj",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "身份标签颜色",
-    prop: "sfbqys",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "行为标签大类",
-    prop: "xwbqdl",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "行为标签细类",
-    prop: "xwbqdl",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "行为标签等级",
-    prop: "sfbqdj",
-    type: "select",
-    value: "",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "行为标签颜色",
-    prop: "xwbqys",
-    type: "select",
-    optionList: [
-      { label: "是", value: "1" },
-      { label: "否", value: "0" }
-    ]
-  },
-  {
-    text: "身份标签积分",
-    prop: "sfbqjf",
-    type: "input"
-  },
-  {
-    text: "行为标签积分",
-    prop: "xwbqjf",
-    type: "input"
-  },
-  {
-    text: "组合标签积分",
-    prop: "zhbqjf",
-    type: "input"
-  }
+  { label: "组合标签名称", prop: "bqmc", type: "input", },
+  { label: "身份标签大类", prop: "sfbqdl",  type: "select", options: []  },
+  { label: "身份标签细类", prop: "sfbqxl",  type: "select", options: []  },
+  { label: "身份标签等级", prop: "sfbqdj",  type: "select", options: []  },
+  { label: "身份标签颜色", prop: "sfbqys",  type: "select", options: []  },
+  { label: "行为标签大类", prop: "xwbqdl",  type: "select", options: []  },
+  { label: "行为标签细类", prop: "xwbqdl",  type: "select", options: []  },
+  { label: "行为标签等级", prop: "sfbqdj",  type: "select", options: []  },
+  { label: "行为标签颜色", prop: "xwbqys",  type: "select", options: []  },
+  { label: "身份标签积分", prop: "sfbqjf",  type: "input"  },
+  { label: "行为标签积分", prop: "xwbqjf",  type: "input"  },
+  { label: "组合标签积分", prop: "zhbqjf",  type: "input"  }
 ]);
 const listQuery = ref({
   sfbqdj: []
@@ -146,40 +56,31 @@ const rules = reactive({
 const editpeo = ref();
 onMounted(() => {});
 // 初始化数据
-const init = (type, row, lx) => {
+const init = (type, row,) => {
   dialogForm.value = true;
-  title.value = row ? "编辑" : "新增";
+  title.value = type == 'add' ? "新增" : "编辑";
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  let url = "";
-  qcckGet({ id }, url).then((res) => {
-    listQuery.value = res;
-    nextTick(() => {
-      editpeo.value.getList();
-    });
-  });
-};
-const changeInput = (val) => {
-  listQuery.value = {
-    [Object.keys(val)]: val[Object.keys(val)],
-    ...listQuery.value
-  };
-  console.log(listQuery.value, "formData.value");
+  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  //   listQuery.value = res;
+  // });
 };
+
 // 提交
 const submit = () => {
-  elform.value.submit(handleInfoFn);
-};
-const handleInfoFn = (val) => {
-  qcckPost(val, "url")
-    .then((res) => {
-      proxy.$message({ type: "success", message: title.value + "成功" });
-      close();
-    })
-    .catch(() => {});
+  elform.value.submit((data)=>{
+    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    // let params = { ...data }
+    // qcckPost(params, url).then((res) => {
+    //   proxy.$message({ type: "success", message: title.value + "成功" });
+    //   emit("updateDate");
+    //   close();
+    // }).catch(() => {});
+  });
 };
+
 // 关闭
 const close = () => {
   listQuery.value = {};