diff --git a/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue b/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue
index 63a58f4..1e5d454 100644
--- a/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue
@@ -1,21 +1,8 @@
 <template>
   <div>
     <div class="titleBox">
-      <PageTitle title="布控审批" >
-        <template #left>
-          <el-button :type="activeMainNav == 'todo' ? 'primary':''"  @click="activeMainNav = 'todo'">我的待办</el-button>
-          <el-button :type="activeMainNav == 'done' ? 'primary':''" @click="activeMainNav = 'done'">我的已办</el-button>
-        </template>
-        <el-tabs v-model="activeSubNav" @click="handleType">
-          <el-tab-pane label="我的发起" name="myInitiate"></el-tab-pane>
-          <el-tab-pane label="我的审核" name="myAudit"></el-tab-pane>
-          <el-tab-pane label="我的审批" name="myApprove"></el-tab-pane>
-          <el-tab-pane label="我的签收" name="mySign"></el-tab-pane>
-          <el-tab-pane label="我的处置" name="myHandle"></el-tab-pane>
-        </el-tabs>
-      </PageTitle>
+      <PageTitle title="布控审批" ></PageTitle>
     </div>
-
     <!-- 搜索 -->
     <div ref="searchBox">
       <Search :searchArr="searchConfiger" @submit="onSearch"></Search>
@@ -37,24 +24,31 @@
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData"
       >
-        <template #bkDj="{ row }">
-          <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
-        </template>
-        <template #bkDx="{ row }">
-          <DictTag :tag="false" :value="row.bkDx" :options="D_GS_BK_DX" />
-        </template>
         <template #bkZt="{ row }">
           <DictTag :tag="false" :value="row.bkZt" :options="D_GS_BK_ZT" />
         </template>
-        <template #czYq="{ row }">
-          <DictTag :tag="false" :value="row.czYq" :options="D_GS_BK_CZYQ" />
+        <template #bkDj="{ row }">
+          <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
+        </template>
+        <template #bkDxxx="{ row }">
+          <span v-if="row.bkDxxx"><span v-for="(it,idx) in row.bkDxxx" :key="idx"> {{ it.ryXm }} 、</span></span>
+          <span v-else>暂无</span>
+        </template>
+        <template #sjrs="{ row }">
+          <span v-if="row.bkDxxx"> {{ row.bkDxxx.length }} </span>
+           <span v-else>0</span>
+        </template>
+        <template #qyList="{ row }">
+          <span v-for="(it,idx) in row.qyList" :key="idx"> {{ it.qymc }} 、</span>
+        </template>
+        <template #yjcs="{row}">
+          <span style="color: #00ffff;" class="mr5 pointer">{{ row.yjcs || 0}}</span>次
         </template>
 
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-button size="small" @click="autoEdit('auto', row)" >审核</el-button>
           <el-button size="small" @click="autoEdit('approval', row)">审批</el-button>
-          <el-button size="small" @click="autoEdit('detail', row)">详情</el-button>
         </template>
       </MyTable>
       <Pages
@@ -82,15 +76,10 @@ const { proxy } = getCurrentInstance();
 const { D_GS_BK_DJ, D_GS_BK_DX, D_GS_BK_ZT, D_GS_BK_SJLX, D_GS_BK_CZYQ } = proxy.$dict( "D_GS_BK_DJ", "D_GS_BK_DX", "D_GS_BK_ZT", "D_GS_BK_SJLX", "D_GS_BK_CZYQ" ); //获取字典数据
 const searchBox = ref(); //搜索框
 const btns = ref();
-
-// 主导航激活状态
-const activeMainNav = ref("todo");
-// 子导航激活状态
-const activeSubNav = ref("myAudit");
 const searchConfiger = ref([
   {
     label: "布控等级",
-    prop: "bqDj",
+    prop: "bkDj",
     placeholder: "请选择布控等级",
     showType: "select",
     options: D_GS_BK_DJ
@@ -116,19 +105,6 @@ const searchConfiger = ref([
     showType: "date",
     options: D_GS_BK_SJLX
   },
-  {
-    label: "预计标签模型",
-    prop: "jyzt",
-    placeholder: "请选预计标签模型",
-    showType: "select",
-    options: [{ label: "在业", value: "在业" }]
-  },
-  {
-    label: "最近预警时间",
-    prop: "checkDate",
-    placeholder: "最近预警时间",
-    showType: "date"
-  },
 ]);
 const queryFrom = ref({});
 const pageData = reactive({
@@ -149,25 +125,22 @@ const pageData = reactive({
   tableColumn: [
     { label: "布控级别", prop: "bkDj", showSolt: true },
     { label: "布控标题", prop: "bkBt" },
-    { label: "处置接收单位", prop: "czJsdwdm"},
-    { label: "处置要求", prop: "czYq", showSolt: true },
-    { label: "开始时间", prop: "bkSjKs" },
-    { label: "结束时间", prop: "bkSjJs" },
-    { label: "失效时间", prop: "bkSjSx" },
-    { label: "布控发起人", prop: "bkfqrXm" },
-    { label: "布控状态", prop: "bkZt", showSolt: true }
+    { label: "布控对象", prop: "bkDx" },
+    { label: "布控对象信息", prop: "bkDxxx",showSolt: true },
+    { label: "布控范围", prop: "qyList", showSolt: true },
+    { label: "涉及人数", prop: "sjrs",showSolt: true },
+    { label: "预警次数", prop: "yjcs",showSolt: true  },
+    { label: "开始时间", prop: "bkSjKs"},
+    { label: "结束时间", prop: "bkSjJs"},
+    { label: "布控发起人", prop: "bkfqrXm"},
+    { label: "布控状态", prop: "bkZt",showSolt: true}, 
   ]
 });
 onMounted(() => {
   tabHeightFn();
+  getList()
 });
 
-//选择类型
-const handleType = () => {
-  pageData.keyCount++;
-  pageData.pageConfiger.pageCurrent = 1;
-  getList();
-};
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
@@ -186,22 +159,19 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = () => {
-  // pageData.tableConfiger.loading = true;
-  // let data = {
-  //   ...pageData.pageConfiger,
-  //   ...queryFrom.value,
-  // };
-  // qcckGet(data, "/mosty-gsxt/tbGsxtBk/selectPage").then((res) => {
-  //   pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
-  // }).catch(() => {
-  //   pageData.tableConfiger.loading = false;
-  // });
-};
-
-// 详情
-const autoEdit = (type, row) => {
+  pageData.tableConfiger.loading = true;
+  let data = {
+    ...pageData.pageConfiger,
+    ...queryFrom.value,
+    bkcxlx:'03'
+  };
+  qcckGet(data, "/mosty-gsxt/tbGsxtBk/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
 
 // 表格高度计算
diff --git a/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue b/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue
index cdc3055..02441a0 100644
--- a/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index.vue
@@ -1,21 +1,8 @@
 <template>
   <div>
     <div class="titleBox">
-      <PageTitle title="我的审核" >
-        <template #left>
-          <el-button :type="activeMainNav == 'todo' ? 'primary':''"  @click="activeMainNav = 'todo'">我的待办</el-button>
-          <el-button :type="activeMainNav == 'done' ? 'primary':''" @click="activeMainNav = 'done'">我的已办</el-button>
-        </template>
-        <el-tabs v-model="activeSubNav" @click="handleType">
-          <el-tab-pane label="我的发起" name="myInitiate"></el-tab-pane>
-          <el-tab-pane label="我的审核" name="myAudit"></el-tab-pane>
-          <el-tab-pane label="我的审批" name="myApprove"></el-tab-pane>
-          <el-tab-pane label="我的签收" name="mySign"></el-tab-pane>
-          <el-tab-pane label="我的处置" name="myHandle"></el-tab-pane>
-        </el-tabs>
-      </PageTitle>
+      <PageTitle title="我的审核" ></PageTitle>
     </div>
-
     <!-- 搜索 -->
     <div ref="searchBox">
       <Search :searchArr="searchConfiger" @submit="onSearch"></Search>
@@ -37,24 +24,31 @@
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData"
       >
-        <template #bkDj="{ row }">
-          <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
-        </template>
-        <template #bkDx="{ row }">
-          <DictTag :tag="false" :value="row.bkDx" :options="D_GS_BK_DX" />
-        </template>
         <template #bkZt="{ row }">
           <DictTag :tag="false" :value="row.bkZt" :options="D_GS_BK_ZT" />
         </template>
-        <template #czYq="{ row }">
-          <DictTag :tag="false" :value="row.czYq" :options="D_GS_BK_CZYQ" />
+        <template #bkDj="{ row }">
+          <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
+        </template>
+        <template #bkDxxx="{ row }">
+          <span v-if="row.bkDxxx"><span v-for="(it,idx) in row.bkDxxx" :key="idx"> {{ it.ryXm }} 、</span></span>
+          <span v-else>暂无</span>
+        </template>
+        <template #sjrs="{ row }">
+          <span v-if="row.bkDxxx"> {{ row.bkDxxx.length }} </span>
+           <span v-else>0</span>
+        </template>
+        <template #qyList="{ row }">
+          <span v-for="(it,idx) in row.qyList" :key="idx"> {{ it.qymc }} 、</span>
+        </template>
+        <template #yjcs="{row}">
+          <span @click="openWarning(row)" style="color: #00ffff;" class="mr5 pointer">{{ row.yjcs || 0}}</span>次
         </template>
 
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-button size="small" @click="autoEdit('auto', row)" >审核</el-button>
           <el-button size="small" @click="autoEdit('approval', row)">审批</el-button>
-          <el-button size="small" @click="autoEdit('detail', row)">详情</el-button>
         </template>
       </MyTable>
       <Pages
@@ -82,15 +76,10 @@ const { proxy } = getCurrentInstance();
 const { D_GS_BK_DJ, D_GS_BK_DX, D_GS_BK_ZT, D_GS_BK_SJLX, D_GS_BK_CZYQ } = proxy.$dict( "D_GS_BK_DJ", "D_GS_BK_DX", "D_GS_BK_ZT", "D_GS_BK_SJLX", "D_GS_BK_CZYQ" ); //获取字典数据
 const searchBox = ref(); //搜索框
 const btns = ref();
-
-// 主导航激活状态
-const activeMainNav = ref("todo");
-// 子导航激活状态
-const activeSubNav = ref("myAudit");
 const searchConfiger = ref([
   {
     label: "布控等级",
-    prop: "bqDj",
+    prop: "bkDj",
     placeholder: "请选择布控等级",
     showType: "select",
     options: D_GS_BK_DJ
@@ -116,19 +105,6 @@ const searchConfiger = ref([
     showType: "date",
     options: D_GS_BK_SJLX
   },
-  {
-    label: "预计标签模型",
-    prop: "jyzt",
-    placeholder: "请选预计标签模型",
-    showType: "select",
-    options: [{ label: "在业", value: "在业" }]
-  },
-  {
-    label: "最近预警时间",
-    prop: "checkDate",
-    placeholder: "最近预警时间",
-    showType: "date"
-  },
 ]);
 const queryFrom = ref({});
 const pageData = reactive({
@@ -149,25 +125,22 @@ const pageData = reactive({
   tableColumn: [
     { label: "布控级别", prop: "bkDj", showSolt: true },
     { label: "布控标题", prop: "bkBt" },
-    { label: "处置接收单位", prop: "czJsdwdm"},
-    { label: "处置要求", prop: "czYq", showSolt: true },
-    { label: "开始时间", prop: "bkSjKs" },
-    { label: "结束时间", prop: "bkSjJs" },
-    { label: "失效时间", prop: "bkSjSx" },
-    { label: "布控发起人", prop: "bkfqrXm" },
-    { label: "布控状态", prop: "bkZt", showSolt: true }
+    { label: "布控对象", prop: "bkDx" },
+    { label: "布控对象信息", prop: "bkDxxx",showSolt: true },
+    { label: "布控范围", prop: "qyList", showSolt: true },
+    { label: "涉及人数", prop: "sjrs",showSolt: true },
+    { label: "预警次数", prop: "yjcs",showSolt: true  },
+    { label: "开始时间", prop: "bkSjKs"},
+    { label: "结束时间", prop: "bkSjJs"},
+    { label: "布控发起人", prop: "bkfqrXm"},
+    { label: "布控状态", prop: "bkZt",showSolt: true}, 
   ]
 });
 onMounted(() => {
   tabHeightFn();
+  getList()
 });
 
-//选择类型
-const handleType = () => {
-  pageData.keyCount++;
-  pageData.pageConfiger.pageCurrent = 1;
-  getList();
-};
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
@@ -186,22 +159,19 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = () => {
-  // pageData.tableConfiger.loading = true;
-  // let data = {
-  //   ...pageData.pageConfiger,
-  //   ...queryFrom.value,
-  // };
-  // qcckGet(data, "/mosty-gsxt/tbGsxtBk/selectPage").then((res) => {
-  //   pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
-  // }).catch(() => {
-  //   pageData.tableConfiger.loading = false;
-  // });
-};
-
-// 详情
-const autoEdit = (type, row) => {
+  pageData.tableConfiger.loading = true;
+  let data = {
+    ...pageData.pageConfiger,
+    ...queryFrom.value,
+    bkcxlx:'02'
+  };
+  qcckGet(data, "/mosty-gsxt/tbGsxtBk/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
 
 // 表格高度计算
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
index 3015be0..ed41c5d 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
@@ -23,10 +23,26 @@
           :key="pageData.keyCount"
           :tableConfiger="pageData.tableConfiger"
           :controlsWidth="pageData.controlsWidth"
-          @chooseData="chooseData"
         >
+        <template #bkZt="{ row }">
+          <DictTag :tag="false" :value="row.bkZt" :options="D_GS_BK_ZT" />
+        </template>
+        <template #bkDj="{ row }">
+          <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
+        </template>
+        <template #bkDxxx="{ row }">
+          <span v-if="row.bkDxxx"><span v-for="(it,idx) in row.bkDxxx" :key="idx"> {{ it.ryXm }} 、</span></span>
+          <span v-else>暂无</span>
+        </template>
+        <template #sjrs="{ row }">
+          <span v-if="row.bkDxxx"> {{ row.bkDxxx.length }} </span>
+           <span v-else>0</span>
+        </template>
+        <template #qyList="{ row }">
+          <span v-for="(it,idx) in row.qyList" :key="idx"> {{ it.qymc }} 、</span>
+        </template>
         <template #yjcs="{row}">
-          <span @click="openWarning(row)" style="color: #00ffff;" class="mr5 pointer">{{ row.yjcs }}</span>次
+          <span @click="openWarning(row)" style="color: #00ffff;" class="mr5 pointer">{{ row.yjcs || 0}}</span>次
         </template>
           <!-- 操作 -->
           <template #controls="{ row }">
@@ -58,7 +74,7 @@ import Search from "@/components/aboutTable/Search.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_GS_BK_DJ, D_GS_BK_DX, D_GS_BK_ZT } = proxy.$dict("D_GS_BK_DJ","D_GS_BK_DX","D_GS_BK_ZT"); //获取字典数据
+const { D_GS_BK_SJLX,D_GS_BK_DJ, D_GS_BK_DX, D_GS_BK_ZT } = proxy.$dict("D_GS_BK_SJLX","D_GS_BK_DJ","D_GS_BK_DX","D_GS_BK_ZT"); //获取字典数据
 const addBkdxForm = ref(null); //布控对象组件
 const warningkdxForm = ref(); //布控对象组件
 const searchBox = ref(); //搜索框
@@ -84,32 +100,21 @@ const searchConfiger = ref([
     showType: "select",
     options: D_GS_BK_ZT
   },
-  {
-    label: "布控时间",
-    prop: "bksj",
+   {
+    label: "布控时间类型",
+    prop: "bkSjLx",
     placeholder: "请选择布控时间",
-    showType: "date"
+    showType: "date",
+    options: D_GS_BK_SJLX
   },
-  {
-    label: "最近预警时间",
-    prop: "zjyjsj",
-    placeholder: "最近预警时间",
-    showType: "date"
-  },
-  {
-    label: "处置接受部门",
-    prop: "ssbmdm",
-    placeholder: "请选择处置接受部门",
-    showType: "department"
-  }
 ]);
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [{yjcs:5}], //表格数据
+  tableData: [], //表格数据
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "checkBox", //选择类型
+    showSelectType: "null", //选择类型
     loading: false
   },
   total: 0,
@@ -122,20 +127,15 @@ const pageData = reactive({
   tableColumn: [
     { label: "布控级别", prop: "bkDj", showSolt: true },
     { label: "布控标题", prop: "bkBt" },
-    { label: "布控对象", prop: "bkBt" },
-    { label: "布控对象信息", prop: "czJsdwdm", showSolt: true },
-    { label: "预警标签模型", prop: "czYq", showSolt: true },
-    { label: "布控范围", prop: "bkSjKs" },
-    { label: "涉及人数", prop: "bkSjJs" },
+    { label: "布控对象", prop: "bkDx" },
+    { label: "布控对象信息", prop: "bkDxxx",showSolt: true },
+    { label: "布控范围", prop: "qyList", showSolt: true },
+    { label: "涉及人数", prop: "sjrs",showSolt: true },
     { label: "预警次数", prop: "yjcs",showSolt: true  },
-    { label: "处置接收单位", prop: "bkfqrXm" },
-    { label: "开始时间", prop: "bkZt"},
-    { label: "结束时间", prop: "bkZt"},
-    { label: "最近预警时间", prop: "bkZt"},
-    { label: "失效时间", prop: "bkZt"},
-    { label: "布控发起人", prop: "bkZt"},
-    { label: "审批状态", prop: "bkZt"},
-    { label: "布控状态", prop: "bkZt"},
+    { label: "开始时间", prop: "bkSjKs"},
+    { label: "结束时间", prop: "bkSjJs"},
+    { label: "布控发起人", prop: "bkfqrXm"},
+    { label: "布控状态", prop: "bkZt",showSolt: true}, 
   ]
 });
 
@@ -161,24 +161,22 @@ const changeSize = (val) => {
 };
 
 // 获取列表
-const getList = (val) => {
-  // pageData.tableConfiger.loading = true;
-  // let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // let url = "/mosty-gsxt/tbGsxtBk/selectPage";
-  // qcckGet(data, url)
-  //   .then((res) => {
-  //     console.log(res, "4");
-  //     pageData.tableData = res.records || [];
-  //     pageData.total = res.total;
-  //     pageData.tableConfiger.loading = false;
-  //   })
-  //   .catch(() => {
-  //     pageData.tableConfiger.loading = false;
-  //   });
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = {
+    ...pageData.pageConfiger,
+    ...queryFrom.value,
+    bkcxlx:'01'
+  };
+  qcckGet(data, "/mosty-gsxt/tbGsxtBk/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
-const chooseData = (val) =>{
-  console.log(val,'====');
-}
+
 // 打开预警
 const openWarning = (val) =>{
   warningkdxForm.value.init(val)