abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正部署

Browse Source
This commit is contained in:
mactj 2021-01-22 15:11:13 +08:00
parent 19cb76bcb4
commit 25f19576a3
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deploy_frontend.sh
View File

@ -1,8 +1,14 @@
#!/bin/bash #!/bin/bash
path="/data/mall/"
echo "==========打包=========" echo "==========打包========="
cd ruoyi-ui cd ruoyi-ui
npm run build:prod npm run build:prod
echo "==========删除旧静态页面目录========="
ssh -t root@62.234.115.161 rm -rf $path
echo "==========创建目录========="
ssh -t root@62.234.115.161 mkdir $path
echo "==========上传服务器=========" echo "==========上传服务器========="
scp -r dist/* root@62.234.115.161:/data/mall/ scp -r dist/* root@62.234.115.161:$path
echo "==========部署完成=========" echo "==========部署完成========="

15
ruoyi-ui/src/views/goods/goods_main/index.vue
View File

@ -2,13 +2,13 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商品类型" prop="goodsType"> <el-form-item label="商户" prop="goodsType">
<el-select v-model="queryParams.deptId" placeholder="请选择商品商户" clearable size="small"> <el-select v-model="queryParams.deptId" placeholder="请选择商户" clearable size="small">
<el-option <el-option
v-for="dict in goodsTypeOptions" v-for="dict in deptOptions"
:key="dict.dictValue" :key="dict.deptId"
:label="dict.dictLabel" :label="dict.deptName"
:value="dict.dictValue" :value="dict.deptId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -371,10 +371,7 @@ export default {
if (this.deptOptions.length < 1) { if (this.deptOptions.length < 1) {
return '' return ''
} }
const dept = this.deptOptions.filter(x => x.deptId === row.deptId)[0] const dept = this.deptOptions.filter(x => x.deptId === row.deptId)[0]
return dept.deptName return dept.deptName
}, },
/** 查询商品信息列表 */ /** 查询商品信息列表 */