diff --git a/src/views/baseSpecialAction/FormPage.vue b/src/views/baseSpecialAction/FormPage.vue
index f3cfc42..0bfe664 100644
--- a/src/views/baseSpecialAction/FormPage.vue
+++ b/src/views/baseSpecialAction/FormPage.vue
@@ -51,7 +51,7 @@
                 <el-input-number v-model="dataForm.releaseCount" :min="1" :max="100"></el-input-number>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="发布周期" prop="releaseCount">
                 <el-select v-model="dataForm.releaseCycle" placeholder="请选择">
                   <el-option v-for="item in CycleOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -59,7 +59,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="自动发布" prop="isOpenRelease">
                 <el-radio-group v-model="dataForm.isOpenRelease">
                   <el-radio :label="true">是</el-radio>
@@ -85,6 +85,11 @@
                 </div>
               </el-form-item>
             </el-col>
+            <el-col :span="24" v-if="ncc.hasFormP('communicationArea')">
+              <el-form-item label="填报表单" prop="communicationArea">
+                <el-button size="mini" @click="dialogVisible = true">设计表单</el-button>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" v-if="false">
               <el-form-item label="状态" prop="state">
                 <el-input v-model="dataForm.state" placeholder="请输入" clearable :style="{ width: '100%' }">
@@ -123,20 +128,35 @@
         </span>
       </div>
     </div>
+    <el-dialog title="专项行动表单设计" :visible.sync="dialogVisible" fullscreen >
+      <!-- <webDesignForm ref="webDesignForm"></webDesignForm> -->
+      <iframe 
+        :src="nestedPageUrl" 
+        width="100%" 
+        :height="viewportHeight - 110 + 'px'" 
+        frameborder="0" 
+        allowfullscreen>
+      </iframe>
+    </el-dialog>
   </div>
 </template>
 <script>
 import request from "@/utils/request";
 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
 import { previewDataInterface } from "@/api/systemData/dataInterface";
+import webDesignForm from './webDesign/Form.vue';
+
 export default {
-  components: {},
+  components: { webDesignForm },
   props: [],
   data() {
     return {
       loading: false,
       visible: false,
       isDetail: false,
+      dialogVisible: false,
+      viewportHeight: 0,
+      nestedPageUrl:"http://8.130.38.56:8043/old/#/onlineDev/webDesign/indexNew",
       dataForm: {
         id: undefined,
         specialActionType: undefined,
@@ -150,7 +170,7 @@ export default {
         creatorTime: undefined,
         lastModifyUserId: undefined,
         lastModifyTime: undefined,
-        isOpenRelease:false,
+        isOpenRelease: false,
       },
       rules: {
         specialActionType: [
@@ -194,9 +214,17 @@ export default {
   created() {
     this.getspecialActionTypeOptions();
     this.getcommunicationAreaOptions();
+    this.updateViewportHeight();
+    // 监听窗口大小变化事件
+    window.addEventListener('resize', this.updateViewportHeight);
   },
   mounted() { },
+  beforeDestroy() {
+    // 移除窗口大小变化事件监听器
+    window.removeEventListener('resize', this.updateViewportHeight);
+  },
   methods: {
+
     //查询所有区县
     getcommunicationAreaOptions() {
       request({
@@ -206,6 +234,10 @@ export default {
         this.communicationAreaOptions = res.data;
       });
     },
+    updateViewportHeight() {
+      // 获取页面显示高度
+      this.viewportHeight = window.innerHeight || document.documentElement.clientHeight;
+    },
     getspecialActionTypeOptions() {
       getDictionaryDataSelector("576310654982423813").then((res) => {
         this.specialActionTypeOptions = res.data.list;
@@ -282,3 +314,6 @@ export default {
   },
 };
 </script>
+<style>
+.el-dialog__body{padding: 0px !important;}
+</style>
diff --git a/src/views/baseSpecialAction/webDesign/Form.vue b/src/views/baseSpecialAction/webDesign/Form.vue
new file mode 100644
index 0000000..b2052a8
--- /dev/null
+++ b/src/views/baseSpecialAction/webDesign/Form.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog :visible.sync="visible" fullscreen lock-scroll class="NCC-full-dialog"
+    :show-close="false" :modal="false">
+    <div class="NCC-full-dialog-header">
+      <div class="header-title">
+        <img src="@/assets/images/ncc.png" class="header-logo" />
+        <p class="header-txt"> · 在线开发</p>
+      </div>
+      <el-steps :active="activeStep" finish-status="success" simple
+        :class="'steps steps'+(maxStep+1)" v-if="!loading">
+        <el-step title="基础设置" @click.native="stepChick(0)" />
+        <el-step title="表单设计" @click.native="stepChick(1)" />
+        <el-step title="列表设计" @click.native="stepChick(2)" v-if="maxStep>=2" />
+        <el-step title="流程设计" @click.native="stepChick(3)" v-if="maxStep>=3" />
+      </el-steps>
+      <div class="options">
+        <el-button @click="prve" :disabled="activeStep<=0">{{$t('common.prev')}}</el-button>
+        <el-button @click="next" :disabled="activeStep>=maxStep || loading">{{$t('common.next')}}
+        </el-button>
+        <el-button type="primary" @click="dataFormSubmit()" :disabled="activeStep!=maxStep"
+          :loading="btnLoading">{{$t('common.confirmButton')}}</el-button>
+        <el-button @click="closeDialog()">{{$t('common.cancelButton')}}</el-button>
+      </div>
+    </div>
+    <div class="main" v-loading="loading">
+      <el-row type="flex" justify="center" align="middle" v-if="!activeStep" class="basic-box">
+        <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="10" class="basicForm">
+          <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px"
+            @submit.native.prevent label-position="right">
+            <el-form-item label="功能名称" prop="fullName">
+              <el-input v-model="dataForm.fullName" placeholder="功能名称" maxlength="100">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="功能编码" prop="enCode">
+              <el-input v-model="dataForm.enCode" placeholder="功能编码" maxlength="50">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="功能分类" prop="category">
+              <el-select v-model="dataForm.category" placeholder="选择分类">
+                <el-option :key="item.id" :label="item.fullName" :value="item.id"
+                  v-for="item in categoryList" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="功能状态" prop="state">
+              <el-switch v-model="dataForm.state" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+            <el-form-item label="功能说明" prop="description">
+              <el-input v-model="dataForm.description" placeholder="功能说明" type="textarea"
+                :rows="3" />
+            </el-form-item>
+            <el-form-item label="数据连接">
+              <el-select v-model="dataForm.dbLinkId" placeholder="请选择数据库" @change="onDbChange"
+                clearable>
+                <el-option-group v-for="group in dbOptions" :key="group.fullName"
+                  :label="group.fullName">
+                  <el-option v-for="item in group.children" :key="item.id" :label="item.fullName"
+                    :value="item.id" />
+                </el-option-group>
+              </el-select>
+            </el-form-item>
+            <el-table :data="tables" class="NCC-common-table"
+              empty-text="点击“新增”可选择 1 条（单表）或 2 条以上（多表）">
+              <el-table-column type="index" label="序号" width="50" align="center" />
+              <el-table-column prop="typeId" label="类别" width="65">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.typeId=='1'">主表</el-tag>
+                  <el-tag type="warning" v-else @click="changeTable(scope.row)"
+                    style="cursor:pointer" title="点击设置成主表">子表</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="tableName" label="说明" />
+              <el-table-column prop="table" label="表名" />
+              <el-table-column prop="tableField" label="外键字段">
+                <template slot-scope="scope" v-if="scope.row.typeId !=='1'">
+                  <el-select v-model="scope.row.tableField" placeholder="请选择">
+                    <el-option v-for="item in scope.row.fields" :key="item.field"
+                      :label="item.field" :value="item.field">
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="relationTable" label="关联主表" /> -->
+              <el-table-column prop="relationField" label="关联主键">
+                <template slot-scope="scope" v-if="scope.row.typeId !=='1'">
+                  <el-select v-model="scope.row.relationField" placeholder="请选择">
+                    <el-option v-for="item in mainTableFields" :key="item.field" :label="item.field"
+                      :value="item.field">
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="50">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="text" class="NCC-table-delBtn"
+                    @click="delItem(scope.row,scope.$index)">删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="table-actions" @click="openTableBox">
+              <el-button type="text" icon="el-icon-plus">新增一行</el-button>
+            </div>
+          </el-form>
+        </el-col>
+      </el-row>
+      <template v-if="activeStep==1">
+        <Generator ref="generator" :conf="formData" :modelType="dataForm.type"
+          :webType="dataForm.webType" />
+      </template>
+      <template v-if="activeStep==2">
+        <columnDesign ref="columnDesign" :conf="columnData" />
+      </template>
+      <template v-if="activeStep==3">
+        <Process ref="process" :conf="flowTemplateJson" :flowType="1" />
+      </template>
+    </div>
+    <TableForm :visible.sync="formVisible" ref="tableForm" @closeForm="colseForm"
+      :dbLinkId="dataForm.dbLinkId" />
+  </el-dialog>
+</template>
+
+<script>
+import Generator from '@/components/Generator/index/Home'
+import ColumnDesign from '@/components/ColumnDesign/index'
+import Process from "@/components/Process"
+import TableForm from '@/views/generator/TableForm'
+import mixin from '@/mixins/generator/form'
+export default {
+  mixins: [mixin],
+  components: { Generator, ColumnDesign, Process, TableForm },
+  data() {
+    return {
+      dataRule: {
+        fullName: [
+          { required: true, message: '功能名称不能为空', trigger: 'blur' },
+        ],
+        enCode: [
+          { required: true, message: '功能编码不能为空', trigger: 'blur' },
+          { validator: this.formValidate('enCode'), trigger: 'blur' },
+        ],
+        category: [
+          { required: true, message: '功能分类不能为空', trigger: 'change' },
+        ]
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/webDesign/index.vue b/src/views/baseSpecialAction/webDesign/index.vue
new file mode 100644
index 0000000..2546b10
--- /dev/null
+++ b/src/views/baseSpecialAction/webDesign/index.vue
@@ -0,0 +1,105 @@
+<template>
+  <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>
+          <el-col :span="6">
+            <el-form-item label="关键词">
+              <el-input v-model="query.keyword" placeholder="请输入关键词查询" clearable
+                @keyup.enter.native="search()" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">
+                {{$t('common.search')}}</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">{{$t('common.reset')}}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="NCC-common-layout-main NCC-flex-main">
+        <div class="NCC-common-head">
+          <topOpts @add="addVisible=true">
+            <upload-btn url="/api/visualdev/OnlineDev/Model/Actions/ImportData"
+              @on-success="initData" />
+          </topOpts>
+          <div class="NCC-common-head-right">
+            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+                @click="reset()" />
+            </el-tooltip>
+            <screenfull />
+          </div>
+        </div>
+        <NCC-table v-loading="listLoading" :data="list" row-key="id"
+          :tree-props="{children: 'children', hasChildren: ''}" default-expand-all>
+          <el-table-column prop="fullName" label="名称" show-overflow-tooltip min-width="200">
+            <template slot-scope="scope">
+              <span v-if="scope.row.top"
+                style="font-weight:bold;">{{scope.row.fullName}}【{{scope.row.num}}】</span>
+              <span v-else>{{scope.row.fullName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="enCode" label="编码" width="200" />
+          <el-table-column prop="creatorUser" label="创建人" width="120" />
+          <el-table-column prop="creatorTime" label="创建时间" :formatter="ncc.tableDateFormat"
+            width="120" />
+          <el-table-column prop="lastModifyUser" label="最后修改人" width="120" />
+          <el-table-column prop="lastModifyTime" label="最后修改时间" :formatter="ncc.tableDateFormat"
+            width="120" />
+          <el-table-column label="状态" width="70" align="center">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <el-tag :type="scope.row.state == 1 ? 'success' : 'danger'" disable-transitions>
+                {{scope.row.state==1?'正常':'停用'}}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <tableOpts @edit="addOrUpdateHandle(scope.row.id)" @del="handleDel(scope.row.id)">
+                <el-dropdown>
+                  <span class="el-dropdown-link">
+                    <el-button type="text" size="mini">{{$t('common.moreBtn')}}<i
+                        class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item @click.native="copy(scope.row.id)">复制</el-dropdown-item>
+                    <el-dropdown-item @click.native="preview(scope.row.id)">预览</el-dropdown-item>
+                    <el-dropdown-item @click.native="exportModel(scope.row.id)">导出
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </tableOpts>
+            </template>
+          </el-table-column>
+        </NCC-table>
+      </div>
+    </div>
+    <Form v-if="formVisible" ref="Form" @close="colseForm" />
+    <AddBox :visible.sync="addVisible" @add="handleAdd" />
+  </div>
+</template>
+
+<script>
+import Form from './Form'
+import AddBox from '@/views/generator/AddBox'
+import mixin from '@/mixins/generator/index'
+export default {
+  name: 'onlineDev-webDesign',
+  mixins: [mixin],
+  components: { Form, AddBox },
+  data() {
+    return {
+      query: { keyword: '', type: 1 },
+      sort: 'webDesign'
+    }
+  },
+  methods: {
+    preview(id) {
+      this.$router.push(`/previewModel?isPreview=1&id=${id}`)
+    }
+  }
+}
+</script>
\ No newline at end of file