yangjun
/
nyzy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
wangyan 2022-05-12 17:28:47 +08:00
parent 19dac2087f
commit 68234eb99b
9 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/gateway/common/main.vue
View File

@ -336,7 +336,7 @@ export default {
loadData(){ loadData(){
// console.log('main.vue.this =>',this); // console.log('main.vue.this =>',this);
//头条 //头条
getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'201'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'201',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
this.ttList = list; this.ttList = list;
@ -345,7 +345,7 @@ export default {
//轮播图 //轮播图
getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',type:'首页轮播'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',type:'首页轮播',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
console.log('====>>>',list); console.log('====>>>',list);
@ -359,7 +359,7 @@ export default {
} }
}); });
//工作动态 //工作动态
getAction('/gateway/gatewayArticle/list',{pageSize:7,isRelease:'Y',columnId:'301'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:7,isRelease:'Y',columnId:'301',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -367,7 +367,7 @@ export default {
} }
}); });
//行业要闻 //行业要闻
getAction('/gateway/gatewayArticle/list',{pageSize:7,isRelease:'Y',columnId:'302'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:7,isRelease:'Y',columnId:'302',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -375,7 +375,7 @@ export default {
} }
}); });
//合作交流 //合作交流
getAction('/gateway/gatewayArticle/list',{pageSize:8,isRelease:'Y',columnId:'303'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:8,isRelease:'Y',columnId:'303',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -383,7 +383,7 @@ export default {
} }
}); });
//科研成果 //科研成果
getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'304'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'304',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -391,7 +391,7 @@ export default {
} }
}); });
//政策文件 //政策文件
getAction('/gateway/gatewayArticle/list',{pageSize:4,isRelease:'Y',columnId:'305'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:4,isRelease:'Y',columnId:'305',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -399,7 +399,7 @@ export default {
} }
}); });
//特色农业资源最新动态 //特色农业资源最新动态
getAction('/gateway/gatewayArticle/list',{pageSize:4,isRelease:'Y',columnId:'306'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:4,isRelease:'Y',columnId:'306',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -409,7 +409,7 @@ export default {
//通知公告 //通知公告
getAction('/gateway/gatewayArticle/list',{pageSize:4,isRelease:'Y',columnId:'3'}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:4,isRelease:'Y',columnId:'3',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// this.articleList = list; // this.articleList = list;
@ -417,14 +417,14 @@ export default {
} }
}); });
//快速导航 //快速导航
getAction('/gateway/gatewayLinks/list',{pageSize:-1,isEnable:'Y',type:'快速导航'}).then((res)=>{ getAction('/gateway/gatewayLinks/list',{pageSize:-1,isEnable:'Y',type:'快速导航',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
this.linksKsdhList = list; this.linksKsdhList = list;
} }
}); });
//友情链接 //友情链接
getAction('/gateway/gatewayLinks/list',{pageSize:-1,isEnable:'Y',type:'友情链接'}).then((res)=>{ getAction('/gateway/gatewayLinks/list',{pageSize:-1,isEnable:'Y',type:'友情链接',column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
this.linksYqljList = list; this.linksYqljList = list;

4
src/views/gateway/listPage.vue
View File

@ -118,7 +118,7 @@ export default {
methods:{ methods:{
loadData(){ loadData(){
//查询栏目（包含当前的和候选的） //查询栏目（包含当前的和候选的）
getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:this.pid}).then((res)=>{ getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:this.pid,column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// console.log('list===>',list); // console.log('list===>',list);
@ -158,7 +158,7 @@ export default {
//非搜索，还没有子id，差个锤子 //非搜索，还没有子id，差个锤子
columnId = (columnId || this.pid) || '-1' columnId = (columnId || this.pid) || '-1'
} }
getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId,...findParam}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId,...findParam,column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
this.articleList = list; this.articleList = list;

4
src/views/gateway/listPage2.vue
View File

@ -140,7 +140,7 @@ export default {
methods:{ methods:{
loadData(){ loadData(){
//查询栏目（包含当前的和候选的） //查询栏目（包含当前的和候选的）
getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:this.pid}).then((res)=>{ getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:this.pid,column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
// console.log('list===>',list); // console.log('list===>',list);
@ -180,7 +180,7 @@ export default {
//非搜索，还没有子id，差个锤子 //非搜索，还没有子id，差个锤子
columnId = (columnId || this.pid) || '-1' columnId = (columnId || this.pid) || '-1'
} }
getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId,...findParam}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',columnId,...findParam,column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
this.articleList = list; this.articleList = list;

2
src/views/gateway/listPageSearch.vue
View File

@ -106,7 +106,7 @@ export default {
if(this.findStr){ if(this.findStr){
findParam.title = this.findStr; findParam.title = this.findStr;
} }
getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',...findParam}).then((res)=>{ getAction('/gateway/gatewayArticle/list',{pageSize:-1,isRelease:'Y',...findParam,column: 'createTime',order: 'desc'}).then((res)=>{
if(res.success){ if(res.success){
let list = res.result.records||res.result; let list = res.result.records||res.result;
this.articleList = list; this.articleList = list;

39
src/views/modules/nd/GatewayLinksList.vue
View File

@ -6,14 +6,14 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="名称"> <a-form-item label="名称">
<a-input placeholder="请输入名称" v-model="queryParam.name"></a-input> <j-input placeholder="请输入名称" v-model="queryParam.name"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="类型"> <a-form-item label="类型">
<a-input placeholder="请输入类型" v-model="queryParam.type"></a-input> <a-input placeholder="请输入类型" v-model="queryParam.type"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="标题"> <a-form-item label="标题">
@ -30,10 +30,10 @@
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <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="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px"> <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }} {{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> </a> -->
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
@ -49,7 +49,7 @@
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> --> </a-upload> -->
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@ -194,10 +194,15 @@
align:"center", align:"center",
dataIndex: 'name' dataIndex: 'name'
}, },
// {
// title:'类型',
// align:"center",
// dataIndex: 'type'
// },
{ {
title:'类型', title:'标题',
align:"center", align:"center",
dataIndex: 'type' dataIndex: 'title'
}, },
{ {
title:'链接', title:'链接',
@ -209,22 +214,18 @@
// align:"center", // align:"center",
// dataIndex: 'urlen' // dataIndex: 'urlen'
// }, // },
{
title:'标题',
align:"center",
dataIndex: 'title'
},
// { // {
// title:'标题-英文版', // title:'标题-英文版',
// align:"center", // align:"center",
// dataIndex: 'titleen' // dataIndex: 'titleen'
// }, // },
{ // {
title:'商标', // title:'商标',
align:"center", // align:"center",
dataIndex: 'logo', // dataIndex: 'logo',
scopedSlots: {customRender: 'imgSlot'} // scopedSlots: {customRender: 'imgSlot'}
}, // },
// { // {
// title:'logo url-英文版', // title:'logo url-英文版',
// align:"center", // align:"center",

2
src/views/modules/nd/modules/GatewayArticleFormLb.vue
View File

@ -189,7 +189,7 @@
edit (record) { edit (record) {
// this.columnIdDictCode = 'tqd_gateway_column,name,id,id=-1', // 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.$nextTick(() => this.$nextTick(() => this.columnIdDictCode = 'tqd_gateway_column,name,id,parent is not null'));
this.$refs.dictRef.initDictData(); // this.$refs.dictRef.initDictData();
this.form.resetFields(); this.form.resetFields();
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;

2
src/views/modules/nd/modules/GatewayArticleFormQy.vue
View File

@ -189,7 +189,7 @@
edit (record) { edit (record) {
// this.columnIdDictCode = 'tqd_gateway_column,name,id,id=-1', // 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.$nextTick(() => this.$nextTick(() => this.columnIdDictCode = 'tqd_gateway_column,name,id,parent is not null'));
this.$refs.dictRef.initDictData(); // this.$refs.dictRef.initDictData();
this.form.resetFields(); this.form.resetFields();
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;

2
src/views/modules/nd/modules/GatewayArticleFormUse.vue
View File

@ -189,7 +189,7 @@
edit (record) { edit (record) {
// this.columnIdDictCode = 'tqd_gateway_column,name,id,id=-1', // 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.$nextTick(() => this.$nextTick(() => this.columnIdDictCode = 'tqd_gateway_column,name,id,parent is not null'));
this.$refs.dictRef.initDictData(); // this.$refs.dictRef.initDictData();
this.form.resetFields(); this.form.resetFields();
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;

29
src/views/modules/nd/modules/GatewayLinksForm.vue
View File

@ -33,47 +33,48 @@
<a-input v-decorator="['name', validatorRules.name]" placeholder="请输入名称" ></a-input> <a-input v-decorator="['name', validatorRules.name]" placeholder="请输入名称" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" help="显示在门户的哪里"> <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" help="显示在门户的哪里">
<!-- <a-input v-decorator="['type', validatorRules.type]" placeholder="请输入类型" ></a-input> --> <a-input v-decorator="['type', validatorRules.type]" placeholder="请输入类型" ></a-input>
<j-dict-select-tag type="list" v-decorator="['type', validatorRules.type]" :trigger-change="true" dictCode="gateway_links_type" placeholder="请选择类型"/> <j-dict-select-tag type="list" v-decorator="['type', validatorRules.type]" :trigger-change="true" dictCode="gateway_links_type" placeholder="请选择类型"/>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" help="在门户鼠标悬浮提示"> <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" help="在门户鼠标悬浮提示">
<a-input v-decorator="['title', validatorRules.title]" placeholder="请输入标题" ></a-input> <a-input v-decorator="['title', validatorRules.title]" placeholder="请输入标题" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="title" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="title" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['titleen', validatorRules.titleen]" placeholder="请输入title" ></a-input> <a-input v-decorator="['titleen', validatorRules.titleen]" placeholder="请输入title" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="链接" :labelCol="labelCol" :wrapperCol="wrapperCol" help="友情链接的地址以 http:// 或 http:// 开头"> <a-form-item label="链接" :labelCol="labelCol" :wrapperCol="wrapperCol" help="友情链接的地址以 http:// 或 http:// 开头">
<a-input v-decorator="['url', validatorRules.url]" placeholder="请输入链接" ></a-input> <a-input v-decorator="['url', validatorRules.url]" placeholder="请输入链接" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="link" :labelCol="labelCol" :wrapperCol="wrapperCol" help="友情链接的地址以 http:// 或 http:// 开头"> <a-form-item label="link" :labelCol="labelCol" :wrapperCol="wrapperCol" help="友情链接的地址以 http:// 或 http:// 开头">
<a-input v-decorator="['urlen', validatorRules.urlen]" placeholder="请输入link" ></a-input> <a-input v-decorator="['urlen', validatorRules.urlen]" placeholder="请输入link" ></a-input>
</a-form-item> </a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-switch v-decorator="['isEnable', validatorRules.isEnable]" ></j-switch>
</a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="商标" :labelCol="labelCol" :wrapperCol="wrapperCol" help="链接的商标图"> <a-form-item label="商标" :labelCol="labelCol" :wrapperCol="wrapperCol" help="链接的商标图">
<j-image-upload isMultiple v-decorator="['logo', validatorRules.logo]" ></j-image-upload> <j-image-upload isMultiple v-decorator="['logo', validatorRules.logo]" ></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="logo" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="logo" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload isMultiple v-decorator="['logoen', validatorRules.logoen]" ></j-image-upload> <j-image-upload isMultiple v-decorator="['logoen', validatorRules.logoen]" ></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="12">
<a-form-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-switch v-decorator="['isEnable', validatorRules.isEnable]" ></j-switch>
</a-form-item>
</a-col>
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center"> <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
<a-button @click="submitForm">提 交</a-button> <a-button @click="submitForm">提 交</a-button>
</a-col> </a-col>
@ -177,7 +178,7 @@
}, },
logo: { logo: {
rules: [ rules: [
{ required: true, message: '请上传商标!'}, // { required: true, message: '请上传商标!'},
] ]
}, },
logoen: { logoen: {