diff --git a/src/api/baseData/externalAssistance.js b/src/api/baseData/externalAssistance.js
new file mode 100644
index 0000000..6f4b844
--- /dev/null
+++ b/src/api/baseData/externalAssistance.js
@@ -0,0 +1,10 @@
+// 外协信息
+import request from "@/utils/request";
+
+// 获取公司信息列表
+export async function getExternalAssistanceList() {
+    return await request({
+        url: '/extend/systeminformation/GetExternalAssistanceList',
+        method: 'get',
+    });
+}
\ No newline at end of file
diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 80ddec1..1c0b38d 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -73,6 +73,8 @@ a {
   line-height: 30px;
   .label {
     color: #000;
+    text-align: right;
+    padding: 0 5px;
     &.w-100 {
       width: 100px;
     }
diff --git a/src/store/modules/meta.js b/src/store/modules/meta.js
index 3380af2..eeec1c6 100644
--- a/src/store/modules/meta.js
+++ b/src/store/modules/meta.js
@@ -6,12 +6,15 @@ import { getSystemTypeList } from "@/api/common";
 import { getAreaSelect } from "@/api/baseData/area";
 // 系统分类
 import { getSystemClassSelect } from "@/api/baseData/systemClass";
+// 外协列表
+import { getExternalAssistanceList } from "@/api/baseData/externalAssistance"
 
 const meta = {
     state: {
         system: '', // 系统类型
         area: '', // 系统类型
         systemClass: {},
+        externalAssistanceList: '', // 外协
     },
 
     mutations: {
@@ -24,6 +27,9 @@ const meta = {
         SET_SYSTEM_CLASS: (state, {key, data}) => {
             state.systemClass[key] = data;
         },
+        SET_EXTERNALASSISTANCE_CLASS: (state, data) => {
+            state.externalAssistanceList = data;
+        },
     },
 
     actions: {
@@ -42,6 +48,12 @@ const meta = {
                             resolve(res.data)
                         }).catch(error => { reject(error) })
                         break;
+                    case 'externalAssistance':
+                        getExternalAssistanceList().then(res => {
+                            commit('SET_EXTERNALASSISTANCE_CLASS', res.data)
+                            resolve(res.data)
+                        }).catch(error => { reject(error) })
+                        break;
 
                     default:
                         break;
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d17f412..f457d6d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -18,6 +18,7 @@ const user = {
         userInfo: {},
         menuList: [],
         socket: '',
+        islader: false,
     },
 
     mutations: {
@@ -50,7 +51,10 @@ const user = {
         },
         SET_MENULIST: (state, menuList) => {
             state.menuList = menuList
-        }
+        },
+        SET_ISLADER: (state, islader) => {
+            state.islader = islader
+        },
     },
 
     actions: {
@@ -187,6 +191,8 @@ const user = {
                     commit('SET_AVATAR', avatar)
                     commit('SET_ADDRESS', userInfo.loginIPAddressName)
                     commit('SET_USERINFO', userInfo)
+                    // 是否为市级领导
+                    commit('SET_ISLADER', userInfo.organizeId == '580547494862128389')
                     commit('SET_MENULIST', menuList)
                     resolve(routerList)
                 }).catch(error => {
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index e170dfc..36b689a 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -129,7 +129,7 @@
 		computed: {
 			isSHILevel() {
     		  // 判断角色是否为‘市级办公室’
-    		  return this.$store.state.user.userInfo.organizeId == '580547494862128389';
+    		  return this.$store.state.user.islader;
     		},
 		},
         watch: {},
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index cb5a337..f3bce50 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -28,7 +28,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('title')">
+        <el-col :span="23" v-if="ncc.hasFormP('title') && !dataForm.id">
           <el-form-item label="标题" prop="title">
             <el-input
               v-model="dataForm.title"
@@ -40,7 +40,14 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('annex')">
+        <el-col :span="23" v-if="ncc.hasFormP('content') && !dataForm.id">
+          <el-form-item label="内容" prop="content">
+            <el-input v-model="dataForm.content" placeholder="请输入" show-word-limit :style="{ width: '100%' }"
+              type="textarea" :autosize="{ minRows: 4, maxRows: 4 }">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('annex') && !dataForm.id">
           <el-form-item label="附件" prop="annex">
             <NCC-UploadFz
               v-model="dataForm.annex"
@@ -52,7 +59,7 @@
             </NCC-UploadFz>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('communicationArea')">
+        <el-col :span="23" v-if="ncc.hasFormP('communicationArea') && dataForm.id">
           <el-form-item label="传达区域" prop="communicationArea">
             <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
               <el-checkbox
@@ -63,21 +70,43 @@
               >
             </el-checkbox-group>
             <div style="margin-top: 10px">
-              <el-button size="mini" @click="selectAreaAll">全选</el-button>
-              <el-button size="mini" @click="closeAreaAll">反选</el-button>
+              <el-button size="mini" @click="selectAreaAll('area')">全选</el-button>
+              <el-button size="mini" @click="closeAreaAll('area')">反选</el-button>
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('communicationArea')">
-          <el-form-item label="传达外协" prop="communicationArea">
-            <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
+        <el-col :span="23" v-if="ncc.hasFormP('communicationOut') && dataForm.id">
+          <el-form-item label="传达外协" prop="communicationOut">
+            <el-checkbox-group v-model="dataForm.communicationOut" :style="{}">
               <el-checkbox
-                v-for="(item, index) in communicationAreaOptions"
+                v-for="(item, index) in communicationOutOptions"
                 :key="index"
                 :label="item.id"
                 >{{ item.fullName }}</el-checkbox
               >
             </el-checkbox-group>
+            <div style="margin-top: 10px">
+              <el-button size="mini" @click="selectAreaAll">全选</el-button>
+              <el-button size="mini" @click="closeAreaAll">反选</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('relationId') && dataForm.id">
+          <el-form-item label="填报表单" prop="relationId">
+            <el-select v-model="dataForm.relationId" placeholder="请选择专项行动填报表单" style="margin-right: 10px;width: 300px;">
+              <el-option v-for="item in BaseList" :key="item.id" :label="item.fullName" :value="item.id">
+              </el-option>
+            </el-select>
+            <el-button size="mini" type="text" @click="dialogVisible = true">没有找到表单？点击设计表单</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('deadline') && dataForm.id">
+          <el-form-item label="截止日期" prop="deadline">
+            <el-date-picker
+              v-model="dataForm.deadline"
+              type="date"
+              placeholder="选择截止日期">
+            </el-date-picker>
           </el-form-item>
         </el-col>
       </el-form>
@@ -88,6 +117,15 @@
         >确 定</el-button
       >
     </span>
+    <el-dialog class="zxDialog" title="专项行动表单设计" :visible.sync="dialogVisible" fullscreen @close="handleClose" :modal="false">
+      <iframe 
+        :src="nestedPageUrl" 
+        width="100%" 
+        :height="viewportHeight - 58 + 'px'" 
+        frameborder="0" 
+        allowfullscreen>
+      </iframe>
+    </el-dialog>
   </el-dialog>
 </template>
 <script>
@@ -111,11 +149,14 @@ export default {
         releaseTime: undefined,
         annex: [],
         communicationArea: [],
+        communicationOut: [],
         state: undefined,
         creatorUserId: undefined,
         creatorTime: undefined,
         lastModifyUserId: undefined,
         lastModifyTime: undefined,
+        deadline: undefined,
+        relationId: undefined
       },
       rules: {
         specialActionType: [
@@ -132,35 +173,96 @@ export default {
             trigger: "blur",
           },
         ],
+        deadline: [
+          {
+            required: true,
+            message: "请输入截止日期",
+            trigger: "change",
+          }
+        ]
       },
       areaOptions: [],
-      communicationAreaOptions: [],
+      communicationOutOptions: [],
+      BaseList:[],
+      viewportHeight: 0,
+      nestedPageUrl:"http://8.130.38.56:8043/old/#/onlineDev/webDesign/indexNew",
+      dialogVisible: false,
     };
   },
   computed: {},
   watch: {},
   created() {
     this.initAreaTypeList();
+    this.initCommunicationOutOptions();
+    this.updateViewportHeight();
+    this.getDataForm();
+      // 监听窗口大小变化事件
+      window.addEventListener('resize', this.updateViewportHeight);
   },
   mounted() {},
+  beforeDestroy() {
+    // 移除窗口大小变化事件监听器
+    window.removeEventListener('resize', this.updateViewportHeight);
+  },
   methods: {
+    updateViewportHeight() {
+      // 获取页面显示高度
+      this.viewportHeight = window.innerHeight || document.documentElement.clientHeight;
+    },
+    handleClose() {
+      // 这里是对话框关闭后需要执行的代码
+      this.getDataForm();
+      // 例如，你可以在这里添加任何其他的逻辑
+    },
+     //查询表单
+     getDataForm() {
+      request({
+        url: "/visualdev/Base?type=1",
+        method: "get",
+      }).then((res) => {
+        this.BaseList = res.data.list[0].children;
+        console.log(this.BaseList)
+      });
+    },
     async initAreaTypeList() {
       let list = this.$store.state.meta.area;
       !list && (list = await this.$store.dispatch("getTypeListByCode", "area"));
       this.areaOptions = list;
     },
-    selectAreaAll() {
-      this.dataForm.communicationArea = this.areaOptions.map(
-        (option) => option.id
-      );
+    async initCommunicationOutOptions() {
+      let list = this.$store.state.meta.externalAssistanceList;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "externalAssistance"));
+      this.communicationOutOptions = list;
     },
-    closeAreaAll() {
-      this.dataForm.communicationArea = this.areaOptions
-        .filter(
-          (option) => !this.dataForm.communicationArea.includes(option.id)
-        )
-        .map((option) => option.id);
+    // 全选
+    selectAreaAll(type) {
+      if(type == 'area') {
+        this.dataForm.communicationArea = this.areaOptions.map(
+          (option) => option.id
+        );
+      } else {
+        this.dataForm.communicationOut = this.communicationOutOptions.map(
+          (option) => option.id
+        );
+      }
     },
+    // 反选
+    closeAreaAll(type) {
+      if(type == 'area') {
+        this.dataForm.communicationArea = this.areaOptions
+          .filter(
+            (option) => !this.dataForm.communicationArea.includes(option.id)
+          )
+          .map((option) => option.id);
+      } else {
+        this.dataForm.communicationOut = this.communicationOutOptions
+          .filter(
+            (option) => !this.dataForm.communicationOut.includes(option.id)
+          )
+          .map((option) => option.id);
+      }
+    },
+   
     goBack() {
       this.$emit("refresh");
     },
@@ -170,27 +272,18 @@ export default {
       this.isDetail = isDetail || false;
       this.$nextTick(() => {
         this.$refs["elForm"].resetFields();
-        if (this.dataForm.id) {
-          request({
-            url: "/Extend/BaseSpecialAction/" + this.dataForm.id,
-            method: "get",
-          }).then((res) => {
-            this.dataForm = res.data;
-            if (!this.dataForm.annex) this.dataForm.annex = [];
-            if (!this.dataForm.communicationArea)
-              this.dataForm.communicationArea = [];
-          });
-        }
       });
     },
     dataFormSubmit() {
       this.$refs["elForm"].validate((valid) => {
         if (valid) {
           if (!this.dataForm.id) {
+            let {title, content} = this.dataForm;
+            // 新增
             request({
               url: `/Extend/BaseSpecialAction`,
               method: "post",
-              data: this.dataForm,
+              data: { title, content },
             }).then((res) => {
               this.$message({
                 message: res.msg,
@@ -202,8 +295,9 @@ export default {
               });
             });
           } else {
+            // 发布任务
             request({
-              url: "/Extend/BaseSpecialAction/" + this.dataForm.id,
+              url: "/Extend/BaseSpecialAction/Release",
               method: "PUT",
               data: this.dataForm,
             }).then((res) => {
@@ -224,3 +318,10 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.el-dialog__wrapper.zxDialog {
+  :deep(.el-dialog__body) {
+    max-height: unset;
+  }
+}
+</style>
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 97351db..30783cd 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -8,33 +8,21 @@
             <el-form @submit.native.prevent size="mini">
               <el-col :span="6">
                 <el-form-item label="">
-                  <el-input
-                    v-model="query.title"
-                    placeholder="标题"
-                    clearable
-                  />
+                  <el-input v-model="query.title" placeholder="标题" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="">
-                  <el-input
-                    v-model="query.state"
-                    placeholder="状态"
-                    clearable
-                  />
+                  <el-select v-model="query.state" placeholder="请选择状态" clearable>
+                    <el-option label="已发布" value="已发布"></el-option>
+                    <el-option label="未发布" value="未发布"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="search()"
-                    >查询</el-button
-                  >
-                  <el-button icon="el-icon-refresh-right" @click="reset()"
-                    >重置</el-button
-                  >
+                  <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
                 </el-form-item>
               </el-col>
             </el-form>
@@ -45,94 +33,46 @@
           <div class="NCC-common-layout-main NCC-flex-main">
             <div class="NCC-common-head">
               <div>
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  @click="addOrUpdateHandle()"
-                  size="mini"
-                  >新增</el-button
-                >
+                <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
               </div>
             </div>
             <NCC-table v-loading="listLoading" :data="list">
               <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
               <el-table-column prop="title" label="标题" align="left" show-overflow-tooltip/>
-              <el-table-column
-                prop="releaseTime"
-                label="发布时间"
-                align="left"
-                show-overflow-tooltip
-              />
-              <el-table-column
-                label="传达区域"
-                prop="communicationArea"
-                align="left"
-                show-overflow-tooltip
-              >
-                <template slot-scope="scope">{{
-                  scope.row.communicationArea
-                    | dynamicText(communicationAreaOptions)
-                }}</template>
+              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip/>
+              <el-table-column prop="creatorTime" label="发布时间" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
+              <el-table-column label="传达区域" prop="communicationArea" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ JSON.parse(scope.row.communicationArea) | dynamicText(communicationAreaOptions) }}</template>
               </el-table-column>
-              <el-table-column
-                label="传达外协"
-                prop="communicationArea"
-                align="left"
-                show-overflow-tooltip
-              >
-                <template slot-scope="scope">{{
-                  scope.row.communicationArea
-                    | dynamicText(communicationAreaOptions)
-                }}</template>
+              <el-table-column label="传达外协" prop="communicationOut" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ JSON.parse(scope.row.communicationOut) | dynamicText(communicationOutOptions) }}</template>
               </el-table-column>
-              <el-table-column
-                prop="creatorUserId"
-                show-overflow-tooltip
-                label="创建用户"
-                align="left"
-              />
-              <el-table-column label="操作" fixed="right" width="100">
+              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
+              <el-table-column prop="creatorUserId" show-overflow-tooltip label="创建用户" align="left"/>
+              <el-table-column label="操作" fixed="right" width="130">
                 <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    @click="addOrUpdateHandle(scope.row.id)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    type="text"
-                    @click="handleDel(scope.row.id)"
-                    class="NCC-table-delBtn"
-                    >删除</el-button
-                  >
+                  <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">发布任务</el-button>
+                  <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已发布'">行动情况</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
-            <pagination
-              :total="total"
-              :page.sync="listQuery.currentPage"
-              :limit.sync="listQuery.pageSize"
-              @pagination="initData"
-            />
+            <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
           </div>
         </div>
         <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
-        <ExportBox
-          v-if="exportBoxVisible"
-          ref="ExportBox"
-          @download="download"
-        />
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+        <InfoForm v-if="InfoFormVisible" ref="InfoForm" @refresh="InfoFormVisible = false"/>
       </div>
     </div>
   </div>
 </template>
 <script>
 import request from "@/utils/request";
-import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
 import NCCForm from "./Form";
 import ExportBox from "./ExportBox";
-import { previewDataInterface } from "@/api/systemData/dataInterface";
+import InfoForm from "./infoForm.vue";
 export default {
-  components: { NCCForm, ExportBox },
+  components: { NCCForm, ExportBox, InfoForm },
   data() {
     return {
       query: {
@@ -141,7 +81,6 @@ export default {
       },
       list: [],
       listLoading: false,
-      multipleSelection: [],
       total: 0,
       listQuery: {
         currentPage: 1,
@@ -151,33 +90,32 @@ export default {
       },
       formVisible: false,
       exportBoxVisible: false,
-      columnList: [
-        { prop: "id", label: "主键" },
-        { prop: "specialActionType", label: "类型" },
-        { prop: "title", label: "标题" },
-        { prop: "releaseTime", label: "发布时间" },
-        { prop: "communicationArea", label: "传达区域" },
-        { prop: "state", label: "状态" },
-        { prop: "creatorUserId", label: "创建用户" },
-        { prop: "creatorTime", label: "创建时间" },
-        { prop: "lastModifyUserId", label: "修改用户" },
-        { prop: "lastModifyTime", label: "修改时间" },
-        { prop: "content", label: "内容" },
-      ],
-      specialActionTypeOptions: [],
+      InfoFormVisible: false,
       communicationAreaOptions: [],
+      communicationOutOptions: [],
     };
   },
-  computed: {},
   created() {
+    this.initAreaTypeList();
+    this.initCommunicationOutOptions();
     this.initData()
-    this.getspecialActionTypeOptions();
   },
+  computed: {
+		isSHILevel() {
+  		  // 判断角色是否为‘市级办公室’
+  		  return this.$store.state.user.islader;
+  		},
+	},
   methods: {
-    getspecialActionTypeOptions() {
-      getDictionaryDataSelector("576310654982423813").then((res) => {
-        this.specialActionTypeOptions = res.data.list;
-      });
+    async initAreaTypeList() {
+      let list = this.$store.state.meta.area;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "area"));
+      this.communicationAreaOptions = list;
+    },
+    async initCommunicationOutOptions() {
+      let list = this.$store.state.meta.externalAssistanceList;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "externalAssistance"));
+      this.communicationOutOptions = list;
     },
     initData() {
       this.listLoading = true;
@@ -193,46 +131,35 @@ export default {
           query[key] = _query[key];
         }
       }
+      // 市级专项行动列表
       request({
-        url: `/Extend/BaseSpecialAction`,
+        url: '/Extend/BaseSpecialAction',
         method: "GET",
-        data: query,
+        params: query,
       }).then((res) => {
         this.list = res.data.list;
+        // console.log(this.list, 'list');
         this.total = res.data.pagination.total;
         this.listLoading = false;
       });
     },
-    handleDel(id) {
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        type: "warning",
-      })
-        .then(() => {
-          request({
-            url: `/Extend/BaseSpecialAction/${id}`,
-            method: "DELETE",
-          }).then((res) => {
-            this.$message({
-              type: "success",
-              message: res.msg,
-              onClose: () => {
-                this.initData();
-              },
-            });
-          });
-        })
-        .catch(() => {});
-    },
+   
     addOrUpdateHandle(id, isDetail) {
       this.formVisible = true;
       this.$nextTick(() => {
         this.$refs.NCCForm.init(id, isDetail);
       });
     },
+    toDetail(row) {
+      this.InfoFormVisible = true;
+      this.$nextTick(() => {
+        this.$refs.InfoForm.init(row);
+      });
+    },
     exportData() {
       this.exportBoxVisible = true;
       this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.columnList);
+        this.$refs.ExportBox.init(this.list);
       });
     },
     download(data) {
diff --git a/src/views/baseSpecialAction/infoForm.vue b/src/views/baseSpecialAction/infoForm.vue
new file mode 100644
index 0000000..ebae4ac
--- /dev/null
+++ b/src/views/baseSpecialAction/infoForm.vue
@@ -0,0 +1,97 @@
+<template>
+  <!-- 专项行动填报情况 -->
+  <el-dialog
+    title="行动情况"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center"
+    lock-scroll
+    width="70%"
+  >
+    <el-row :gutter="15" style="height: 65vh">
+        <el-col :span="24" style="margin-bottom: 20px;">
+            <el-col :span="12" class="form-item">
+                <div class="label w-100">行动标题：</div>
+                <div>{{ form.title }}</div>
+            </el-col>
+            <el-col :span="12" class="form-item">
+                <div class="label w-100">截止日期：</div>
+                <div>{{ ncc.dateFormat(form.deadline) }}</div>
+            </el-col>
+        </el-col>
+        <el-col :span="24" style="height: calc(100% - 100px);">
+            <el-table :data="tableData" style="width: 100%" v-loading="loading" stripe>
+              <el-table-column type="index" width="50" />
+              <el-table-column prop="originName" label="部门名称" />
+              <el-table-column prop="state" label="状态" />
+            </el-table>
+            <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initList"/>
+        </el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import request from "@/utils/request";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      loading: false,
+      visible: false,
+      tableData: [{}],
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+      },
+      total: 0,
+      form: {},
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    close() {
+        this.form = {};
+        this.$emit("refresh");
+    },
+    init(row) {
+        this.form = row;
+        this.visible = true;
+        this.loading = true;
+        this.$nextTick(() => {
+            this.initList();
+        })
+    },
+    initList() {
+        request({
+            url: `/Extend/BaseSpecialActionInfo/GetListById`,
+            method: "GET",
+            params: {
+              ...this.listQuery,
+              specialActionId: this.form.id,
+            },
+          }).then((res) => {
+            this.tableData = res.data.list;
+            this.total = res.data.pagination.total;
+            this.loading = false;
+          });
+        }
+    },
+};
+</script>
+<style lang="scss" scoped>
+.NCC-dialog {
+    :deep(.el-pagination__total) {
+        color: #606266;
+    }
+    :deep(.el-pagination__jump) {
+        color: #606266;
+    }
+}
+</style>
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
new file mode 100644
index 0000000..ac1beb4
--- /dev/null
+++ b/src/views/baseSpecialhandle/index.vue
@@ -0,0 +1,202 @@
+<template>
+    <div class="baseSpecialAction item-box common-info-box">
+      <div class="item-title">专项行动处理</div>
+      <div class="item-body">
+        <div class="NCC-common-layout">
+          <div class="NCC-common-layout-center">
+            <el-row class="NCC-common-search-box" :gutter="16">
+              <el-form @submit.native.prevent size="mini">
+                <el-col :span="6">
+                  <el-form-item label="">
+                    <el-input v-model="query.title" placeholder="标题" clearable/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="">
+                    <el-select v-model="query.state" placeholder="请选择状态" clearable>
+                      <el-option label="已填写" value="已填写"></el-option>
+                      <el-option label="未填写" value="未填写"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                    <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                  </el-form-item>
+                </el-col>
+              </el-form>
+              <div class="NCC-common-search-box-right">
+                <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
+              </div>
+            </el-row>
+            <div class="NCC-common-layout-main NCC-flex-main">
+              <NCC-table v-loading="listLoading" :data="list">
+                <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
+                <el-table-column prop="title" label="标题" align="left" show-overflow-tooltip/>
+                <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip/>
+                <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
+                <el-table-column label="操作" fixed="right" width="130">
+                  <template slot-scope="scope">
+                    <el-button type="text" @click="toFillForm(scope.row)">处理</el-button>
+                  </template>
+                </el-table-column>
+              </NCC-table>
+              <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+            </div>
+          </div>
+        </div>
+      </div>
+      <el-dialog title="专项行动处理" :visible.sync="dialogVisible" fullscreen :modal="false">
+        <iframe 
+          :src="nestedPageUrl" 
+          width="100%" 
+          :height="viewportHeight - 58 + 'px'" 
+          frameborder="0" 
+          allowfullscreen>
+        </iframe>
+      </el-dialog>
+    </div>
+  </template>
+  <script>
+  import request from "@/utils/request";
+  export default {
+    components: {  },
+    data() {
+      return {
+        query: {
+          title: undefined,
+          state: undefined,
+        },
+        list: [],
+        listLoading: false,
+        total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        },
+        communicationAreaOptions: [],
+        communicationOutOptions: [],
+        dialogVisible: false,
+        nestedPageUrl: '',
+        viewportHeight: 0,
+      };
+    },
+    created() {
+      this.updateViewportHeight();
+      this.initData()
+       // 监听窗口大小变化事件
+       window.addEventListener('resize', this.updateViewportHeight);
+    },
+    beforeDestroy() {
+      // 移除窗口大小变化事件监听器
+      window.removeEventListener('resize', this.updateViewportHeight);
+    },
+    computed: {
+          isSHILevel() {
+              // 判断角色是否为‘市级办公室’
+              return this.$store.state.user.islader;
+            },
+      },
+    methods: {
+      updateViewportHeight() {
+        // 获取页面显示高度
+        this.viewportHeight = window.innerHeight || document.documentElement.clientHeight;
+      },
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+        };
+        let query = {};
+        for (let key in _query) {
+          if (Array.isArray(_query[key])) {
+            query[key] = _query[key].join();
+          } else {
+            query[key] = _query[key];
+          }
+        }
+        request({
+          url: '/Extend/BaseSpecialAction/getCurrentUserSpecialAction',
+          method: "GET",
+          params: query,
+        }).then((res) => {
+          this.list = res.data.list;
+          this.total = res.data.pagination.total;
+          this.listLoading = false;
+        });
+      },
+      toFillForm(row) {
+        this.dialogVisible = true;
+        this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`;
+        request({
+          url: '/visualdev/Base',
+          method: "GET",
+          data: {type: 1},
+        }).then((res) => {
+        this.BaseList = res.data.list[0].children.find(v => v.category == row.originId);
+
+          res.data.
+         console.log(res);
+        });
+      },
+
+      exportData() {
+        this.exportBoxVisible = true;
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.list);
+        });
+      },
+      download(data) {
+        let query = { ...data, ...this.listQuery, ...this.query };
+        request({
+          url: `/Extend/BaseSpecialAction/Actions/Export`,
+          method: "GET",
+          data: query,
+        }).then((res) => {
+          if (!res.data.url) return;
+          window.location.href = this.define.comUrl + res.data.url;
+          this.$refs.ExportBox.visible = false;
+          this.exportBoxVisible = false;
+        });
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        };
+        this.initData();
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false;
+        if (isrRefresh) this.reset();
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined;
+        }
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        };
+        this.initData();
+      },
+    },
+  };
+  </script>
+  <style scoped lang="scss">
+  .common-info-box {
+    :deep(.el-table__body-wrapper.is-scrolling-none) {
+      height: calc(100% - 47px);
+      overflow-y: scroll;
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 6ceadf3..d604f20 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -2,8 +2,8 @@
   <div class="overview">
     <el-row :gutter="20">
       <el-col :span="16">
-        <div class="item-box todo" v-if="isSHILevel">
-          <div class="item-title">任务待办</div>
+        <div class="item-box todo">
+          <div class="item-title">事件中心</div>
           <div class="item-body">
             <template>
               <el-table :data="todoTableData" style="width: 100%" stripe>
@@ -47,8 +47,12 @@
             </template>
           </div>
         </div>
-        <div class="item-box earmarked" :style="`height: calc(${isSHILevel ? '50vh - 115px' : '100vh - 205px'});`">
-          <!-- :style=`"height: ${isSHILevel ? calc(50vh - 115px) : calc(100vh - 205px)};"` -->
+          <!--<div
+          class="item-box earmarked"
+          :style="`height: calc(${
+            isSHILevel ? '50vh - 115px' : '100vh - 205px'
+          });`"
+        >
           <div class="item-title">专项行动</div>
           <div class="item-body">
             <el-row :gutter="6" class="item-one-list">
@@ -80,7 +84,7 @@
               </el-col>
             </el-row>
           </div>
-        </div>
+        </div>-->
       </el-col>
       <el-col :span="8">
         <!-- <div class="item-box tip">
@@ -105,10 +109,19 @@
           </div>
         </div> -->
         <div class="item-box msg">
-          <div class="item-title">通知公告</div>
+          <div class="item-title">
+            <div class="left">通知公告</div>
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link
+                icon="icon-ym icon-ym-Refresh NCC-common-head-icon"
+                :underline="false"
+                @click="resetMsg()"
+              />
+            </el-tooltip>
+          </div>
           <div class="item-body">
             <template>
-              <el-table :data="todoTableData" style="width: 100%" stripe>
+              <el-table :data="msgList" style="width: 100%" stripe>
                 <el-table-column
                   prop="teskName"
                   label="内容"
@@ -137,33 +150,39 @@ import {
   areaObj,
   chObj,
 } from "@/assets/mockdata/demodata.json";
-import { computed } from 'vue';
+import { computed } from "vue";
 export default {
   name: "Overview",
   data() {
     return {
       todoTableData: [],
+      msgList: [],
       tipTableData: [],
       aimList: [],
-    }
+    };
   },
   created() {
-    this.getTodoList();
+    this.getMsgList();
     this.getTipList();
     this.getAimList();
   },
   computed: {
     isSHILevel() {
       // 判断角色是否为‘市级办公室’
-      return this.$store.state.user.userInfo.organizeId == '580547494862128389';
+      return this.$store.state.user.islader;
     },
   },
   methods: {
-    getTodoList() {
+    getMsgList() {
       for (let index = 0; index < 10; index++) {
+        this.msgList.push(todoObj);
         this.todoTableData.push(todoObj);
       }
     },
+    resetMsg() {
+      this.msgList = [];
+      this.getMsgList();
+    },
     getTipList() {
       for (let index = 0; index < 10; index++) {
         this.tipTableData.push(tipObj);
@@ -179,7 +198,6 @@ export default {
       }
     },
   },
-
 };
 </script>
 <style scoped lang="scss">
@@ -190,12 +208,12 @@ export default {
     background-color: rgba(244, 244, 245, 0.38);
     margin-bottom: 15px;
     &.todo {
-      height: calc(50vh - 115px);
+      height: calc(100vh - 210px);
     }
-    &.earmarked {
+    //&.earmarked {
       // height: calc(50vh - 115px);
-      margin-bottom: 0;
-    }
+      //margin-bottom: 0;
+    //}
     // &.tip {
     //   height: calc(50vh - 60px);
     // }
@@ -204,10 +222,16 @@ export default {
       margin-bottom: 0;
     }
     .item-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
       color: rgba(255, 255, 255, 1);
       font-size: 16px;
       line-height: 23px;
       padding: 10px;
+      .el-link.el-link--default {
+        color: #fff !important;
+      }
     }
     .item-body {
       height: calc(100% - 68px);