From 5e480fa1712d924d63c2491fa85621bc33e550ac Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@surfbird.cn>
Date: Wed, 11 May 2022 17:38:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E7=AB=A0=E5=BD=95=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/nd/GatewayArticleListLb.vue | 344 ++++++++++++++++++
 src/views/modules/nd/GatewayArticleListQy.vue | 344 ++++++++++++++++++
 .../modules/nd/GatewayArticleListUse.vue      | 344 ++++++++++++++++++
 src/views/modules/nd/GatewayColumnList.vue    |  23 +-
 .../nd/modules/GatewayArticleFormLb.vue       | 251 +++++++++++++
 .../nd/modules/GatewayArticleFormQy.vue       | 250 +++++++++++++
 .../nd/modules/GatewayArticleFormUse.vue      | 250 +++++++++++++
 .../nd/modules/GatewayArticleModalLb.vue      |  60 +++
 .../nd/modules/GatewayArticleModalQy.vue      |  60 +++
 .../nd/modules/GatewayArticleModalUse.vue     |  60 +++
 .../modules/nd/modules/GatewayColumnForm.vue  |  12 +-
 11 files changed, 1981 insertions(+), 17 deletions(-)
 create mode 100644 src/views/modules/nd/GatewayArticleListLb.vue
 create mode 100644 src/views/modules/nd/GatewayArticleListQy.vue
 create mode 100644 src/views/modules/nd/GatewayArticleListUse.vue
 create mode 100644 src/views/modules/nd/modules/GatewayArticleFormLb.vue
 create mode 100644 src/views/modules/nd/modules/GatewayArticleFormQy.vue
 create mode 100644 src/views/modules/nd/modules/GatewayArticleFormUse.vue
 create mode 100644 src/views/modules/nd/modules/GatewayArticleModalLb.vue
 create mode 100644 src/views/modules/nd/modules/GatewayArticleModalQy.vue
 create mode 100644 src/views/modules/nd/modules/GatewayArticleModalUse.vue

diff --git a/src/views/modules/nd/GatewayArticleListLb.vue b/src/views/modules/nd/GatewayArticleListLb.vue
new file mode 100644
index 0000000..fb01c12
--- /dev/null
+++ b/src/views/modules/nd/GatewayArticleListLb.vue
@@ -0,0 +1,344 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="标题">
+              <j-input placeholder="请输入标题" v-model="queryParam.title"></j-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="分类-栏目表ID">
+              <a-input placeholder="请输入分类-栏目表ID" v-model="queryParam.columnId"></a-input>
+            </a-form-item>
+          </a-col> -->
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="作者">
+                <a-input placeholder="请输入作者" v-model="queryParam.author"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来源">
+                <a-input placeholder="请输入来源" v-model="queryParam.source"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否发布">
+                <j-switch placeholder="请选择是否发布" v-model="queryParam.isRelease"  query></j-switch>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('门户-文章')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <gateway-article-modal ref="modalForm" @ok="modalFormOk"></gateway-article-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import GatewayArticleModal from './modules/GatewayArticleModalLb'
+  import JSwitch from '@/components/jeecg/JSwitch'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+  import { filterObj } from '@/utils/util';
+
+  export default {
+    name: 'GatewayArticleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      JSwitch,
+      GatewayArticleModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '门户-文章管理页面', 
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          // {
+          //   title:'创建人',
+          //   align:"center",
+          //   dataIndex: 'createBy'
+          // },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'更新人',
+          //   align:"center",
+          //   dataIndex: 'updateBy'
+          // },
+          {
+            title:'更新日期',
+            align:"center",
+            dataIndex: 'updateTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'所属部门',
+          //   align:"center",
+          //   dataIndex: 'sysOrgCode'
+          // },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          // {
+          //   title:'title',
+          //   align:"center",
+          //   dataIndex: 'titleen'
+          // },
+          {
+            title:'栏目',
+            align:"center",
+            dataIndex: 'columnId_dictText'
+          },
+          {
+            title:'封面图',
+            align:"center",
+            dataIndex: 'cover',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          // {
+          //   title:'center',
+          //   align:"center",
+          //   dataIndex: 'coveren',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
+          {
+            title:'作者',
+            align:"center",
+            dataIndex: 'author'
+          },
+          // {
+          //   title:'author',
+          //   align:"center",
+          //   dataIndex: 'authoren'
+          // },
+          {
+            title:'来源',
+            align:"center",
+            dataIndex: 'source'
+          },
+          // {
+          //   title:'source',
+          //   align:"center",
+          //   dataIndex: 'sourceen'
+          // },
+          // {
+          //   title:'文章内容',
+          //   align:"center",
+          //   dataIndex: 'content',
+          //   scopedSlots: {customRender: 'htmlSlot'}
+          // },
+          // {
+          //   title:'文章内容-英文版',
+          //   align:"center",
+          //   dataIndex: 'contenten',
+          //   scopedSlots: {customRender: 'htmlSlot'}
+          // },
+          {
+            title:'是否发布',
+            align:"center",
+            dataIndex: 'isRelease',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isRelease'], text) : ''),
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/gateway/gatewayArticle/list",
+          delete: "/gateway/gatewayArticle/delete",
+          deleteBatch: "/gateway/gatewayArticle/deleteBatch",
+          exportXlsUrl: "/gateway/gatewayArticle/exportXls",
+          importExcelUrl: "gateway/gatewayArticle/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isRelease', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+      columnId(){
+        return this.$route.query.columnId || '-1';
+      },
+    },
+    watch:{
+      columnId(){
+        this.loadData(1);
+      }
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        param.columnId = this.columnId;
+        return filterObj(param);
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+        fieldList.push({type:'date',value:'updateTime',text:'更新日期'})
+        fieldList.push({type:'string',value:'sysOrgCode',text:'所属部门',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'titleen',text:'标题-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'columnId',text:'栏目',dictCode:''})
+        fieldList.push({type:'string',value:'cover',text:'封面图',dictCode:''})
+        fieldList.push({type:'string',value:'coveren',text:'封面图-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'author',text:'作者',dictCode:''})
+        fieldList.push({type:'string',value:'authoren',text:'作者-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'source',text:'来源',dictCode:''})
+        fieldList.push({type:'string',value:'sourceen',text:'来源-英文版',dictCode:''})
+        fieldList.push({type:'Text',value:'content',text:'文章内容',dictCode:''})
+        fieldList.push({type:'Text',value:'contenten',text:'文章内容-英文版',dictCode:''})
+        fieldList.push({type:'switch',value:'isRelease',text:'是否发布(Y:是N:否)'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/modules/nd/GatewayArticleListQy.vue b/src/views/modules/nd/GatewayArticleListQy.vue
new file mode 100644
index 0000000..34254ec
--- /dev/null
+++ b/src/views/modules/nd/GatewayArticleListQy.vue
@@ -0,0 +1,344 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="标题">
+              <j-input placeholder="请输入标题" v-model="queryParam.title"></j-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="栏目">
+              <a-input placeholder="请输入栏目" v-model="queryParam.columnId"></a-input>
+            </a-form-item>
+          </a-col> -->
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="作者">
+                <a-input placeholder="请输入作者" v-model="queryParam.author"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来源">
+                <a-input placeholder="请输入来源" v-model="queryParam.source"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否发布">
+                <j-switch placeholder="请选择是否发布" v-model="queryParam.isRelease"  query></j-switch>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('门户-文章')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <gateway-article-modal ref="modalForm" @ok="modalFormOk"></gateway-article-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import GatewayArticleModal from './modules/GatewayArticleModalQy'
+  import JSwitch from '@/components/jeecg/JSwitch'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+  import { filterObj } from '@/utils/util';
+
+  export default {
+    name: 'GatewayArticleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      JSwitch,
+      GatewayArticleModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '门户-文章管理页面', 
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          // {
+          //   title:'创建人',
+          //   align:"center",
+          //   dataIndex: 'createBy'
+          // },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'更新人',
+          //   align:"center",
+          //   dataIndex: 'updateBy'
+          // },
+          {
+            title:'更新日期',
+            align:"center",
+            dataIndex: 'updateTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'所属部门',
+          //   align:"center",
+          //   dataIndex: 'sysOrgCode'
+          // },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          // {
+          //   title:'title',
+          //   align:"center",
+          //   dataIndex: 'titleen'
+          // },
+          {
+            title:'栏目',
+            align:"center",
+            dataIndex: 'columnId_dictText'
+          },
+          // {
+          //   title:'封面图',
+          //   align:"center",
+          //   dataIndex: 'cover',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
+          // {
+          //   title:'center',
+          //   align:"center",
+          //   dataIndex: 'coveren',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
+          {
+            title:'作者',
+            align:"center",
+            dataIndex: 'author'
+          },
+          // {
+          //   title:'author',
+          //   align:"center",
+          //   dataIndex: 'authoren'
+          // },
+          // {
+          //   title:'来源',
+          //   align:"center",
+          //   dataIndex: 'source'
+          // },
+          // {
+          //   title:'source',
+          //   align:"center",
+          //   dataIndex: 'sourceen'
+          // },
+          // {
+          //   title:'文章内容',
+          //   align:"center",
+          //   dataIndex: 'content',
+          //   scopedSlots: {customRender: 'htmlSlot'}
+          // },
+          // {
+          //   title:'文章内容-英文版',
+          //   align:"center",
+          //   dataIndex: 'contenten',
+          //   scopedSlots: {customRender: 'htmlSlot'}
+          // },
+          {
+            title:'是否发布',
+            align:"center",
+            dataIndex: 'isRelease',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isRelease'], text) : ''),
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/gateway/gatewayArticle/list",
+          delete: "/gateway/gatewayArticle/delete",
+          deleteBatch: "/gateway/gatewayArticle/deleteBatch",
+          exportXlsUrl: "/gateway/gatewayArticle/exportXls",
+          importExcelUrl: "gateway/gatewayArticle/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isRelease', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+      columnId(){
+        return this.$route.query.columnId || '-1';
+      },
+    },
+    watch:{
+      columnId(){
+        this.loadData(1);
+      }
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        param.columnId = this.columnId;
+        return filterObj(param);
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+        fieldList.push({type:'date',value:'updateTime',text:'更新日期'})
+        fieldList.push({type:'string',value:'sysOrgCode',text:'所属部门',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'titleen',text:'标题-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'columnId',text:'栏目',dictCode:''})
+        fieldList.push({type:'string',value:'cover',text:'封面图',dictCode:''})
+        fieldList.push({type:'string',value:'coveren',text:'封面图-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'author',text:'作者',dictCode:''})
+        fieldList.push({type:'string',value:'authoren',text:'作者-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'source',text:'来源',dictCode:''})
+        fieldList.push({type:'string',value:'sourceen',text:'来源-英文版',dictCode:''})
+        fieldList.push({type:'Text',value:'content',text:'文章内容',dictCode:''})
+        fieldList.push({type:'Text',value:'contenten',text:'文章内容-英文版',dictCode:''})
+        fieldList.push({type:'switch',value:'isRelease',text:'是否发布(Y:是N:否)'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/modules/nd/GatewayArticleListUse.vue b/src/views/modules/nd/GatewayArticleListUse.vue
new file mode 100644
index 0000000..f17db28
--- /dev/null
+++ b/src/views/modules/nd/GatewayArticleListUse.vue
@@ -0,0 +1,344 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="标题">
+              <j-input placeholder="请输入标题" v-model="queryParam.title"></j-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="栏目">
+              <a-input placeholder="请输入栏目" v-model="queryParam.columnId"></a-input>
+            </a-form-item>
+          </a-col> -->
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="作者">
+                <a-input placeholder="请输入作者" v-model="queryParam.author"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来源">
+                <a-input placeholder="请输入来源" v-model="queryParam.source"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否发布">
+                <j-switch placeholder="请选择是否发布" v-model="queryParam.isRelease"  query></j-switch>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('门户-文章')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <gateway-article-modal ref="modalForm" @ok="modalFormOk"></gateway-article-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import GatewayArticleModal from './modules/GatewayArticleModalUse'
+  import JSwitch from '@/components/jeecg/JSwitch'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+  import { filterObj } from '@/utils/util';
+
+  export default {
+    name: 'GatewayArticleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      JSwitch,
+      GatewayArticleModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '门户-文章管理页面', 
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          // {
+          //   title:'创建人',
+          //   align:"center",
+          //   dataIndex: 'createBy'
+          // },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'更新人',
+          //   align:"center",
+          //   dataIndex: 'updateBy'
+          // },
+          {
+            title:'更新日期',
+            align:"center",
+            dataIndex: 'updateTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          // {
+          //   title:'所属部门',
+          //   align:"center",
+          //   dataIndex: 'sysOrgCode'
+          // },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          // {
+          //   title:'title',
+          //   align:"center",
+          //   dataIndex: 'titleen'
+          // },
+          {
+            title:'栏目',
+            align:"center",
+            dataIndex: 'columnId_dictText'
+          },
+          // {
+          //   title:'封面图',
+          //   align:"center",
+          //   dataIndex: 'cover',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
+          // {
+          //   title:'center',
+          //   align:"center",
+          //   dataIndex: 'coveren',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
+          {
+            title:'作者',
+            align:"center",
+            dataIndex: 'author'
+          },
+          // {
+          //   title:'author',
+          //   align:"center",
+          //   dataIndex: 'authoren'
+          // },
+          // {
+          //   title:'来源',
+          //   align:"center",
+          //   dataIndex: 'source'
+          // },
+          // {
+          //   title:'source',
+          //   align:"center",
+          //   dataIndex: 'sourceen'
+          // },
+          // {
+          //   title:'文章内容',
+          //   align:"center",
+          //   dataIndex: 'content',
+          //   scopedSlots: {customRender: 'htmlSlot'}
+          // },
+          // {
+          //   title:'文章内容-英文版',
+          //   align:"center",
+          //   dataIndex: 'contenten',
+          //   scopedSlots: {customRender: 'htmlSlot'}
+          // },
+          {
+            title:'是否发布',
+            align:"center",
+            dataIndex: 'isRelease',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isRelease'], text) : ''),
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/gateway/gatewayArticle/list",
+          delete: "/gateway/gatewayArticle/delete",
+          deleteBatch: "/gateway/gatewayArticle/deleteBatch",
+          exportXlsUrl: "/gateway/gatewayArticle/exportXls",
+          importExcelUrl: "gateway/gatewayArticle/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isRelease', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+      columnId(){
+        return this.$route.query.columnId || '-1';
+      },
+    },
+    watch:{
+      columnId(){
+        this.loadData(1);
+      }
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        param.columnId = this.columnId;
+        return filterObj(param);
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+        fieldList.push({type:'date',value:'updateTime',text:'更新日期'})
+        fieldList.push({type:'string',value:'sysOrgCode',text:'所属部门',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'titleen',text:'标题-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'columnId',text:'栏目',dictCode:''})
+        fieldList.push({type:'string',value:'cover',text:'封面图',dictCode:''})
+        fieldList.push({type:'string',value:'coveren',text:'封面图-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'author',text:'作者',dictCode:''})
+        fieldList.push({type:'string',value:'authoren',text:'作者-英文版',dictCode:''})
+        fieldList.push({type:'string',value:'source',text:'来源',dictCode:''})
+        fieldList.push({type:'string',value:'sourceen',text:'来源-英文版',dictCode:''})
+        fieldList.push({type:'Text',value:'content',text:'文章内容',dictCode:''})
+        fieldList.push({type:'Text',value:'contenten',text:'文章内容-英文版',dictCode:''})
+        fieldList.push({type:'switch',value:'isRelease',text:'是否发布(Y:是N:否)'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/modules/nd/GatewayColumnList.vue b/src/views/modules/nd/GatewayColumnList.vue
index 2db4ed4..728c977 100644
--- a/src/views/modules/nd/GatewayColumnList.vue
+++ b/src/views/modules/nd/GatewayColumnList.vue
@@ -6,7 +6,8 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="名称">
-              <a-input placeholder="请输入名称" v-model="queryParam.name"></a-input>
+              <!-- <a-input placeholder="请输入名称" v-model="queryParam.name"></a-input> -->
+              <j-input placeholder="请输入名称" v-model="queryParam.name"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -196,16 +197,16 @@
           //   align:"center",
           //   dataIndex: 'nameen'
           // },
-          {
-            title:'排序',
-            align:"center",
-            dataIndex: 'sort'
-          },
-          {
-            title:'类型',
-            align:"center",
-            dataIndex: 'type_dictText'
-          },
+          // {
+          //   title:'排序',
+          //   align:"center",
+          //   dataIndex: 'sort'
+          // },
+          // {
+          //   title:'类型',
+          //   align:"center",
+          //   dataIndex: 'type_dictText'
+          // },
           // {
           //   title:'上级ID 0为顶级',
           //   align:"center",
diff --git a/src/views/modules/nd/modules/GatewayArticleFormLb.vue b/src/views/modules/nd/modules/GatewayArticleFormLb.vue
new file mode 100644
index 0000000..c2c0d3c
--- /dev/null
+++ b/src/views/modules/nd/modules/GatewayArticleFormLb.vue
@@ -0,0 +1,251 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['title', validatorRules.title]" placeholder="请输入标题"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="封面图" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-image-upload isMultiple  v-decorator="['cover']" ></j-image-upload>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="作者" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['author', validatorRules.author]" placeholder="请输入作者"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="文章内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-editor v-decorator="['content',{trigger:'input',rules:validatorRules.content.rules}]" />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="24">
+            <a-form-item label="正文文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload bizPath="contentFile" v-decorator="['contentFile']" :trigger-change="true"/>
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-item label="附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload bizPath="fujian" v-decorator="['files']" :trigger-change="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="是否发布" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-switch v-decorator="['isRelease', validatorRules.isRelease]"  ></j-switch>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'
+  import JImageUpload from '@/components/jeecg/JImageUpload'
+  import JEditor from '@/components/jeecg/JEditor'
+  import JSwitch from '@/components/jeecg/JSwitch'
+
+  export default {
+    name: 'GatewayArticleForm',
+    components: {
+      JFormContainer,
+      JDate,
+      JImageUpload,
+      JEditor,
+      JSwitch,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        // columnIdDictCode: 'tqd_gateway_column,name,id,parent is not null',
+        columnIdDictCode: 'tqd_gateway_column,name,id',
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          title: {
+            rules: [
+              { required: true, message: '请输入标题!'},
+            ]
+          },
+          titleen: {
+            rules: [
+              { required: true, message: ' Please Input Title!'},
+            ]
+          },
+          type: {
+            rules: [
+              // { required: true, message: '请选择文章类型!'},
+            ]
+          },
+          columnId: {
+            rules: [
+              { required: true, message: '请选择栏目!'},
+            ]
+          },
+          author: {
+            rules: [
+              // { required: true, message: '请输入作者!'},
+            ]
+          },
+          source: {
+            rules: [
+              // { required: true, message: '请输入来源!'},
+            ]
+          },
+          isRelease: {
+            rules: [
+              // { required: true, message: '请输入是否发布!'},
+            ]
+          },
+          content: {
+            rules: [
+              // { required: true, message: '请输入文章内容!'},
+            ]
+          },
+          contenten: {
+            rules: [
+              { required: true, message: ' Please Input Content!'},
+            ]
+          },
+        },
+        url: {
+          add: "/gateway/gatewayArticle/add",
+          edit: "/gateway/gatewayArticle/edit",
+          queryById: "/gateway/gatewayArticle/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      },
+      columnId(){
+        return this.$route.query.columnId || '-1';
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        // this.columnIdDictCode = 'tqd_gateway_column,name,id,id=-1',
+        // this.$nextTick(() => this.$nextTick(() => this.columnIdDictCode = 'tqd_gateway_column,name,id,parent is not null'));
+        this.$refs.dictRef.initDictData();
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','title','titleen','type','columnId','cover','coveren','author','authoren','source','sourceen','content','contenten','files','filesen','isRelease'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+              method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+
+            formData.type = '首页轮播' ;
+            formData.columnId = this.columnId;
+
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','title','titleen','type','columnId','cover','coveren','author','authoren','source','sourceen','content','contenten','files','filesen','isRelease'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/nd/modules/GatewayArticleFormQy.vue b/src/views/modules/nd/modules/GatewayArticleFormQy.vue
new file mode 100644
index 0000000..29322db
--- /dev/null
+++ b/src/views/modules/nd/modules/GatewayArticleFormQy.vue
@@ -0,0 +1,250 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <!-- <a-col :span="24">
+            <a-form-item label="栏目" :labelCol="labelCol" :wrapperCol="wrapperCol" help="请选择对应的二级栏目">
+              <j-dict-select-tag ref="dictRef" type="list" v-decorator="['columnId', validatorRules.parent]" :trigger-change="true" :dictCode="columnIdDictCode" placeholder="请选栏目" />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['title', validatorRules.title]" placeholder="请输入标题"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="封面图" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-image-upload isMultiple  v-decorator="['cover']" ></j-image-upload>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="作者" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['author', validatorRules.author]" placeholder="请输入作者"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="文章内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-editor v-decorator="['content',{trigger:'input',rules:validatorRules.content.rules}]" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload bizPath="fujian" v-decorator="['files']" :trigger-change="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="是否发布" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-switch v-decorator="['isRelease', validatorRules.isRelease]"  ></j-switch>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'
+  import JImageUpload from '@/components/jeecg/JImageUpload'
+  import JEditor from '@/components/jeecg/JEditor'
+  import JSwitch from '@/components/jeecg/JSwitch'
+
+  export default {
+    name: 'GatewayArticleForm',
+    components: {
+      JFormContainer,
+      JDate,
+      JImageUpload,
+      JEditor,
+      JSwitch,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        // columnIdDictCode: 'tqd_gateway_column,name,id,parent is not null',
+        columnIdDictCode: 'tqd_gateway_column,name,id',
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          title: {
+            rules: [
+              { required: true, message: '请输入标题!'},
+            ]
+          },
+          titleen: {
+            rules: [
+              { required: true, message: ' Please Input Title!'},
+            ]
+          },
+          type: {
+            rules: [
+              // { required: true, message: '请选择文章类型!'},
+            ]
+          },
+          columnId: {
+            rules: [
+              { required: true, message: '请选择栏目!'},
+            ]
+          },
+          author: {
+            rules: [
+              // { required: true, message: '请输入作者!'},
+            ]
+          },
+          source: {
+            rules: [
+              // { required: true, message: '请输入来源!'},
+            ]
+          },
+          isRelease: {
+            rules: [
+              // { required: true, message: '请输入是否发布!'},
+            ]
+          },
+          content: {
+            rules: [
+              // { required: true, message: '请输入文章内容!'},
+            ]
+          },
+          contenten: {
+            rules: [
+              { required: true, message: ' Please Input Content!'},
+            ]
+          },
+        },
+        url: {
+          add: "/gateway/gatewayArticle/add",
+          edit: "/gateway/gatewayArticle/edit",
+          queryById: "/gateway/gatewayArticle/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      },
+      columnId(){
+        return this.$route.query.columnId || '-1';
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        // this.columnIdDictCode = 'tqd_gateway_column,name,id,id=-1',
+        // this.$nextTick(() => this.$nextTick(() => this.columnIdDictCode = 'tqd_gateway_column,name,id,parent is not null'));
+        this.$refs.dictRef.initDictData();
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','title','titleen','type','columnId','cover','coveren','author','authoren','source','sourceen','content','contenten','files','filesen','isRelease'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+              method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+
+            formData.columnId = this.columnId;
+
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','title','titleen','type','columnId','cover','coveren','author','authoren','source','sourceen','content','contenten','files','filesen','isRelease'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/nd/modules/GatewayArticleFormUse.vue b/src/views/modules/nd/modules/GatewayArticleFormUse.vue
new file mode 100644
index 0000000..79835da
--- /dev/null
+++ b/src/views/modules/nd/modules/GatewayArticleFormUse.vue
@@ -0,0 +1,250 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <!-- <a-col :span="24">
+            <a-form-item label="栏目" :labelCol="labelCol" :wrapperCol="wrapperCol" help="请选择对应的二级栏目">
+              <j-dict-select-tag ref="dictRef" type="list" v-decorator="['columnId', validatorRules.parent]" :trigger-change="true" :dictCode="columnIdDictCode" placeholder="请选栏目" />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['title', validatorRules.title]" placeholder="请输入标题"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="24">
+            <a-form-item label="封面图" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-image-upload isMultiple  v-decorator="['cover']" ></j-image-upload>
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-item label="作者" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['author', validatorRules.author]" placeholder="请输入作者"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="文章内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-editor v-decorator="['content',{trigger:'input',rules:validatorRules.content.rules}]" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload bizPath="fujian" v-decorator="['files']" :trigger-change="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="是否发布" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-switch v-decorator="['isRelease', validatorRules.isRelease]"  ></j-switch>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'
+  import JImageUpload from '@/components/jeecg/JImageUpload'
+  import JEditor from '@/components/jeecg/JEditor'
+  import JSwitch from '@/components/jeecg/JSwitch'
+
+  export default {
+    name: 'GatewayArticleForm',
+    components: {
+      JFormContainer,
+      JDate,
+      JImageUpload,
+      JEditor,
+      JSwitch,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        // columnIdDictCode: 'tqd_gateway_column,name,id,parent is not null',
+        columnIdDictCode: 'tqd_gateway_column,name,id',
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          title: {
+            rules: [
+              { required: true, message: '请输入标题!'},
+            ]
+          },
+          titleen: {
+            rules: [
+              { required: true, message: ' Please Input Title!'},
+            ]
+          },
+          type: {
+            rules: [
+              // { required: true, message: '请选择文章类型!'},
+            ]
+          },
+          columnId: {
+            rules: [
+              { required: true, message: '请选择栏目!'},
+            ]
+          },
+          author: {
+            rules: [
+              // { required: true, message: '请输入作者!'},
+            ]
+          },
+          source: {
+            rules: [
+              // { required: true, message: '请输入来源!'},
+            ]
+          },
+          isRelease: {
+            rules: [
+              // { required: true, message: '请输入是否发布!'},
+            ]
+          },
+          content: {
+            rules: [
+              // { required: true, message: '请输入文章内容!'},
+            ]
+          },
+          contenten: {
+            rules: [
+              { required: true, message: ' Please Input Content!'},
+            ]
+          },
+        },
+        url: {
+          add: "/gateway/gatewayArticle/add",
+          edit: "/gateway/gatewayArticle/edit",
+          queryById: "/gateway/gatewayArticle/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      },
+      columnId(){
+        return this.$route.query.columnId || '-1';
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        // this.columnIdDictCode = 'tqd_gateway_column,name,id,id=-1',
+        // this.$nextTick(() => this.$nextTick(() => this.columnIdDictCode = 'tqd_gateway_column,name,id,parent is not null'));
+        this.$refs.dictRef.initDictData();
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','title','titleen','type','columnId','cover','coveren','author','authoren','source','sourceen','content','contenten','files','filesen','isRelease'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+              method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+
+            formData.columnId = this.columnId;
+
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','title','titleen','type','columnId','cover','coveren','author','authoren','source','sourceen','content','contenten','files','filesen','isRelease'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/nd/modules/GatewayArticleModalLb.vue b/src/views/modules/nd/modules/GatewayArticleModalLb.vue
new file mode 100644
index 0000000..0b9269e
--- /dev/null
+++ b/src/views/modules/nd/modules/GatewayArticleModalLb.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <gateway-article-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></gateway-article-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import GatewayArticleForm from './GatewayArticleFormLb'
+  export default {
+    name: 'GatewayArticleModal',
+    components: {
+      GatewayArticleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:'80vw',
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/nd/modules/GatewayArticleModalQy.vue b/src/views/modules/nd/modules/GatewayArticleModalQy.vue
new file mode 100644
index 0000000..279d376
--- /dev/null
+++ b/src/views/modules/nd/modules/GatewayArticleModalQy.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <gateway-article-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></gateway-article-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import GatewayArticleForm from './GatewayArticleFormQy'
+  export default {
+    name: 'GatewayArticleModal',
+    components: {
+      GatewayArticleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:'80vw',
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/nd/modules/GatewayArticleModalUse.vue b/src/views/modules/nd/modules/GatewayArticleModalUse.vue
new file mode 100644
index 0000000..dece727
--- /dev/null
+++ b/src/views/modules/nd/modules/GatewayArticleModalUse.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <gateway-article-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></gateway-article-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import GatewayArticleForm from './GatewayArticleFormUse'
+  export default {
+    name: 'GatewayArticleModal',
+    components: {
+      GatewayArticleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:'80vw',
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/nd/modules/GatewayColumnForm.vue b/src/views/modules/nd/modules/GatewayColumnForm.vue
index 90cadd7..3ecd0ba 100644
--- a/src/views/modules/nd/modules/GatewayColumnForm.vue
+++ b/src/views/modules/nd/modules/GatewayColumnForm.vue
@@ -38,21 +38,21 @@
               <a-input v-decorator="['nameen',validatorRules.nameen]" placeholder="请输入name"  ></a-input>
             </a-form-item>
           </a-col> -->
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="图标" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload bizPath="icon" v-decorator="['icon']" :trigger-change="true"/>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <!-- <a-col :span="12">
             <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" >
               <a-input v-decorator="['sort', validatorRules.sort]" placeholder="排序"  ></a-input>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <!-- <a-col :span="12">
             <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" help="栏目的类型，不选中则显示在首页头部">
               <j-dict-select-tag ref="dictRef" type="list" v-decorator="['type', validatorRules.type]" :trigger-change="true" dictCode="gateway_column_type" placeholder="请选择类型" />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-item label="父栏目" :labelCol="labelCol" :wrapperCol="wrapperCol" help="不选择为父栏目">
               <!-- <a-input v-decorator="['parent', validatorRules.parent]" placeholder="请选择上级"  ></a-input> -->

From 19dac2087fe5d114726fc1a6d2ac960b471bd2e7 Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@surfbird.cn>
Date: Thu, 12 May 2022 09:28:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/gateway/common/main.vue   | 2 +-
 src/views/gateway/detailedPage.vue  | 2 +-
 src/views/gateway/detailedPage2.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/gateway/common/main.vue b/src/views/gateway/common/main.vue
index f1e2615..e6fc157 100644
--- a/src/views/gateway/common/main.vue
+++ b/src/views/gateway/common/main.vue
@@ -18,7 +18,7 @@
 								</a>
 							</li>
 						</ul> -->
-						<el-carousel height="100px" direction="vertical" :autoplay="true">
+						<el-carousel height="100px" direction="vertical" :autoplay="true" indicator-position="outside">
 							<el-carousel-item v-for="(tt,ttIndex) in ttList" :key="ttIndex" class="toutiaoItem">
 								<h2 class="toutiaoH" @click="$to('detailedPage',{id:tt.id})">{{tt.title}}</h2>
 								<p class="elli" @click="$to('detailedPage',{id:tt.id})">{{$tfnm(tt,'content',60)}}</p>
diff --git a/src/views/gateway/detailedPage.vue b/src/views/gateway/detailedPage.vue
index c4bcb68..5235f87 100644
--- a/src/views/gateway/detailedPage.vue
+++ b/src/views/gateway/detailedPage.vue
@@ -45,7 +45,7 @@
 					<h3>{{articleData.title}}</h3>
 					<div class="xqer_date">
 						<span>发布日期：<span>{{articleData.updateTime || articleData.createTime}}</span></span>
-						<span>作者：<span>{{articleData.author}}</span></span>
+						<span v-show="articleData.author">作者：<span>{{articleData.author}}</span></span>
 					</div>
 					<p v-html="articleData.content"></p>
 					
diff --git a/src/views/gateway/detailedPage2.vue b/src/views/gateway/detailedPage2.vue
index 78f8046..0b90e1e 100644
--- a/src/views/gateway/detailedPage2.vue
+++ b/src/views/gateway/detailedPage2.vue
@@ -45,7 +45,7 @@
 					<h3>{{articleData.title}}</h3>
 					<div class="xqer_date">
 						<span>发布日期：<span>{{articleData.updateTime || articleData.createTime}}</span></span>
-						<span>作者：<span>{{articleData.author}}</span></span>
+						<span v-show="articleData.author">作者：<span>{{articleData.author}}</span></span>
 					</div>
 					<p v-html="articleData.content"></p>