修正部署
This commit is contained in:
parent
19cb76bcb4
commit
25f19576a3
@ -1,8 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
path="/data/mall/"
|
||||
|
||||
echo "==========打包========="
|
||||
cd ruoyi-ui
|
||||
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 "==========上传服务器========="
|
||||
scp -r dist/* root@62.234.115.161:/data/mall/
|
||||
scp -r dist/* root@62.234.115.161:$path
|
||||
echo "==========部署完成========="
|
||||
|
@ -2,13 +2,13 @@
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
||||
|
||||
<el-form-item label="商品类型" prop="goodsType">
|
||||
<el-select v-model="queryParams.deptId" placeholder="请选择商品商户" clearable size="small">
|
||||
<el-form-item label="商户" prop="goodsType">
|
||||
<el-select v-model="queryParams.deptId" placeholder="请选择商户" clearable size="small">
|
||||
<el-option
|
||||
v-for="dict in goodsTypeOptions"
|
||||
:key="dict.dictValue"
|
||||
:label="dict.dictLabel"
|
||||
:value="dict.dictValue"
|
||||
v-for="dict in deptOptions"
|
||||
:key="dict.deptId"
|
||||
:label="dict.deptName"
|
||||
:value="dict.deptId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -371,10 +371,7 @@ export default {
|
||||
if (this.deptOptions.length < 1) {
|
||||
return ''
|
||||
}
|
||||
|
||||
const dept = this.deptOptions.filter(x => x.deptId === row.deptId)[0]
|
||||
|
||||
|
||||
return dept.deptName
|
||||
},
|
||||
/** 查询商品信息列表 */
|
||||
|
Loading…
x
Reference in New Issue
Block a user