Skip to content

R
rs-cloud-platform-ui
Commit 748b770c authored by obt's avatar obt
Browse files
Options

行业应用部分bug修复

parent 1e0df149
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 37 deletions
src/api/website/aboutUs/index.js
View file @ 748b770c
/*
* @Author: Jenkins
* @Date: 2020-12-15 16:00:02
* @LastEditTime: 2020-12-21 14:26:39
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \rs-cloud-platform-ui\src\api\website\aboutUs\index.js
*/
import fetch from 'utils/fetch';
// 获取详情
export function getCompanyInfo(params) {
export function companyInfo(params) {
return fetch({
url: "/api/website/companyInfo",
method: 'get',
......@@ -10,9 +18,9 @@ export function getCompanyInfo(params) {
}
//编辑详情
export function setCompanyInfo(params){
export function addUpdate(params){
return fetch({
url: "/api/website/companyInfo/addUpdate/",
url: "/api/website/companyInfo/addUpdate",
method: 'post',
data: params
})
......
src/views/webSiteManagement/aboutUs/index.vue
View file @ 748b770c
<!--
* @Author: your name
* @Date: 2020-12-01 09:07:41
* @LastEditTime: 2020-12-18 13:19:25
* @LastEditTime: 2020-12-21 14:27:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \rs-cloud\src\views\webSiteManagement\aboutUs.vue
......@@ -65,13 +65,9 @@
</template>
<script>
import {
getCompanyInfo,
setCompanyInfo,
} from "@/api/website/aboutUs/index";
import KindEditor from "@/components/Kindeditor";
import loadBMap from '@/utils/loadBMap.js'
import { addUpdate, companyInfo } from "api/website/aboutUs"
import { addUpdate, companyInfo } from "@/api/website/aboutUs/index"
export default {
name: "AboutUs",
components: {
......
src/views/webSiteManagement/industryApplication/applicationCate/index.vue
View file @ 748b770c
<!--
* @Author: your name
* @Date: 2020-12-02 10:27:53
* @LastEditTime: 2020-12-11 17:15:00
* @LastEditTime: 2021-01-06 11:24:23
* @LastEditors: Please set LastEditors
* @Description: 类别管理
* @FilePath: \rs-cloud-platform-ui\src\views\webSiteManagement\industryApplication\applicationList\index.vue
......@@ -66,7 +66,7 @@
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
<el-form-item label="应用类别" prop="type">
<el-col :span="12">
<el-input v-model="form.type" placeholder="请输入资讯标题"></el-input>
<el-input v-model="form.type" placeholder="请输入应用类别"></el-input>
</el-col>
</el-form-item>
<el-form-item label="封面图" prop="coverImg">
......@@ -74,12 +74,12 @@
</el-form-item>
<el-form-item label="简介" prop="introduce">
<el-col :span="12">
<el-input v-model="form.introduce" placeholder="请输入资讯简介"></el-input>
<el-input v-model="form.introduce" placeholder="请输入简介"></el-input>
</el-col>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-col :span="12">
<el-input type="number" v-model="form.sort" placeholder="请输入序号"></el-input>
<el-input type="number" v-model="form.sort" placeholder="请输入排序"></el-input>
</el-col>
</el-form-item>
<el-form-item label="分类设置" prop="level">
......@@ -457,8 +457,8 @@ export default {
// 1是降序,2是升序
if(this.currentSort==1){
this.tableData.sort((obj1,obj2)=>{
let val1 = parseInt((obj1.id+""))
let val2 = parseInt((obj2.id+""))
let val1 = parseInt((obj1.sort+""))
let val2 = parseInt((obj2.sort+""))
if(val1<val2){
return 1
}else if(val1>val2){
......@@ -470,8 +470,8 @@ export default {
}else{
// 升序
this.tableData.sort((obj1,obj2)=>{
let val1 = parseInt((obj1.id+""))
let val2 = parseInt((obj2.id+""))
let val1 = parseInt((obj1.sort+""))
let val2 = parseInt((obj2.sort+""))
if(val1<val2){
return -1
}else if(val1>val2){
......@@ -481,6 +481,9 @@ export default {
}
})
}
this.tableData.forEach((obj,index)=> {
obj.index = ((this.typePagination.currentPage-1)*this.typePagination.pageSize)+(++index)
})
}
},
// 删除类型
......
src/views/webSiteManagement/industryApplication/transactionProtection/index.vue
View file @ 748b770c
<!--
* @Author: your name
* @Date: 2020-12-17 16:06:03
* @LastEditTime: 2020-12-18 13:15:37
* @LastEditTime: 2020-12-25 13:09:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \rs-cloud-platform-ui\src\views\webSiteManagement\industryApplication\transactionProtection\index.vue
......@@ -654,7 +654,7 @@ export default {
.pagination{
margin: 1% 1% 0 1%;
width: 98%;
height: auto;
height: auto;
}
}
</style>
\ No newline at end of file
src/views/webSiteManagement/newsCategory/nebulaDynamics/index.vue
View file @ 748b770c
<!--
* @Author: Jenkins
* @Date: 2020-12-01 09:54:12
* @LastEditTime: 2020-12-11 11:27:34
* @LastEditTime: 2021-01-06 09:53:06
* @LastEditors: Please set LastEditors
* @Description: 星云动态
* @FilePath: \rs-cloud-platform-ui\src\views\webSiteManagement\newsCategory\index.vue
......@@ -36,7 +36,7 @@
<el-table :data="tableType" border fit highlight-current-row style="width: 100%" max-height="400">
<el-table-column label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.id }}</span>
<span>{{ scope.row.index }}</span>
</template>
</el-table-column>
<el-table-column label="类型名称" align="center">
......@@ -69,7 +69,7 @@
@size-change="changeHandleSize"
@current-change="changeHandleCurrent"
:current-page.sync="typePagination.currentPage"
:page-sizes="[2,4,6]"
:page-sizes="[6,8,10]"
:page-size="typePagination.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="typePagination.total">
......@@ -174,13 +174,7 @@
</div>
<!-- 表格 -->
<div class="table">
<el-table
:data="tableData"
border
fit
highlight-current-row
style="width: 100%"
>
<el-table :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column label="序号" width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.index }}</span>
......@@ -385,7 +379,7 @@ export default {
],
typePagination: {
currentPage: 1,// 当前页码
pageSize: 2,// 每页查询数量
pageSize: 6,// 每页查询数量
total: 0,// 总记录数量
},
typeEditorVisible: false,
......@@ -703,10 +697,11 @@ export default {
console.log("获取分页新闻类型=>", res);
if(res.status==200){
this.typePagination.total = res.data.totalCount
res.data.data.forEach(element => {
res.data.data.forEach((element,index) => {
// 未被删除的类型
if(element.isDel==0){
this.tableType.push({
index: (this.typePagination.currentPage-1) * this.typePagination.pageSize + index + 1,
id: element.id,
name: element.nameCn,
nameEn: element.nameEn,
......@@ -861,13 +856,21 @@ export default {
rank: this.editorType.sort,
status: this.editorType.status,// 1启用,2不启用
isDel: this.editorType.isDel,// 0不删除,1删除
});
this.$message({
message: '修改成功!!!',
type: 'success'
}).then(res => {
if(res.status == 200){
this.$message({
message: '修改成功!!!',
type: 'success'
})
this.pullListNewsType()
this.typeEditorVisible = false
}else{
this.$message({
message: '修改失败请稍后重试!!!',
type: 'fail'
})
}
})
this.pullListNewsType()
this.typeEditorVisible = false
}else{
this.$message.error('排序值不在指定范围,请输入正确的排序值!!!');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment