Commit 03d4cd4e authored by 以墨为白's avatar 以墨为白 🎧

样式优化

parent ccdca4d7
...@@ -9,6 +9,6 @@ export const HTTP_STATUS = {message: "服务请求失败", code:9004}; ...@@ -9,6 +9,6 @@ export const HTTP_STATUS = {message: "服务请求失败", code:9004};
/** /**
* 邮件系统 * 邮件系统
*/ */
export const MAIL_ADDRESS = "http://192.168.168.124:8000"; export const MAIL_ADDRESS = "http://192.168.168.100:8000";
export const MAIL_MANAGER_ADDRESS = "http://192.168.168.124:8010"; export const MAIL_MANAGER_ADDRESS = "http://192.168.168.100:8010";
export const MAIL_DOMAIN = "zyyt.com" export const MAIL_DOMAIN = "zyyt.com"
\ No newline at end of file
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<el-form-item style="text-align: center"> <el-form-item style="text-align: center">
<el-button type="default" @click="handleClose">取消</el-button> <el-button type="default" @click="handleClose">取消</el-button>
<el-button type="success" @click="sendNotice">发送</el-button> <el-button type="success" @click="sendNotice">发送</el-button>
<el-button type="success" @click="end" v-if="currentChatRoomInfo.teamInfo.teamType=='DIRECTOR'">结束会议</el-button> <el-button type="success" @click="end"
v-if="currentChatRoomInfo.teamInfo.teamType == 'DIRECTOR'">发送并结束演习</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -102,11 +103,12 @@ export default { ...@@ -102,11 +103,12 @@ export default {
}, },
end() { end() {
this.myStompClient.send(`/app/sendToChatRoom/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form)); this.myStompClient.send(`/app/sendToChatRoom/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form));
let data = {chatRoomId: this.currentChatRoom.id, result: this.form.content}; let data = { chatRoomId: this.currentChatRoom.id, result: this.form.content };
stopExercise(data).then(res =>{ stopExercise(data).then(res => {
console.log(res); this.handleRemove();
}).catch(err =>{ this.dialogVisible = false;
console.log(err); }).catch(err => {
this.$message.warning(err.message);
}); });
}, },
handleDialogOpen() { handleDialogOpen() {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<el-button type="primary" @click="addTeam">增加与会方</el-button> <el-button type="primary" @click="addTeam">增加与会方</el-button>
</div> </div>
<el-form class="yhf" v-for="(item, index) in formData.teams" :key="index"> <el-form class="yhf" v-for="(item, index) in formData.teams" :key="index">
<el-form-item label="队伍名称"> <el-form-item class="myTeamName" label="队伍名称" style="width: 100%;">
<el-input v-model="item.teamName"></el-input> <el-input v-model="item.teamName" style="width: 80%;"></el-input>
<span class="myIcon el-icon-remove-outline" @click="removeTeam(index)"></span> <span class="myIcon el-icon-remove-outline" @click="removeTeam(index)"></span>
</el-form-item> </el-form-item>
<!-- <el-form-item label="参会立场"> --> <!-- <el-form-item label="参会立场"> -->
...@@ -359,6 +359,7 @@ export default { ...@@ -359,6 +359,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 4px;
.myIcon { .myIcon {
float: right; float: right;
color: red; color: red;
...@@ -367,18 +368,18 @@ export default { ...@@ -367,18 +368,18 @@ export default {
cursor: pointer; cursor: pointer;
} }
&>div:first-child { // &>div:first-child {
margin-top: 10px; // // margin-top: 10px;
display: flex; // // display: flex;
&>div:first-child { // &>div:first-child {
width: 150px; // width: 150px;
} // }
.el-input__inner { // .el-input__inner {
width: 200px; // width: 200px;
} // }
} // }
.el-transfer-panel { .el-transfer-panel {
width: 170px !important; width: 170px !important;
......
...@@ -91,7 +91,7 @@ module.exports = { ...@@ -91,7 +91,7 @@ module.exports = {
//后台代理 //后台代理
proxy: { proxy: {
'/api/': { '/api/': {
target: 'http://192.168.168.106:8081', target: 'http://192.168.168.213:8081',
ws: true, ws: true,
secure: false, secure: false,
changeOrigin: true, changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment