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

feature (作价和环境部署)：完成住宅租赁迁移

Browse Source 
1. 挂牌案例下载
2. 挂牌案例清洗
3. 成交案例下载
4. 成交案例清洗
5. 住宅租赁基价计算
6. repakcage name
7. 配置环境部署
This commit is contained in:
purple
2020-07-07 15:05:21 +08:00
parent 1c2e15016a
commit 2cc0e79d7a
370 changed files with 1334 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/Dockerfile Normal file
View File

@ -0,0 +1,5 @@
FROM 172.16.30.243:5000/nginx:1.19.0
COPY dist/ /home/ruoyi/projects/ruoyi-ui
COPY nginx/default.conf /etc/nginx/conf.d/default.conf

6
ruoyi-ui/makefile.ps1
View File

@ -0,0 +1,6 @@
param([string]$v=$(throw "Parameter missing: -v Version"))
docker build -t 172.16.30.243:5000/uv-data-frontend:$v .
docker push 172.16.30.243:5000/uv-data-frontend:$v

35
ruoyi-ui/nginx/default.conf
View File

@ -1,22 +1,23 @@
server {
listen 80;
server_name localhost;
listen 80;
server_name localhost;
#charset koi8-r;
access_log /var/log/nginx/host.access.log main;
error_log /var/log/nginx/error.log error;
location / {
root /home/ruoyi/projects/ruoyi-ui;
try_files $uri $uri/ /index.html;
index index.html index.htm;
}
location / {
root /usr/share/nginx/html;
index index.html index.htm;
}
location /prod-api/ {
# proxy_set_header Host $http_host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header REMOTE-HOST $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://172.16.30.243:9700/;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
}

18
ruoyi-ui/src/views/data/price/ArtificialResidenceRentPrice.vue
View File

@ -27,7 +27,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-bell"
@ -35,7 +35,7 @@
@click="handleSync"
v-hasPermi="['system:user:import']"
>从作价导入</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="info"
@ -45,7 +45,7 @@
v-hasPermi="['system:user:import']"
>文件导入</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
@ -53,19 +53,19 @@
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
</el-col>
</el-col> -->
</el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column label="年月" align="center" prop="yearMonth" fixed />
<el-table-column label="小区ID" align="center" prop="communityId" fixed />
<el-table-column label="租金主力面积系数" align="center" prop="mainRentCoefficient" />
<el-table-column label="租金主力面积系数" align="center" prop="mainCoefficientRent" />
<el-table-column label="平均租金" align="center" prop="rentPrice" />
<el-table-column label="主力面积租金" align="center" prop="mainRentPrice" />
<el-table-column label="平均租金（上周期）" align="center" prop="rentPrice_1" />
<el-table-column label="价格涨跌幅类型-调整后" align="center" prop="voppat" />
<el-table-column label="价格涨跌幅-调整后" align="center" prop="voppa" />
<el-table-column
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
@ -80,7 +80,7 @@
v-hasPermi="['system:user:edit']"
>修改</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination
@ -131,7 +131,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="租金主力面积系数">
<el-input v-model="form.mainRentCoefficient" disabled readonly />
<el-input v-model="form.mainCoefficientRent" disabled readonly />
</el-form-item>
</el-col>
</el-row>
@ -267,7 +267,7 @@ export default {
// 上传的地址
url:
process.env.VUE_APP_BASE_API +
"/data/rentprice/residence/artificial/importData"
"/data/rent-price/residence/artificial/importData"
},
// 表单参数
form: {

10
ruoyi-ui/src/views/data/price/UltimateResidenceRentPrice.vue
View File

@ -62,13 +62,13 @@
<el-table-column label="区域" align="center" prop="county" />
<el-table-column label="板块" align="center" prop="block" />
<el-table-column label="环线" align="center" prop="loop" />
<el-table-column label="国际社区分" align="center" prop="loop" />
<el-table-column label="重点小学名称" align="center" prop="loop" />
<el-table-column label="物业档次" align="center" prop="loop" />
<el-table-column label="室数量-AI" align="center" prop="loop" />
<el-table-column label="国际社区分" align="center" prop="interCommunity" />
<el-table-column label="重点小学名称" align="center" prop="magnetSchool" />
<el-table-column label="物业档次" align="center" prop="projectLevel" />
<el-table-column label="室数量-AI" align="center" prop="roomNum" />
<el-table-column label="标准基价（元/㎡·月）" align="center" prop="rentPrice" />
<el-table-column label="平均租金（元/㎡·月）" align="center" prop="rentPrice" />
<el-table-column label="平均租金（元/㎡·月）" align="center" prop="mainRentPrice" />
<el-table-column label="散租挂牌案例" align="center" prop="散租挂牌案例" />
<el-table-column label="租金涨跌幅" align="center" prop="voppa" />
<el-table-column label="租金-工房1室" align="center" prop="gf_1Room" />

2
ruoyi-ui/vue.config.js
View File

@ -95,7 +95,7 @@ module.exports = {
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime`
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}])
.end()