Skip to content

X
xxx_phase2_web
Commit 1d7f0d99 authored by 以墨为白's avatar 以墨为白 🎧
Browse files
Options

Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

parents be80dd65 bcb5980b
Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 107 deletions
.gitignore
View file @ 1d7f0d99
node_modules/ node_modules/
dist/
.vscode/ .vscode/
src/view/zchj/zchj1.vue src/view/zchj/zchj1.vue
web/
\ No newline at end of file
package-lock.json
View file @ 1d7f0d99
...@@ -3769,6 +3769,11 @@ ...@@ -3769,6 +3769,11 @@
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
} }
}, },
"dayjs": {
"version": "1.11.10",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
"integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
},
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz", "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz",
......
src/api/chat/chatRoom.js
View file @ 1d7f0d99
...@@ -29,7 +29,7 @@ export const leaveChatRoom = (userId) => { ...@@ -29,7 +29,7 @@ export const leaveChatRoom = (userId) => {
//查询某个用户所有聊天室（群组） //查询某个用户所有聊天室（群组）
export const getChatRoomList = (data) => { export const getChatRoomList = (data) => {
return post(`${PREFIX_CHATROOM}/list`,data); return post(`${PREFIX_CHATROOM}/list`, data);
} }
//阅读（群组）信息 //阅读（群组）信息
...@@ -52,6 +52,20 @@ export const upLoadFiles = (bucket, data) => { ...@@ -52,6 +52,20 @@ export const upLoadFiles = (bucket, data) => {
return fileUpload(`api/rest/file/upload?bucket=${bucket}`, data) return fileUpload(`api/rest/file/upload?bucket=${bucket}`, data)
} }
//启动聊天室（群组）
export const startExercise = (chatRoomId) => {
return post(`${PREFIX_CHATROOM}/start?chatRoomId=${chatRoomId}`);
}
//删除聊天室（群组）
export const removeExercise = (chatRoomId) => {
return get(`${PREFIX_CHATROOM}/remove?chatRoomId=${chatRoomId}`);
}
//停止聊天室（群组）
export const stopExercise = (data) => {
return post(`${PREFIX_CHATROOM}/end`, data);
}
......
src/view/ddkz/components/chatRoomDialog.vue
View file @ 1d7f0d99
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
this.imgList = []; this.imgList = [];
tmpArr.forEach((item, index) => { tmpArr.forEach((item, index) => {
let tmpObj = { content: item, messageForm: 'TEXT' } let tmpObj = { content: item, messageForm: 'TEXT' }
if (item.indexOf('data:image/jpeg;base64') == 0) { if (item.indexOf('data:image/jpeg;base64') == 0||item.indexOf('data:image/png;base64') == 0) {
let obj = { index: index, url: item } let obj = { index: index, url: item }
this.imgList.push(obj); this.imgList.push(obj);
tmpObj.messageForm = 'PICTURE'; tmpObj.messageForm = 'PICTURE';
......
src/view/ddkz/components/chatRoomInfo.vue
View file @ 1d7f0d99
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<el-form-item> <el-form-item>
<img class="goBack" :src="goBack" alt="" @click="goBackFn"> <img class="goBack" :src="goBack" alt="" @click="goBackFn">
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>
<div class="searchButton" <div class="searchButton"
:style="{ background: stompClient.connected ? 'Green' : 'gray', color: 'white' }"> :style="{ background: status ? 'Green' : 'gray', color: 'white' }">
<span :class="[!stompClient.connected ? 'el-icon-loading' : '']"></span> <span :class="[!status ? 'el-icon-loading' : '']"></span>
{{ stompClient.connected ? '已连接' : '重连中' }} {{ status ? '已连接' : '重连中' }}
</div> </div>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
</div> </div>
<div class="ddkz-info-content"> <div class="ddkz-info-content">
...@@ -120,7 +120,8 @@ export default { ...@@ -120,7 +120,8 @@ export default {
newsList: [], newsList: [],
publicNoticeList: [], publicNoticeList: [],
stompClient: { connected: false }, stompClient: { connected: false },
peopleList: [] peopleList: [],
// status:false
} }
}, },
components: { components: {
...@@ -247,7 +248,13 @@ export default { ...@@ -247,7 +248,13 @@ export default {
} else { } else {
this.dataOrderByParams(this.formInfo.day, newVal); this.dataOrderByParams(this.formInfo.day, newVal);
} }
} },
// 'stompClient.connected':{
// handler(newVal,oldVal){
// this.status = newVal;
// },
// immediate:true
// }
}, },
computed: { computed: {
userInfo() { userInfo() {
...@@ -261,6 +268,7 @@ export default { ...@@ -261,6 +268,7 @@ export default {
activated() { activated() {
this.currentChatRoomInfo = this.$route.params.data; this.currentChatRoomInfo = this.$route.params.data;
this.stompClient = this.$route.params.client; this.stompClient = this.$route.params.client;
// this.status = this.stompClient.connected;
this.listChatroom(this.currentChatRoomInfo); this.listChatroom(this.currentChatRoomInfo);
//获取当前组成员 //获取当前组成员
this.getCurrentTeamPeople(this.currentChatRoomInfo); this.getCurrentTeamPeople(this.currentChatRoomInfo);
......
src/view/ddkz/components/noticeDialog.vue
View file @ 1d7f0d99
...@@ -66,11 +66,11 @@ export default { ...@@ -66,11 +66,11 @@ export default {
upLoadFiles('CHAT', fd).then(res => { upLoadFiles('CHAT', fd).then(res => {
this.form.attachment = res; this.form.attachment = res;
let type = file.name.split('.')[1]; let type = file.name.split('.')[1];
if (type == 'png' || type == 'jpg') { if (type == 'png' || type == 'jpg' || type == 'PNG' || type == 'JPG') {
this.form.messageForm = 'PICTURE'; this.form.messageForm = 'PICTURE';
} else if (type == 'mp4') { } else if (type == 'mp4' || type == 'MP4') {
this.form.messageForm = 'VIDEO'; this.form.messageForm = 'VIDEO';
} else if (type == 'xlsx' || type == 'xls') { } else if (type == 'xlsx' || type == 'xls' || type == 'XLSX' || type == 'XLS') {
this.form.messageForm = 'EXCEL'; this.form.messageForm = 'EXCEL';
} else { } else {
this.form.messageForm = 'TEXT'; this.form.messageForm = 'TEXT';
......
src/view/ddkz/ddkzzs.vue
View file @ 1d7f0d99
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<el-form-item> <el-form-item>
<div class="searchButton" <div class="searchButton"
:style="{ background: stompClient.connected ? 'Green' : 'gray', color: 'white' }"> :style="{ background: stompClient.connected ? 'Green' : 'gray', color: 'white' }">
<span :class="[!stompClient.connected?'el-icon-loading':'']"></span> <span :class="[!stompClient.connected ? 'el-icon-loading' : '']"></span>
{{stompClient.connected ? '已连接' : '重连中'}} {{ stompClient.connected ? '已连接' : '重连中' }}
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
<div class="ddkz-content"> <div class="ddkz-content">
<div v-for="item in analogData" class="content-card bk-ddkz-animation animate__animated animate__ZoomIn" <div v-for="item in analogData" class="content-card bk-ddkz-animation animate__animated animate__ZoomIn"
@click="showInfo(item)"> @click="showInfo(item)">
<div class="card-title" v-text="item.nickname" :title="item.nickname"></div> <div class="card-title" :title="item.nickname">{{ item.nickname
}}<span
:style="{ fontSize: '14px', color: item.status.name == '待开始' ? '#85ce61' : (item.status.name == '进行中' ? '#409eff' : (item.status.name == '已结束' ? '#f78989' : '')) }">{{
'（' + item.status.name + '）' }}</span></div>
<div class="card-date" v-text="item.createTime"></div> <div class="card-date" v-text="item.createTime"></div>
<div class="card-text" v-text="item.conRemark" :title="item.conRemark"></div> <div class="card-text" v-text="item.conRemark" :title="item.conRemark"></div>
<div class="card-tags"> <div class="card-tags">
...@@ -71,7 +74,12 @@ export default { ...@@ -71,7 +74,12 @@ export default {
}, },
methods: { methods: {
showInfo(item) { showInfo(item) {
this.$router.push({ name: '聊天室详情' + this.$route.meta.type_name, params: { data: item, client: this.stompClient } }); if (item.status.name !== '待开始') {
this.$router.push({ name: '聊天室详情' + this.$route.meta.type_name, params: { data: item, client: this.stompClient } });
} else {
this.$message.warning('此演习暂未开启，不能进入！');
}
}, },
queryChatRoomListFn(params) { queryChatRoomListFn(params) {
getChatRoomList(params).then(res => { getChatRoomList(params).then(res => {
......
src/view/home.vue
View file @ 1d7f0d99
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
</div> </div>
<h1><span>业务辅助分析系统</span></h1> <h1><span>业务辅助分析系统</span></h1>
<div class="home-date"> <div class="home-date">
<span class="date">2023年06月14日</span>&emsp;&emsp; <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
<span class="week">星期三</span> <span class="week" v-text="myDate.week"></span>
</div> </div>
<div class="top-nav3"> <div class="top-nav3">
<div class="top-nav3-content"> <div class="top-nav3-content">
...@@ -81,6 +81,7 @@ import "../assets/css/home.css"; ...@@ -81,6 +81,7 @@ import "../assets/css/home.css";
import { endLoading, get, post } from "../util/http_util"; import { endLoading, get, post } from "../util/http_util";
import { queryDictItem } from '../api/dictitem'; import { queryDictItem } from '../api/dictitem';
import Push from 'push.js' import Push from 'push.js'
import dayjs from 'dayjs';
export default { export default {
name: "home", name: "home",
...@@ -117,7 +118,11 @@ export default { ...@@ -117,7 +118,11 @@ export default {
{ id: 6, title: '新技术实验模块', eg: 'New Technology Experiment Module' }, { id: 6, title: '新技术实验模块', eg: 'New Technology Experiment Module' },
], ],
}, },
isSelected: 0 isSelected: 0,
myDate:{
day:null,
week:null
}
}; };
}, },
methods: { methods: {
...@@ -261,6 +266,11 @@ export default { ...@@ -261,6 +266,11 @@ export default {
// }); // });
this.isSelected = this.activeIndex; this.isSelected = this.activeIndex;
this.choiceModule(this.activeIndex); this.choiceModule(this.activeIndex);
//获取时间
this.myDate.day = dayjs().format('YYYY年MM月DD日');
const weekList = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'];
this.myDate.week = weekList[dayjs().get('day')]
}, },
computed: { computed: {
userInfo() { userInfo() {
......
src/view/homepage.vue
View file @ 1d7f0d99
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="header"> <div class="header">
<h1><span>业务辅助分析系统</span></h1> <h1><span>业务辅助分析系统</span></h1>
<div> <div>
<span class="date">2023年06月14日</span>&emsp;&emsp; <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
<span class="week">星期三</span> <span class="week" v-text="myDate.week"></span>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<script> <script>
import LeaderLine from "../util/leader-line.min"; import LeaderLine from "../util/leader-line.min";
import dayjs from 'dayjs';
export default { export default {
name: 'homepage', name: 'homepage',
data() { data() {
...@@ -72,7 +73,11 @@ export default { ...@@ -72,7 +73,11 @@ export default {
line3:null, line3:null,
line4:null, line4:null,
line5:null, line5:null,
line6:null line6:null,
myDate:{
day:null,
week:null
}
} }
}, },
methods: { methods: {
...@@ -142,6 +147,11 @@ export default { ...@@ -142,6 +147,11 @@ export default {
end:document.getElementById('right33'), end:document.getElementById('right33'),
}); });
}) })
//获取时间
this.myDate.day = dayjs().format('YYYY年MM月DD日');
const weekList = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'];
this.myDate.week = weekList[dayjs().get('day')]
}, },
} }
</script> </script>
......
src/view/login.vue
View file @ 1d7f0d99
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="login-head"> <div class="login-head">
<h1><span>业务辅助分析系统</span></h1> <h1><span>业务辅助分析系统</span></h1>
<div> <div>
<span class="date">2023年06月14日</span>&emsp;&emsp; <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
<span class="week">星期三</span> <span class="week" v-text="myDate.week"></span>
</div> </div>
</div> </div>
<div class="login-content"> <div class="login-content">
...@@ -46,6 +46,7 @@ import leftOne from '../assets/img/login/text1.png'; ...@@ -46,6 +46,7 @@ import leftOne from '../assets/img/login/text1.png';
import leftTwo from '../assets/img/login/text2.png'; import leftTwo from '../assets/img/login/text2.png';
import rightOne from '../assets/img/login/text3.png'; import rightOne from '../assets/img/login/text3.png';
import rightTwo from '../assets/img/login/text4.png'; import rightTwo from '../assets/img/login/text4.png';
import dayjs from "dayjs";
export default { export default {
name: "login", name: "login",
data() { data() {
...@@ -60,10 +61,14 @@ export default { ...@@ -60,10 +61,14 @@ export default {
checkPass: [{ required: true, message: "请输入密码", trigger: "blur" }], checkPass: [{ required: true, message: "请输入密码", trigger: "blur" }],
}, },
checked: true, checked: true,
leftOne:leftOne, leftOne: leftOne,
leftTwo:leftTwo, leftTwo: leftTwo,
rightOne:rightOne, rightOne: rightOne,
rightTwo:rightTwo rightTwo: rightTwo,
myDate: {
day: null,
week: null
}
}; };
}, },
methods: { methods: {
...@@ -117,6 +122,10 @@ export default { ...@@ -117,6 +122,10 @@ export default {
type: "warning", type: "warning",
}); });
} }
//获取时间
this.myDate.day = dayjs().format('YYYY年MM月DD日');
const weekList = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
this.myDate.week = weekList[dayjs().get('day')]
} }
}; };
</script> </script>
...@@ -137,6 +146,7 @@ export default { ...@@ -137,6 +146,7 @@ export default {
background-size: 90% 73%; background-size: 90% 73%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center 33px; background-position: center 33px;
h1 { h1 {
font-size: 34px; font-size: 34px;
letter-spacing: 7px; letter-spacing: 7px;
...@@ -145,7 +155,8 @@ export default { ...@@ -145,7 +155,8 @@ export default {
margin-bottom: 0px !important; margin-bottom: 0px !important;
font-family: cursive; font-family: cursive;
text-align: center; text-align: center;
span{
span {
background-image: linear-gradient(to right, #498ce1, #75f8d2, #498ce1); background-image: linear-gradient(to right, #498ce1, #75f8d2, #498ce1);
color: transparent; color: transparent;
-webkit-background-clip: text; -webkit-background-clip: text;
...@@ -155,13 +166,13 @@ export default { ...@@ -155,13 +166,13 @@ export default {
} }
div { div {
margin-top: 40px; margin-top: 40px;
font-size: 13px; font-size: 13px;
color: #75879b; color: #75879b;
text-align: center; text-align: center;
line-height: initial; line-height: initial;
font-weight: 900; font-weight: 900;
letter-spacing: 1; letter-spacing: 1;
} }
} }
...@@ -175,10 +186,10 @@ export default { ...@@ -175,10 +186,10 @@ export default {
.login-left-content { .login-left-content {
width: calc(50% - 350px); width: calc(50% - 350px);
-webkit-animation: warn 3s ease-out infinite; -webkit-animation: warn 3s ease-out infinite;
-moz-animation: warn 3s ease-out infinite; -moz-animation: warn 3s ease-out infinite;
animation: warn 3s ease-out infinite; animation: warn 3s ease-out infinite;
animation-direction:alternate; animation-direction: alternate;
} }
.login-center-content { .login-center-content {
...@@ -261,15 +272,22 @@ export default { ...@@ -261,15 +272,22 @@ export default {
.login-right-content { .login-right-content {
width: calc(50% - 350px); width: calc(50% - 350px);
-webkit-animation: warn 3s ease-out infinite; -webkit-animation: warn 3s ease-out infinite;
-moz-animation: warn 3s ease-out infinite; -moz-animation: warn 3s ease-out infinite;
animation: warn 3s ease-out infinite; animation: warn 3s ease-out infinite;
animation-direction:alternate; animation-direction: alternate;
} }
@keyframes warn { @keyframes warn {
from { opacity:1; transform:scale(0.98); } from {
to { opacity:1; transform:scale(1); } opacity: 1;
transform: scale(0.98);
}
to {
opacity: 1;
transform: scale(1);
}
} }
} }
</style> </style>
\ No newline at end of file
src/view/sjgl/ddkzConfig.vue
View file @ 1d7f0d99
...@@ -2,29 +2,35 @@ ...@@ -2,29 +2,35 @@
<div class="ddkzConfig"> <div class="ddkzConfig">
<el-tabs type="border-card" @tab-click="handleTabClick" v-model="activeTabs"> <el-tabs type="border-card" @tab-click="handleTabClick" v-model="activeTabs">
<el-tab-pane> <el-tab-pane>
<span slot="label"><i class="el-icon-date"></i> 新增会议</span> <span slot="label"><i class="el-icon-document-add"></i> 新增演习</span>
<DdkzConfigAdd></DdkzConfigAdd> <DdkzConfigAdd></DdkzConfigAdd>
</el-tab-pane> </el-tab-pane>
<el-tab-pane> <el-tab-pane>
<span slot="label"><i class="el-icon-date"></i> 会议列表</span> <span slot="label"><i class="el-icon-document-copy"></i> 演习列表</span>
<DdkzConfigList></DdkzConfigList> <DdkzConfigList></DdkzConfigList>
</el-tab-pane> </el-tab-pane>
<el-tab-pane>
<span slot="label"><i class="el-icon-document-checked"></i> 演习审批</span>
<DdkzConfigApprove></DdkzConfigApprove>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script> <script>
import ddkzConfigAdd from '../sjgl/ddkzConfig/ddkzConfigAdd.vue'; import ddkzConfigAdd from '@/view/sjgl/ddkzConfig/ddkzConfigAdd.vue';
import ddkzConfigList from '../sjgl/ddkzConfig/ddkzConfigList.vue'; import ddkzConfigList from '@/view/sjgl/ddkzConfig/ddkzConfigList.vue';
import ddkzConfigApprove from '@/view/sjgl/ddkzConfig/ddkzConfigApprove.vue';
export default { export default {
data() { data() {
return { return {
activeTabs: '' activeTabs: ''
} }
}, },
components:{ components: {
DdkzConfigAdd:ddkzConfigAdd, DdkzConfigAdd: ddkzConfigAdd,
DdkzConfigList:ddkzConfigList DdkzConfigList: ddkzConfigList,
DdkzConfigApprove: ddkzConfigApprove
}, },
methods: { methods: {
handleTabClick() { handleTabClick() {
...@@ -45,7 +51,7 @@ export default { ...@@ -45,7 +51,7 @@ export default {
>.el-tabs--border-card { >.el-tabs--border-card {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 4px); height: calc(100% - 4px);
border: 2px solid #125473; border: 2px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
background: #ffffff00; background: #ffffff00;
...@@ -58,7 +64,7 @@ export default { ...@@ -58,7 +64,7 @@ export default {
>.el-tabs__header { >.el-tabs__header {
background-color: unset; background-color: unset;
border-bottom: 2px solid #125473; border-bottom: 2px solid #3a5f94c9;
.el-tabs__item { .el-tabs__item {
color: #dedede; color: #dedede;
...@@ -66,9 +72,9 @@ export default { ...@@ -66,9 +72,9 @@ export default {
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #ffe000; color: #ffe000;
background-color: #116791; background-color: #3a5f94c9;
border-right-color: #116791; border-right-color: #3a5f94c9;
border-left-color: #116791; border-left-color: #3a5f94c9;
} }
.el-tabs__item:not(.is-disabled):hover { .el-tabs__item:not(.is-disabled):hover {
......
src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue
View file @ 1d7f0d99
<template> <template>
<div class="addDdkzConfig"> <div class="addDdkzConfig">
<el-form class="myForm" label-position="right" label-width="200px" :model="formData"> <el-form class="myForm" label-position="right" label-width="200px" :model="formData">
<el-form-item label="议题"> <el-form-item label="演习标题">
<el-input v-model="formData.nickname"></el-input> <el-input v-model="formData.nickname"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="聊天室主持人"> <el-form-item label="演习主持人">
<!-- <el-input v-model="formData.chatroomOwner"></el-input> --> <!-- <el-input v-model="formData.chatroomOwner"></el-input> -->
<el-select v-model="formData.chatroomOwner" placeholder="请选择"> <el-select v-model="formData.chatroomOwner" placeholder="请选择">
<el-option v-for="item in allData" :key="item.account" :label="item.account" :value="item.account"> <el-option v-for="item in allData" :key="item.account" :label="item.account" :value="item.account">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="演习内容">
<el-input v-model="formData.conRemark"></el-input> <el-input v-model="formData.conRemark"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="与会方"> <el-form-item label="与会方">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</el-form> </el-form>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="success" @click="createMeeting">创建会议</el-button> <el-button type="success" @click="createMeeting">创建演习</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
......
src/view/sjgl/ddkzConfig/ddkzConfigApprove.vue 0 → 100644
View file @ 1d7f0d99
<template>
<div class="yxsp">
</div>
</template>
\ No newline at end of file
src/view/sjgl/ddkzConfig/ddkzConfigList.vue
View file @ 1d7f0d99
<template> <template>
<div class="ddkzConfigList"> <div class="ddkzConfigList">
<div class="ddkzCondition"> <div class="ddkzCondition">
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="dateRange" type="daterange" range-separator="至" <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="form.dateRange" type="daterange" range-separator="至"
start-placeholder="开始时间" end-placeholder="结束时间" :default-time="['00:00:00', '23:59:59']"> start-placeholder="开始时间" end-placeholder="结束时间" :default-time="['00:00:00', '23:59:59']">
</el-date-picker> </el-date-picker>
<el-select style="margin-left: 10px;" v-model="form.status" placeholder="请选择演习状态" clearable>
<el-option v-for="item in exerciseList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-input class="myInput" v-model="form.keyword"></el-input>
<div class="searchButton" @click="searchChatList">搜索</div> <div class="searchButton" @click="searchChatList">搜索</div>
</div> </div>
<div class="ddkzContent"> <div class="ddkzContent">
...@@ -11,41 +16,92 @@ ...@@ -11,41 +16,92 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55"> <!-- <el-table-column type="selection" width="55">
</el-table-column> --> </el-table-column> -->
<el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
<el-table-column prop="nickname" label="主题" align="center"></el-table-column> <el-table-column prop="nickname" label="主题" align="center"></el-table-column>
<el-table-column prop="chatroomOwner" label="支持人" align="center"></el-table-column> <el-table-column prop="conRemark" label="演习内容" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column> <el-table-column prop="createTime" label="演习结果" align="center"></el-table-column>
<!-- <el-table-column label="操作" align="center" width="500"> <el-table-column prop="status.name" label="演习状态" align="center"></el-table-column>
<el-table-column prop="createTime" label="开始时间" align="center"></el-table-column>
<el-table-column label="操作" align="center" width="500">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="danger" @click="deleteMeeting(scope.row)">删除</el-button> <el-button v-if="scope.row.status.name !== '进行中'" size="mini" type="danger"
@click="deleteExercise(scope.row)">删除</el-button>
<el-button v-if="scope.row.status.name == '待开始'" size="mini" type="success"
@click="startExercise(scope.row)">启动</el-button>
<el-button v-if="scope.row.status.name == '进行中'" size="mini" type="warning"
@click="stopExercise(scope.row)">结束</el-button>
</template> </template>
</el-table-column> --> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { getChatRoomList } from "@/api/chat/chatRoom"; import { getChatRoomList, startExercise, stopExercise, removeExercise } from "@/api/chat/chatRoom";
export default { export default {
data() { data() {
return { return {
dateRange: [], form: {
meetingList: [] dateRange: [],
status: null,
keyword: null
},
meetingList: [],
exerciseList: [{ label: '待开始', value: 'CREATED' }, { label: '进行中', value: 'ONGOING' }, { label: '已结束', value: 'CLOSED' }]
} }
}, },
methods: { methods: {
handleSelectionChange() { }, handleSelectionChange() { },
deleteMeeting(item) { }, //删除演习
deleteExercise(item) {
removeExercise(item.id).then(res => {
if (res == 1) {
this.$message.success('删除演习成功！');
this.searchChatList();
}
}).catch(error => {
this.$message.error(error.message);
});
},
//启动演习
startExercise(item) {
startExercise(item.id).then(res => {
if (res == 1) {
this.$message.success('启动成功！');
this.searchChatList();
}
}).catch(error => {
this.$message.error(error.message);
});
},
//结束演习
stopExercise(item) {
let params = {
chatRoomId: item.id,
result: '暂无'
};
stopExercise(params).then(res => {
if (res == 1) {
this.$message.success('此演习结束！');
this.searchChatList();
}
}).catch(error => {
this.$message.error(error.message);
});
},
queryChatRoomListFn(param) { queryChatRoomListFn(param) {
getChatRoomList(param).then(res => { getChatRoomList(param).then(res => {
this.meetingList = res; this.meetingList = res;
console.log(res);
}); });
}, },
searchChatList(){ searchChatList() {
if(this.dateRange.length==2){ if (this.form.dateRange.length == 2) {
this.queryChatRoomListFn({startTime:this.dateRange[0],endTime:this.dateRange[1],userId:this.userInfo.account}) this.queryChatRoomListFn({ startTime: this.form.dateRange[0], endTime: this.form.dateRange[1], userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })
}else{ } else {
this.queryChatRoomListFn({userId:this.userInfo.account}) this.queryChatRoomListFn({ userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })
} }
} }
}, },
...@@ -59,7 +115,7 @@ export default { ...@@ -59,7 +115,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.queryChatRoomListFn({userId:this.userInfo.account}); this.queryChatRoomListFn({ userId: this.userInfo.account });
} }
} }
</script> </script>
...@@ -87,6 +143,18 @@ export default { ...@@ -87,6 +143,18 @@ export default {
} }
} }
.el-input {
float: left;
width: 200px;
margin-left: 10px;
.el-input__inner {
background: none;
color: #ffff;
border: 1px solid #3a5f94c9 !important;
}
}
.el-input__inner { .el-input__inner {
border: 1px solid #3a5f94c9 !important; border: 1px solid #3a5f94c9 !important;
} }
......
src/view/sjgl/dfzygl.vue
View file @ 1d7f0d99
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
>.el-tabs--border-card { >.el-tabs--border-card {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 4px); height: calc(100% - 4px);
border: 2px solid #125473; border: 2px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
background: #ffffff00; background: #ffffff00;
...@@ -355,15 +355,15 @@ export default { ...@@ -355,15 +355,15 @@ export default {
} }
>.el-tabs__header { >.el-tabs__header {
background-color: unset; background-color: unset;
border-bottom: 2px solid #125473; border-bottom: 2px solid #3a5f94c9;
.el-tabs__item { .el-tabs__item {
color: #dedede; color: #dedede;
} }
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #ffe000; color: #ffe000;
background-color: #116791; background-color: #3a5f94c9;
border-right-color: #116791; border-right-color: #3a5f94c9;
border-left-color: #116791; border-left-color: #3a5f94c9;
} }
.el-tabs__item:not(.is-disabled):hover { .el-tabs__item:not(.is-disabled):hover {
color: #ffe000; color: #ffe000;
...@@ -495,7 +495,7 @@ export default { ...@@ -495,7 +495,7 @@ export default {
float: left; float: left;
margin-left: 20px; margin-left: 20px;
overflow-y: auto; overflow-y: auto;
border: 1px solid #125473; border: 1px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
} }
......
src/view/sjgl/flfggl.vue
View file @ 1d7f0d99
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
> .el-tabs--border-card { > .el-tabs--border-card {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 4px); height: calc(100% - 4px);
border: 2px solid #125473; border: 2px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
background: #ffffff00; background: #ffffff00;
...@@ -76,15 +76,15 @@ export default { ...@@ -76,15 +76,15 @@ export default {
} }
> .el-tabs__header { > .el-tabs__header {
background-color: unset; background-color: unset;
border-bottom: 2px solid #125473; border-bottom: 2px solid #3a5f94c9;
.el-tabs__item { .el-tabs__item {
color: #dedede; color: #dedede;
} }
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #ffe000; color: #ffe000;
background-color: #116791; background-color: #3a5f94c9;
border-right-color: #116791; border-right-color: #3a5f94c9;
border-left-color: #116791; border-left-color: #3a5f94c9;
} }
.el-tabs__item:not(.is-disabled):hover { .el-tabs__item:not(.is-disabled):hover {
color: #ffe000; color: #ffe000;
......
src/view/sjgl/fzjcgl.vue
View file @ 1d7f0d99
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
>.el-tabs--border-card { >.el-tabs--border-card {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 4px); height: calc(100% - 4px);
border: 2px solid #125473; border: 2px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
background: #ffffff00; background: #ffffff00;
...@@ -73,15 +73,15 @@ export default { ...@@ -73,15 +73,15 @@ export default {
} }
> .el-tabs__header { > .el-tabs__header {
background-color: unset; background-color: unset;
border-bottom: 2px solid #125473; border-bottom: 2px solid #3a5f94c9;
.el-tabs__item { .el-tabs__item {
color: #dedede; color: #dedede;
} }
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #ffe000; color: #ffe000;
background-color: #116791; background-color: #3a5f94c9;
border-right-color: #116791; border-right-color: #3a5f94c9;
border-left-color: #116791; border-left-color: #3a5f94c9;
} }
.el-tabs__item:not(.is-disabled):hover { .el-tabs__item:not(.is-disabled):hover {
color: #ffe000; color: #ffe000;
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
float: left; float: left;
margin-left: 20px; margin-left: 20px;
overflow-y: auto; overflow-y: auto;
border: 1px solid #125473; border: 1px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
} }
......
src/view/sjgl/xxxlgl.vue
View file @ 1d7f0d99
...@@ -2831,14 +2831,14 @@ export default { ...@@ -2831,14 +2831,14 @@ export default {
.el-tabs--border-card { .el-tabs--border-card {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 4px); height: calc(100% - 4px);
border: 2px solid #125473; border: 2px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
background: #ffffff00; background: #ffffff00;
.el-tabs__header { .el-tabs__header {
background-color: unset; background-color: unset;
border-bottom: 2px solid #125473; border-bottom: 2px solid #3a5f94c9;
.el-tabs__item { .el-tabs__item {
color: #dedede; color: #dedede;
...@@ -2846,9 +2846,9 @@ export default { ...@@ -2846,9 +2846,9 @@ export default {
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #ffe000; color: #ffe000;
background-color: #116791; background-color: #3a5f94c9;
border-right-color: #116791; border-right-color: #3a5f94c9;
border-left-color: #116791; border-left-color: #3a5f94c9;
} }
.el-tabs__item:not(.is-disabled):hover { .el-tabs__item:not(.is-disabled):hover {
......
src/view/sjgl/yqjcgl.vue
View file @ 1d7f0d99
...@@ -1501,14 +1501,14 @@ export default { ...@@ -1501,14 +1501,14 @@ export default {
.el-tabs--border-card { .el-tabs--border-card {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 4px); height: calc(100% - 4px);
border: 2px solid #125473; border: 2px solid #3a5f94c9;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
background: #ffffff00; background: #ffffff00;
.el-tabs__header { .el-tabs__header {
background-color: unset; background-color: unset;
border-bottom: 2px solid #125473; border-bottom: 2px solid #3a5f94c9;
.el-tabs__item { .el-tabs__item {
color: #dedede; color: #dedede;
...@@ -1516,9 +1516,9 @@ export default { ...@@ -1516,9 +1516,9 @@ export default {
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #ffe000; color: #ffe000;
background-color: #116791; background-color: #3a5f94c9;
border-right-color: #116791; border-right-color: #3a5f94c9;
border-left-color: #116791; border-left-color: #3a5f94c9;
} }
.el-tabs__item:not(.is-disabled):hover { .el-tabs__item:not(.is-disabled):hover {
......
src/view/xjssy/components/newTechniqueDialog.vue
View file @ 1d7f0d99
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
} else if (this.form.technique == 4) { } else if (this.form.technique == 4) {
if (this.form.text.trim() != '') { if (this.form.text.trim() != '') {
emotionNews({ data: this.form.text.trim() }).then(res => { emotionNews({ data: this.form.text.trim() }).then(res => {
this.form.result = JSON.parse(res.score); this.form.result = JSON.parse(res).score;
}).catch(err=>{ }).catch(err=>{
this.$message.warning(err.message); this.$message.warning(err.message);
}) })
......
webpack.config.js
View file @ 1d7f0d99
...@@ -11,7 +11,7 @@ module.exports = { ...@@ -11,7 +11,7 @@ module.exports = {
entry: path.resolve(__dirname, './src/main.js'), // 项目入口文件 entry: path.resolve(__dirname, './src/main.js'), // 项目入口文件
output: { output: {
filename: '[name].[contenthash:8].js', filename: '[name].[contenthash:8].js',
path: path.resolve(__dirname, './dist') // 打包后的目录 path: path.resolve(__dirname, './web') // 打包后的目录
}, },
resolve:{ resolve:{
alias:{ alias:{
......
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