Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

数据平台前后端分离

Browse Source
This commit is contained in:
purple
2020-06-04 18:32:23 +08:00
parent 83cb560f6a
commit 23db85a2c1
10 changed files with 543 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
ruoyi-ui/src/utils/request.js
View File

@ -1,74 +1,74 @@
import axios from 'axios'
import { Notification, MessageBox, Message } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 10000
})
// request拦截器
service.interceptors.request.use(config => {
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
return config
}, error => {
console.log(error)
Promise.reject(error)
})
// 响应拦截器
service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// 获取错误信息
const message = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {
MessageBox.confirm(
'登录状态已过期，您可以继续留在该页面，或者重新登录',
'系统提示',
{
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
store.dispatch('LogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
})
} else if (code === 500) {
Message({
message: message,
type: 'error'
})
return Promise.reject(new Error(message))
} else if (code !== 200) {
Notification.error({
title: message
})
return Promise.reject('error')
} else {
return res.data
}
},
error => {
console.log('err' + error)
Message({
message: error.message,
type: 'error',
duration: 5 * 1000
})
return Promise.reject(error)
}
)
export default service
import axios from 'axios'
import { Notification, MessageBox, Message } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 30 * 1000
})
// request拦截器
service.interceptors.request.use(config => {
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
return config
}, error => {
console.log(error)
Promise.reject(error)
})
// 响应拦截器
service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// 获取错误信息
const message = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {
MessageBox.confirm(
'登录状态已过期，您可以继续留在该页面，或者重新登录',
'系统提示',
{
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
store.dispatch('LogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
})
} else if (code === 500) {
Message({
message: message,
type: 'error'
})
return Promise.reject(new Error(message))
} else if (code !== 200) {
Notification.error({
title: message
})
return Promise.reject('error')
} else {
return res.data
}
},
error => {
console.log('err' + error)
Message({
message: error.message,
type: 'error',
duration: 5 * 1000
})
return Promise.reject(error)
}
)
export default service

214
ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue
View File

@ -42,16 +42,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:ultimate:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -72,11 +62,11 @@
</el-col>
</el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table v-loading="loading" :data="dataList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="年月" align="center" prop="yearMonth" />
<el-table-column label="小区ID" align="center" prop="communityId" />
<el-table-column label="楼栋ID" align="center" prop="buildingId" />
<el-table-column label="小区ID" align="center" prop="communityId" width="110" />
<el-table-column label="楼栋ID" align="center" prop="buildingId" width="110" />
<el-table-column label="项目名称" align="center" prop="communityName" />
<el-table-column label="办公项目地址" align="center" prop="communityAddress" />
<el-table-column label="楼栋地址" align="center" prop="buildingAddress" />
@ -104,7 +94,12 @@
/>
<el-table-column label="价格更改说明" align="center" prop="adjustPriceComment" />
<el-table-column label="更新日期" align="center" prop="updateDate" :formatter="dateFormatter" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="mini"
@ -113,13 +108,6 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改</el-button>
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button>-->
</template>
</el-table-column>
</el-table>
@ -134,52 +122,149 @@
<!-- 添加或修改办公基价对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="160px">
<el-form ref="form" :model="form" :rules="updateRules" label-width="160px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="小区ID">
<el-input v-model="form.communityId" disabled="true" readonly />
<el-input v-model="form.communityId" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="楼栋ID">
<el-input v-model="form.buildingId" disabled="true" readonly />
<el-input v-model="form.buildingId" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="主力基价（元/㎡）">
<el-input v-model="form.mainPrice" />
<el-form-item label="项目名称">
<el-input v-model="form.communityName" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主力租金（元/月·㎡）">
<el-input v-model="form.mainPriceRent" />
<el-form-item label="办公项目地址">
<el-input v-model="form.communityAddress" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="24">
<el-form-item label="楼栋地址">
<el-input v-model="form.buildingAddress" disabled readonly />
</el-form-item>
</el-col>-->
<el-col :span="24">
<el-form-item label="楼栋地址">
<el-input v-model="form.complexRegion" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="建成年代">
<el-input v-model="form.year" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="年份修正系数">
<el-input v-model="form.yearCoefficient" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="平均面积">
<el-input v-model="form.avgArea" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="面积修正系数">
<el-input v-model="form.areaCoefficient" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="地上层数/总层数">
<el-input v-model="form.complexFloorInfo" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="办公分类-办公等级">
<el-input v-model="form.complexOfficeInfo" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="主力基价涨跌幅">
<el-input v-model="form.mainPricePst" />
<el-input v-model="form.mainPricePst" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主力租金涨跌幅">
<el-input v-model="form.mainPriceRentPst" />
<el-input v-model="form.mainPriceRentPst" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="主力基价类型">
<el-input v-model="form.mainPriceType" />
<el-input v-model="form.mainPriceType" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主力租金类型">
<el-input v-model="form.mainPriceRentType" />
<el-input v-model="form.mainPriceRentType" disabled readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="基价楼栋系数">
<el-input v-model="form.buildingCoefficient" disabled readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否标准楼栋">
<el-input
v-model="form.standardBuilding"
disabled
readonly
:formatter="yesOrNotFormatter"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="主力基价(上期)" prop="mainPrice_1">
<el-input v-model="form.mainPrice_1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主力租金(上期)" prop="mainPriceRent_1">
<el-input v-model="form.mainPriceRent_1" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="主力基价（元/㎡）" prop="mainPrice">
<el-input v-model="form.mainPrice" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主力租金（元/月·㎡）" prop="mainPriceRent">
<el-input v-model="form.mainPriceRent" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="更改价格说明">
<el-input v-model="form.adjustPriceComment" />
</el-form-item>
</el-col>
</el-row>
@ -190,7 +275,13 @@
</div>
</el-dialog>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="80%"
top="10vh"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
@ -241,6 +332,19 @@ export default {
callback();
}
};
var checkPrice = (rule, value, callback) => {
if (!value) {
callback(new Error("请输入价格"));
} else if (value === "" || isNaN(parseFloat(value))) {
callback(new Error("请输入价格"));
} else {
if (value <= 0) {
callback(new Error("请输入合理价格"));
} else {
callback();
}
}
};
return {
// 遮罩层
@ -254,7 +358,7 @@ export default {
// 总条数
total: 0,
// 办公基价表格数据
ultimateList: [],
dataList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -293,6 +397,28 @@ export default {
{ validator: checkYearMonth, trigger: "blur" },
{ validator: checkYearMonth, trigger: "change" }
]
},
updateRules: {
yearMonth: [
{ validator: checkYearMonth, trigger: "blur" },
{ validator: checkYearMonth, trigger: "change" }
],
mainPrice: [
{ validator: checkPrice, trigger: "blur" },
{ validator: checkPrice, trigger: "change" }
],
mainPriceRent: [
{ validator: checkPrice, trigger: "blur" },
{ validator: checkPrice, trigger: "change" }
],
mainPrice_1: [
{ validator: checkPrice, trigger: "blur" },
{ validator: checkPrice, trigger: "change" }
],
mainPriceRent_1: [
{ validator: checkPrice, trigger: "blur" },
{ validator: checkPrice, trigger: "change" }
]
}
};
},
@ -375,7 +501,25 @@ export default {
this.reset();
const id = row.id || this.ids;
const yearMonth = row.yearMonth;
console.log(yearMonth);
getById(yearMonth, id).then(response => {
// 复合信息
response.data.complexRegion =
response.data.countyName +
"-" +
response.data.blockName +
"-" +
response.data.loopName +
"-" +
response.data.streetName +
"-" +
response.data.buildingAddress;
// 办公信息
response.data.complexOfficeInfo =
response.data.officeClass + "-" + response.data.officeLevel;
// 层数信息
response.data.complexFloorInfo =
response.data.upperFloorSum + "-" + response.data.totalFloorSum;
this.form = response.data;
this.open = true;
this.title = "修改办公基价";