解决run build的问题，并更改baseUrl到https
parent
e79a2134c4
commit
fa6ded8ed2
|
|
@ -1,4 +1,5 @@
|
|||
//const baseUrl = "http://192.168.31.194:8081/"
|
||||
//const baseUrl = "http://36.5.61.1:8081/"
|
||||
const baseUrl = "http://101.34.228.45:8080/api/"
|
||||
//const baseUrl = "http://101.34.228.45:8080/api/"
|
||||
const baseUrl = "https://www.hammer-hfut.tk/api/"
|
||||
export default baseUrl;
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
<el-table-column min-width="10%" align="right">
|
||||
<template #default="scope">
|
||||
<div style="height: 32px;">
|
||||
<el-button v-show="this.$store.state.staff===null? false:(this.$store.state.staff.staffId===scope.row.projectCreator)" type="primary" plain
|
||||
<el-button v-show="showCloseProjectButton(scope.row)" type="primary" plain
|
||||
@click="onCloseProject(scope.row)">结项
|
||||
</el-button>
|
||||
</div>
|
||||
|
|
@ -98,6 +98,9 @@ export default {
|
|||
|
||||
staffId: Number
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
||||
},
|
||||
created() {
|
||||
// watch 路由的参数，以便再次获取数据
|
||||
|
|
@ -119,6 +122,9 @@ export default {
|
|||
mounted() {
|
||||
},
|
||||
methods: {
|
||||
showCloseProjectButton(row) {
|
||||
return this.$store.state.staff===null? false:(this.$store.state.staff.staffId===row.projectCreator)
|
||||
},
|
||||
onRowClick(row, column, event) {
|
||||
router.push({path: '/project/'+row.projectId})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -32,13 +32,15 @@
|
|||
display: flex; flex-direction: row; align-items: center;justify-content: space-between">
|
||||
<logout-button></logout-button>
|
||||
<span
|
||||
style="font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">{{ project.projectName }}</span>
|
||||
style="font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">{{
|
||||
project.projectName
|
||||
}}</span>
|
||||
<div style="margin: 0 30px 0 30px; ;
|
||||
display: flex; flex-direction: row-reverse; align-items: center">
|
||||
<div style="width: 42px;height: 42px; background-color: #409EFF; border-radius: 21px;
|
||||
display: flex; justify-content: center;align-items: center;">
|
||||
<span style="color: white">{{
|
||||
this.$store.state.staff === null ? this.$store.state.staff : this.$store.state.staff.staffFullname[0]
|
||||
getStaffFullname()[0]
|
||||
}}</span>
|
||||
</div>
|
||||
<div style="height: 100%; margin-right: 10px;
|
||||
|
|
@ -46,7 +48,7 @@
|
|||
<span
|
||||
style="color: #606266; font-family: 'Segoe UI',sans-serif;font-size: 14px;font-weight: bold; ">
|
||||
{{
|
||||
this.$store.state.staff === null ? this.$store.state.staff : this.$store.state.staff.staffFullname
|
||||
getStaffFullname()
|
||||
}}</span>
|
||||
<span style="color: #606266; font-family: 'Segoe UI',sans-serif;font-size: 12px;">{{
|
||||
projectStaffPosition
|
||||
|
|
@ -102,7 +104,7 @@ export default {
|
|||
}
|
||||
const that = this
|
||||
request({
|
||||
url: 'project/' + this.$route.params.projectId+'/group/'+this.$store.state.staff.staffId,
|
||||
url: 'project/' + this.$route.params.projectId + '/group/' + this.$store.state.staff.staffId,
|
||||
method: 'get',
|
||||
}).then(response => {
|
||||
if (response.data.code === 200) {
|
||||
|
|
@ -116,6 +118,9 @@ export default {
|
|||
this.getProjectGroup()
|
||||
},
|
||||
methods: {
|
||||
getStaffFullname() {
|
||||
return this.$store.state.staff === null ? ' ' : this.$store.state.staff.staffFullname
|
||||
},
|
||||
getProjectInfo() {
|
||||
const that = this
|
||||
request({
|
||||
|
|
@ -133,7 +138,7 @@ export default {
|
|||
getProjectGroup() {
|
||||
const that = this
|
||||
request({
|
||||
url: 'project/' + this.$route.params.projectId+'/group',
|
||||
url: 'project/' + this.$route.params.projectId + '/group',
|
||||
method: 'get'
|
||||
|
||||
}).then(response => {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
<template>
|
||||
<view style="display: flex;height: 100%;justify-content: space-around;">
|
||||
<view style="display: flex;margin: 0 30px 10px 30px;height: 100%;justify-content: space-around;">
|
||||
|
||||
<div class="left" ref="leftRef" style="width: 50%;height: 100%;">
|
||||
<div class="left" ref="leftRef" style="width: 50%;height: 100%;padding: 0 30px 0 0">
|
||||
<div style="margin: 0 0 26px 0;display: flex;flex-direction: row;justify-content: space-between" ref="left_title_Ref">
|
||||
<p style="text-align:center; 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">项目团队</p>
|
||||
<el-button style="" type="primary" >新增成员</el-button>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
ref="tableRef"
|
||||
class="projectTable"
|
||||
style="width: 100%"
|
||||
:height="tableHeight"
|
||||
:data="tableData">
|
||||
<el-table-column prop="staffFullname" label="姓名" min-width="25%"> </el-table-column>
|
||||
|
|
@ -59,7 +60,7 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
<div class="right" style="width: 45%;display: flex;flex-direction: column;height: 100%;">
|
||||
<div class="right" style="width: 50%;display: flex;flex-direction: column;height: 100%;">
|
||||
<div style="display: flex;flex-direction: column;height: 100%">
|
||||
<p style="'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266;margin: 0 0 30px 0;flex-shrink: 0;">岗位统计</p>
|
||||
<div style="flex: 1;height: 100%">
|
||||
|
|
|
|||
|
|
@ -488,9 +488,16 @@ export default {
|
|||
else
|
||||
Promise.reject(response)
|
||||
}).catch(function (error) {
|
||||
console.log(error)
|
||||
console.log(error.data)
|
||||
let msg = '修改失败，'
|
||||
if(error.data&&error.data.msg)
|
||||
{
|
||||
msg+=error.data.msg
|
||||
}
|
||||
else
|
||||
msg+='未知错误'
|
||||
ElMessage({
|
||||
message: '修改失败',
|
||||
message: msg,
|
||||
type: 'error',
|
||||
})
|
||||
if (submitForm.taskFatherId === 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue