Skip to content

X
xxx_phase2_web
Commit 68bd5de4 authored by 夏敏伟's avatar 夏敏伟
Browse files
Options

修改测试提出的bug

parent 2833ba7f
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 188 deletions
src/api/resource.js
View file @ 68bd5de4
import { get, post,delete_util } from "../util/http_util"; import { get, post, delete_util } from "../util/http_util";
//#region 公共 //#region 公共
//服务前缀 //服务前缀
...@@ -44,9 +44,9 @@ export function queryQuestionTree() { ...@@ -44,9 +44,9 @@ export function queryQuestionTree() {
* @param {*} treeId * @param {*} treeId
* @returns * @returns
*/ */
export function queryQuestion(pageNum, pageSize, content, treeId) { export function queryQuestion(pageNum, pageSize, content, treeId, startDate, endDate) {
let url = `${PREFIX}/queryQuestion`; let url = `${PREFIX}/queryQuestion`;
url += addParam({ pageNum, pageSize, content, treeId }); url += addParam({ pageNum, pageSize, content, treeId, startDate, endDate });
return get(url); return get(url);
} }
...@@ -89,8 +89,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -89,8 +89,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} measure * @param {*} measure
* @returns * @returns
*/ */
export function addNewQuestion(param){ export function addNewQuestion(param) {
return post(`${PREFIX}/addQuestion`,param); return post(`${PREFIX}/addQuestion`, param);
} }
/** /**
...@@ -102,8 +102,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -102,8 +102,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} measure * @param {*} measure
* @returns * @returns
*/ */
export function UpdateQuestion(param){ export function UpdateQuestion(param) {
return post(`${PREFIX}/updateQuestion`,param); return post(`${PREFIX}/updateQuestion`, param);
} }
/** /**
...@@ -114,8 +114,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -114,8 +114,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} parentCode * @param {*} parentCode
* @returns * @returns
*/ */
export function addQuestionTreeNode(param){ export function addQuestionTreeNode(param) {
return post(`${PREFIX}/addQuestionTreeNode`,param); return post(`${PREFIX}/addQuestionTreeNode`, param);
} }
/** /**
...@@ -126,8 +126,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -126,8 +126,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} parentCode * @param {*} parentCode
* @returns * @returns
*/ */
export function updateQuestionTreeNode(param){ export function updateQuestionTreeNode(param) {
return post(`${PREFIX}/updateQuestionTreeNode`,param); return post(`${PREFIX}/updateQuestionTreeNode`, param);
} }
/** /**
...@@ -135,7 +135,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -135,7 +135,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} id * @param {*} id
* @returns * @returns
*/ */
export function removeQuestionTreeNode(id){ export function removeQuestionTreeNode(id) {
return delete_util(`${PREFIX}/removeQuestionTreeNode?id=${id}`); return delete_util(`${PREFIX}/removeQuestionTreeNode?id=${id}`);
} }
...@@ -144,15 +144,15 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -144,15 +144,15 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} ids * @param {*} ids
* @returns * @returns
*/ */
export function removeQuestion(ids){ export function removeQuestion(ids) {
return delete_util(`${PREFIX}/removeQuestion`,ids); return delete_util(`${PREFIX}/removeQuestion`, ids);
} }
/** /**
* 想定作业查询选项树 * 想定作业查询选项树
* @returns * @returns
*/ */
export function queryQuestionOptionsTree(type){ export function queryQuestionOptionsTree(type) {
return get(`${PREFIX}/queryQuestionOptionsTree?type=${type}`); return get(`${PREFIX}/queryQuestionOptionsTree?type=${type}`);
} }
...@@ -164,8 +164,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -164,8 +164,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} name * @param {*} name
* @returns * @returns
*/ */
export function addWebsite(param){ export function addWebsite(param) {
return post(`${PREFIX_Sentiment}/addWebsite`,param); return post(`${PREFIX_Sentiment}/addWebsite`, param);
} }
/** /**
...@@ -173,8 +173,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -173,8 +173,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} ids * @param {*} ids
* @returns * @returns
*/ */
export function removeWebsite(ids){ export function removeWebsite(ids) {
return delete_util(`${PREFIX_Sentiment}/removeWebsite`,ids); return delete_util(`${PREFIX_Sentiment}/removeWebsite`, ids);
} }
/** /**
...@@ -185,8 +185,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -185,8 +185,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} name * @param {*} name
* @returns * @returns
*/ */
export function editWebsite(ids){ export function editWebsite(ids) {
return post(`${PREFIX_Sentiment}/updateWebsite`,ids); return post(`${PREFIX_Sentiment}/updateWebsite`, ids);
} }
/** /**
...@@ -195,8 +195,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -195,8 +195,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} name * @param {*} name
* @returns * @returns
*/ */
export function addCountry(param){ export function addCountry(param) {
return post(`${PREFIX_Sentiment}/addSource`,param); return post(`${PREFIX_Sentiment}/addSource`, param);
} }
/** /**
...@@ -205,7 +205,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -205,7 +205,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} name * @param {*} name
* @returns * @returns
*/ */
export function editCountry(param){ export function editCountry(param) {
return post(`${PREFIX_Sentiment}/updateSource?id=${param.id}&name=${param.name}`); return post(`${PREFIX_Sentiment}/updateSource?id=${param.id}&name=${param.name}`);
} }
...@@ -214,7 +214,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -214,7 +214,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} id * @param {*} id
* @returns * @returns
*/ */
export function removeCountry(id){ export function removeCountry(id) {
return post(`${PREFIX_Sentiment}/removeSource?id=${id}`); return post(`${PREFIX_Sentiment}/removeSource?id=${id}`);
} }
...@@ -225,9 +225,9 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -225,9 +225,9 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} parentId * @param {*} parentId
* @returns * @returns
*/ */
export function addQuestionOptionsTreeNode(label,type,parentId){ export function addQuestionOptionsTreeNode(label, type, parentId) {
let url = `${PREFIX}/addQuestionOptionsTreeNode`; let url = `${PREFIX}/addQuestionOptionsTreeNode`;
url += addParam({ label, type, parentId}); url += addParam({ label, type, parentId });
return post(url); return post(url);
} }
...@@ -236,7 +236,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -236,7 +236,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} id * @param {*} id
* @returns * @returns
*/ */
export function removeQuestionOptionsTreeNode(id){ export function removeQuestionOptionsTreeNode(id) {
return delete_util(`${PREFIX}/removeQuestionOptionsTreeNode?id=${id}`); return delete_util(`${PREFIX}/removeQuestionOptionsTreeNode?id=${id}`);
} }
...@@ -246,7 +246,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) { ...@@ -246,7 +246,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
* @param {*} id * @param {*} id
* @returns * @returns
*/ */
export function updateQuestionOptionsTreeNode(label,id){ export function updateQuestionOptionsTreeNode(label, id) {
return post(`${PREFIX}/updateQuestionOptionsTreeNode?label=${label}&id=${id}`); return post(`${PREFIX}/updateQuestionOptionsTreeNode?label=${label}&id=${id}`);
} }
//#endregion //#endregion
\ No newline at end of file
src/view/ddkz/components/chatRoomMemberDialog.vue
View file @ 68bd5de4
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
<style lang="scss"> <style lang="scss">
.info-personInfo { .info-personInfo {
width: 100%; width: 100%;
height: 40%; height: 42%;
overflow-y: auto; overflow-y: auto;
.title { .title {
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
} }
} }
.personInfo-footer{ .personInfo-footer{
width: 100%; width: 98%;
height: 50px; height: 50px;
text-align: right; text-align: right;
} }
......
src/view/ddkz/components/noticeDialog.vue
View file @ 68bd5de4
...@@ -138,7 +138,9 @@ export default { ...@@ -138,7 +138,9 @@ export default {
text-align: center; text-align: center;
.el-dialog__headerbtn { .el-dialog__headerbtn {
top: 40px; top: 35px;
right: 30px;
font-size: 25px;
} }
} }
......
src/view/sjgl/ddkzConfig/ddkzConfigApprove.vue
View file @ 68bd5de4
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
}) })
}, },
searchChatList() { searchChatList() {
if (this.form.dateRange.length == 2) { if (this.form.dateRange&&this.form.dateRange.length == 2) {
this.getApprovalPendingFn(this.form.chatRoomName, this.pageObj.currentPage, this.pageObj.pageSize, this.form.dateRange[0], this.form.dateRange[1], this.userInfo.account, this.form.status); this.getApprovalPendingFn(this.form.chatRoomName, this.pageObj.currentPage, this.pageObj.pageSize, this.form.dateRange[0], this.form.dateRange[1], this.userInfo.account, this.form.status);
} else { } else {
this.getApprovalPendingFn(this.form.chatRoomName, this.pageObj.currentPage, this.pageObj.pageSize, null, null, this.userInfo.account, this.form.status); this.getApprovalPendingFn(this.form.chatRoomName, this.pageObj.currentPage, this.pageObj.pageSize, null, null, this.userInfo.account, this.form.status);
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
getApprovalPendingFn(...params) { getApprovalPendingFn(...params) {
getApprovalPending(...params).then(res => { getApprovalPending(...params).then(res => {
this.meetingList = res.records; this.meetingList = res.records;
this.pageObj.currentPage = res.currentPage; this.pageObj.currentPage = res.currPage;
this.pageObj.pageSize = res.pageSize; this.pageObj.pageSize = res.pageSize;
this.pageObj.total = res.total; this.pageObj.total = res.total;
}).catch(error => { }).catch(error => {
......
src/view/sjgl/ddkzConfig/ddkzConfigExercise.vue
View file @ 68bd5de4
<template> <template>
<el-dialog title="演习配置" :visible.sync="dialogVisible" width="40%" :before-close="handleClose" @open="handleDialogOpen"> <el-dialog class="myExerciseDialog" title="演习配置" :visible.sync="dialogVisible" width="40%" :before-close="handleClose"
@open="handleDialogOpen">
<div class="configExercise"> <div class="configExercise">
<el-form class="yhf" v-for="(item, index) in formData.teams" :key="index" label-width="80px"> <el-form class="yhf" v-for="(item, index) in formData.teams" :key="index" label-width="80px">
<el-form-item label="队伍名称"> <el-form-item label="队伍名称">
...@@ -348,183 +349,185 @@ export default { ...@@ -348,183 +349,185 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.el-dialog { .myExerciseDialog {
padding: 20px; .el-dialog {
box-sizing: border-box; padding: 20px;
background-color: transparent; box-sizing: border-box;
background-image: url(../../../assets/img/home/dialog.png); background-color: transparent;
background-size: 100% 100%; background-image: url(../../../assets/img/home/dialog.png);
background-repeat: no-repeat; background-size: 100% 100%;
background-repeat: no-repeat;
.el-dialog__header {
text-align: center; .el-dialog__header {
text-align: center;
.el-dialog__headerbtn {
top: 35px; .el-dialog__headerbtn {
top: 35px;
.el-dialog__close {
color: white; .el-dialog__close {
color: white;
}
} }
} }
}
.el-dialog__body { .el-dialog__body {
height: 600px; height: 600px;
.configExercise { .configExercise {
width: 100%; width: 100%;
height: 94%; height: 94%;
overflow-y: auto; overflow-y: auto;
.yhf { .yhf {
width: 98%; width: 98%;
.teamName { .teamName {
width: 200px; width: 200px;
.el-input__inner { .el-input__inner {
color: white !important; color: white !important;
background: none !important; background: none !important;
border: 1px solid #3a5f94c9 !important; border: 1px solid #3a5f94c9 !important;
box-shadow: 0 0 10px #3a5f94c9; box-shadow: 0 0 10px #3a5f94c9;
}
} }
}
.myTag { .myTag {
margin-left: 20px; margin-left: 20px;
} }
.myIcon { .myIcon {
float: right; float: right;
color: red; color: red;
font-size: 20px; font-size: 20px;
margin-top: 8px; margin-top: 8px;
cursor: pointer; cursor: pointer;
} }
.mySelect { .mySelect {
.el-input__inner { .el-input__inner {
color: white !important; color: white !important;
background: none !important; background: none !important;
border: 1px solid #3a5f94c9 !important; border: 1px solid #3a5f94c9 !important;
box-shadow: 0 0 10px #3a5f94c9; box-shadow: 0 0 10px #3a5f94c9;
}
} }
}
.el-divider { .el-divider {
background-color: #3a5f94c9 !important; background-color: #3a5f94c9 !important;
} }
.ta-transfer { .ta-transfer {
width: 98%; width: 98%;
height: 300px; height: 300px;
// margin-bottom: 50px; // margin-bottom: 50px;
margin-left: 1%; margin-left: 1%;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.ta-transfer_left, .ta-transfer_left,
.ta-transfer_right { .ta-transfer_right {
width: 30%; width: 30%;
height: 100%; height: 100%;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
border-radius: 5px; border-radius: 5px;
.transfer-view-head {
width: 100%;
height: 50px;
background-color: #f5f7fa;
border-bottom: 1px solid #ebeef5;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 10px;
box-sizing: border-box;
.head_left { .transfer-view-head {
width: 100%;
height: 50px;
background-color: #f5f7fa;
border-bottom: 1px solid #ebeef5;
display: flex; display: flex;
width: 70%; justify-content: space-between;
height: 100%; align-items: center;
padding: 0 10px;
box-sizing: border-box;
.el-checkbox { .head_left {
display: flex; display: flex;
align-items: center; width: 70%;
height: 100%; height: 100%;
width: 100%;
}
.el-checkbox__label { .el-checkbox {
font-size: 16px; display: flex;
align-items: center;
height: 100%;
width: 100%;
}
.el-checkbox__label {
font-size: 16px;
}
} }
}
.head_right { .head_right {
width: 30%; width: 30%;
span { span {
font-size: 14px; font-size: 14px;
color: #909399; color: #909399;
}
} }
} }
}
.transfer-view-main {
width: 100%;
height: calc(100% - 50px);
padding: 10px 10px 0 10px;
box-sizing: border-box;
overflow-y: auto;
.transfer-view-item { .transfer-view-main {
margin-bottom: 10px;
width: 100%; width: 100%;
height: 20px; height: calc(100% - 50px);
// background-color: #c5c1c1; padding: 10px 10px 0 10px;
display: flex; box-sizing: border-box;
align-items: center; overflow-y: auto;
.el-checkbox { .transfer-view-item {
margin-bottom: 10px;
width: 100%;
height: 20px;
// background-color: #c5c1c1;
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%;
height: 100%;
.el-checkbox__label { .el-checkbox {
color: #606266; display: flex;
} align-items: center;
width: 100%;
height: 100%;
.el-checkbox__input.is-checked+.el-checkbox__label { .el-checkbox__label {
color: #409eff; color: #606266;
}
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #409eff;
}
} }
}
.el-checkbox:hover { .el-checkbox:hover {
.el-checkbox__label { .el-checkbox__label {
color: #409eff; color: #409eff;
}
} }
} }
} }
} }
}
.ta-transfer_btn { .ta-transfer_btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 30%; width: 30%;
height: 100px; height: 100px;
}
} }
} }
}
.buttonDiv { .buttonDiv {
text-align: center; text-align: center;
} }
}
} }
} }
} }
......
src/view/sjgl/ddkzConfig/ddkzConfigList.vue
View file @ 68bd5de4
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
}); });
}, },
searchChatList() { searchChatList() {
if (this.form.dateRange.length == 2) { if (this.form.dateRange&&this.form.dateRange.length == 2) {
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 }) 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, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword }) this.queryChatRoomListFn({ userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })
......
src/view/xxxl/tklb.vue
View file @ 68bd5de4
...@@ -198,13 +198,14 @@ export default { ...@@ -198,13 +198,14 @@ export default {
//题库修改弹出框 //题库修改弹出框
handleEdit(item) { handleEdit(item) {
let _this = this; let _this = this;
_this.form_edit = {
name: item.questionsName,
id: item.id,
};
_this.centerDialogVisible_edit = true; _this.centerDialogVisible_edit = true;
setTimeout(function () { setTimeout(function () {
_this.$refs.numberValidateForm1.resetFields(); _this.$refs.numberValidateForm1.resetFields();
_this.form_edit = {
name: item.questionsName,
id: item.id,
};
}, 200) }, 200)
}, },
//题库删除 //题库删除
......
src/view/xxxl/xdzylb.vue
View file @ 68bd5de4
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="top-div"> <div class="top-div">
<el-input v-model="wd_name" suffix-icon="el-icon-search" placeholder="请输入关键字"></el-input> <el-input v-model="wd_name" suffix-icon="el-icon-search" placeholder="请输入关键字"></el-input>
<div class="block sjxz"> <div class="block sjxz">
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="sc_time" type="daterange" range-separator="至" <el-date-picker value-format="yyyy-MM-dd" v-model="sc_time" type="daterange" range-separator="至"
start-placeholder="上传起始时间" end-placeholder="上传结束时间" :default-time="['00:00:00', '23:59:59']"> start-placeholder="上传起始时间" end-placeholder="上传结束时间">
</el-date-picker> </el-date-picker>
</div> </div>
<div class="button-discuss" @click="searchs()">搜索</div> <div class="button-discuss" @click="searchList()">搜索</div>
</div> </div>
<div class="bottom-div"> <div class="bottom-div">
<div class="table-div"> <div class="table-div">
...@@ -171,17 +171,17 @@ export default { ...@@ -171,17 +171,17 @@ export default {
history_div(row) { history_div(row) {
this.dialogVisible_lsjl = true; this.dialogVisible_lsjl = true;
queryAnswerQuestionRecord(row.id, 1, 10).then((res) => { queryAnswerQuestionRecord(row.id, 1, 10).then((res) => {
this.tableData_history = res.list.map((e) => { this.tableData_history = res.list.map((e) => {
return { return {
qkfx: e.fullAnalysis, qkfx: e.fullAnalysis,
czcs: e.fullMeasure, czcs: e.fullMeasure,
create: e.answerer, create: e.answerer,
time: e.createTime, time: e.createTime,
qkfxScore: e.score1 * 100, qkfxScore: e.score1 * 100,
czcsScore: e.score2 * 100, czcsScore: e.score2 * 100,
}; };
}); });
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
...@@ -235,6 +235,10 @@ export default { ...@@ -235,6 +235,10 @@ export default {
let _this = this; let _this = this;
_this.handleCurrentChange_lb(1); _this.handleCurrentChange_lb(1);
}, },
//搜索列表
searchList() {
this.handleCurrentChange_lb(1);
},
//pageSize改变事件 //pageSize改变事件
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
...@@ -256,7 +260,7 @@ export default { ...@@ -256,7 +260,7 @@ export default {
name: _this.wd_name == "" ? null : _this.wd_name, name: _this.wd_name == "" ? null : _this.wd_name,
}; };
queryQuestion(pageNum, this.pageSize, this.wd_name, this.treeId) queryQuestion(pageNum, this.pageSize, _this.paramData.name, this.treeId, _this.paramData.beginTime, _this.paramData.endTime)
.then((res) => { .then((res) => {
this.tableData = res.list; this.tableData = res.list;
this.total = res.totals; this.total = res.totals;
...@@ -407,6 +411,7 @@ export default { ...@@ -407,6 +411,7 @@ export default {
overflow: hidden; overflow: hidden;
background-size: 100% 100%; background-size: 100% 100%;
color: white; color: white;
.el-tabs--card>.el-tabs__header { .el-tabs--card>.el-tabs__header {
border-bottom: 1px solid #146a80; border-bottom: 1px solid #146a80;
} }
......
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