Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

This commit was merged in pull request #44.
This commit is contained in:
2024-02-21 11:40:35 +08:00
committed by Gitea
2 changed files with 1 additions and 8 deletions
+1 -1
View File
@@ -33,7 +33,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase()">新增案件</el-button> <el-button type="primary" plain icon="el-icon-plus" v-hasPermi="['caseManagement:list:add']" size="mini" @click="addCase()">新增案件</el-button>
</el-col> </el-col>
<!-- TODO 后期可能加上--> <!-- TODO 后期可能加上-->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
-7
View File
@@ -14,18 +14,11 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
// const API = 'http://121.40.189.20:9001' //生产 // const API = 'http://121.40.189.20:9001' //生产
// const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://121.40.189.20:6001' //测试
// const API = 'http://192.168.3.18:6001' //B // const API = 'http://192.168.3.18:6001' //B
<<<<<<< HEAD
// const API = 'http://172.16.0.237:6001' //Q // const API = 'http://172.16.0.237:6001' //Q
// const API = 'http://172.16.1.43:6001' //w // const API = 'http://172.16.1.43:6001' //w
=======
// const API = 'http://172.16.1.30:6001' //Q // const API = 'http://172.16.1.30:6001' //Q
<<<<<<< HEAD
// const API = 'http://172.16.1.43:6001' //w // const API = 'http://172.16.1.43:6001' //w
=======
// const API = 'http://172.16.1.17:6001' //w // const API = 'http://172.16.1.17:6001' //w
>>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
>>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
// vue.config.js 配置说明 // vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
// 这里只列一部分,具体配置参考文档 // 这里只列一部分,具体配置参考文档