Skip to content

C
confucius
Commit b92c788d authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents 76b8090e e3cdf48e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1094 additions and 297 deletions
src/App.vue
View file @ b92c788d
......@@ -20,7 +20,7 @@ export default {
</script>
<style>
@import url("//at.alicdn.com/t/font_2077629_ou0hmd4zmr8.css");
@import url("//at.alicdn.com/t/font_2077629_wob6liq2kxn.css");
.q-scrollarea__thumb {
z-index: 999999 !important;
}
......
src/api/system/wechat.js
View file @ b92c788d
......@@ -312,7 +312,7 @@ export function SetSynvEduEmployee(data) {
*/
export function getWeChatChannelInfo(data) {
return request({
url: '/QYWeChat/GetWeChatChannelInfo',
url: '/QYWeChat/GetWeChatChannelInfo_V2',
method: 'post',
data
})
......
src/components/enterprise/chaneelcode-form.vue
View file @ b92c788d
......@@ -93,11 +93,11 @@
<el-form-item label="固定时段：" v-if="peopletype==1">
<div v-for="(x,y) in addMsg " :key="y"
style="display: flex;align-items: center;margin-top: 10px;">
<el-time-select :disabled="y==0" placeholder="起始时间" v-model="x.SrartHours"
<el-time-select :disabled="y==0" placeholder="起始时间" v-model="x.StartHours"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select>
<el-time-select :disabled="y==0" placeholder="结束时间" v-model="x.EndHours"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.SrartHours}">
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}">
</el-time-select>
<el-select v-model="x.EmpId" placeholder="请选择" @change="selectPersonnel(y)">
<el-option filterable v-for="item in Employeelist" :key="item.Id"
......@@ -112,11 +112,11 @@
<el-form-item label="固定时段：" v-if="peopletype==2">
<div v-for="(x,y) in addMsg " :key="y" >
<div style="display: flex;align-items: flex-start;margin-top: 10px;">
<el-time-select :disabled="y==0" placeholder="起始时间" v-model="x.SrartHours"
<el-time-select :disabled="y==0" placeholder="起始时间" v-model="x.StartHours"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select>
<el-time-select :disabled="y==0" placeholder="结束时间" v-model="x.EndHours"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.SrartHours}">
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}">
</el-time-select>
<div style="max-width: 320px;">
<div>
......@@ -184,7 +184,7 @@
default: '',
},
peopletype: {
type: String,
type: Number,
default: 1,
},
......@@ -212,11 +212,11 @@
created() {
if (this.peopletype == 1) {//单人模式
this.addMsg = [
{ Id: 0, Week: '', IsDefault: 1, SrartHours: '00:00', EndHours: "00:00", EmpId: '', EmpName: '', }
{ Id: 0, Week: '', IsDefault: 1, StartHours: '00:00', EndHours: "00:00", EmpId: '', EmpName: '', }
]
} else {
this.addMsg = [
{ Id: 0, Week: '', IsDefault: 1, SrartHours: '00:00', EndHours: "00:00", EmpList: [], DeptList: [], returnString:[],}
{ Id: 0, Week: '', IsDefault: 1, StartHours: '00:00', EndHours: "00:00", EmpList: [], DeptList: [], returnString:[],}
]
}
if (this.lsday != '') {//修改单独周几
......@@ -271,10 +271,10 @@
},
adddata() {
if (this.peopletype == 1) {//单人模式
let obj = { Id: 0, Week: '', IsDefault: 2, SrartHours: '', EndHours: "", EmpId: '', EmpName: '', }
let obj = { Id: 0, Week: '', IsDefault: 2, StartHours: '', EndHours: "", EmpId: '', EmpName: '', }
this.addMsg.push(obj)
} else {
let obj = { Id: 0, Week: '', IsDefault: 2, SrartHours: '', EndHours: "", EmpList: [], DeptList: [], returnString:[],}
let obj = { Id: 0, Week: '', IsDefault: 2, StartHours: '', EndHours: "", EmpList: [], DeptList: [], returnString:[],}
this.addMsg.push(obj)
}
},
......@@ -306,7 +306,7 @@
let isHours = false;
this.addMsg.map((x, i) => {
if (i > 0) {
if (x.SrartHours == '' || x.EndHours == '') {
if (x.StartHours == '' || x.EndHours == '') {
isHours = true;
return
}
......@@ -386,7 +386,7 @@
let isHours = false;
this.addMsg.map((x, i) => {
if (i > 0) {
if (x.SrartHours == '' || x.EndHours == '') {
if (x.StartHours == '' || x.EndHours == '') {
isHours = true;
return
}
......
src/components/enterprise/welcome-from.vue
View file @ b92c788d
......@@ -98,7 +98,7 @@
</div>
</el-form-item>
<el-form-item label="添加内容：">
<div v-if="addMsg.MediumModel.length>0">
<div v-if="addMsg.MediumModel && addMsg.MediumModel.length>0">
<div class="row items-center" v-for="(x,y) in addMsg.MediumModel" :key="y">
<i class="el-icon-link"></i>
<span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span>
......@@ -229,7 +229,6 @@
if(type==1){
this.outerVisible = true
}
this.dialogTitle = this.$t('fnc.xzrenyuan');
queryEmployee({}).then(res => {
if (res.Code == 1) {
this.memberList = res.Data;
......
src/components/exam/classstutree-form.vue
View file @ b92c788d
This diff is collapsed.
src/pages/enterprise/addchannelcode.vue
View file @ b92c788d
This diff is collapsed.
src/pages/exam/paperCreate.vue
View file @ b92c788d
......@@ -56,7 +56,7 @@
<q-radio v-model="item.ChooseType" :val="1" label="从题库选题" />
<template v-if="item.ChooseType==1">
<span style="position:relative;top:2px;">共 {{item.QuestionTypeNum}} 道 抽
<el-input style="width:100px;" size="small" :disabled="item.QuestionTypeNum<=0" v-model="item.ChooseNum" @keyup.native="checkInteger(item,'ChooseNum')" maxlength="5"></el-input>
<el-input style="width:100px;" size="small" :disabled="item.QuestionTypeNum<=0" @input="getMaxInput(item)" v-model="item.ChooseNum" @keyup.native="checkInteger(item,'ChooseNum')" maxlength="5"></el-input>
&nbsp;&nbsp;道</span>
</template>
</span>
......@@ -67,7 +67,7 @@
<div style="margin:0 0 20px 40px;" v-for="(subItem,subIndex) in item.ChooseList" :key="subIndex">
{{subItem.DifficultyTypeName}} （共
{{subItem.DifficultyTypeCount}} 道） 抽
<el-input style="width:100px;" size="small" :disabled="subItem.DifficultyTypeCount<=0" @keyup.native="checkInteger(subItem,'ChooseNum')" v-model="subItem.ChooseNum" maxlength="5"></el-input>
<el-input style="width:100px;" size="small" :disabled="subItem.DifficultyTypeCount<=0" @input="getMaxMiniInput(subItem)" @keyup.native="checkInteger(subItem,'ChooseNum')" v-model="subItem.ChooseNum" maxlength="5"></el-input>
&nbsp;&nbsp;道
</div>
</template>
......@@ -84,7 +84,7 @@
<br />
<div class="row">
<q-btn color="accent" size="sm" @click="setPaperTemplate" class="q-mr-md" label="保存"  />
<q-btn color="accent" size="sm" @click="setPaperTemplate" class="q-mr-md" label="保存" :loading="saveLoading" />
</div>
<questionbankForm v-if="isShowQuestionBank"  @close="closeExamForm"  @success="getBankData">
</questionbankForm>
......@@ -132,6 +132,7 @@
BankList: [],
MoreQuestionTypeId: "", //更多题型
questionTypeList: [], //问题列表
saveLoading:false
}
},
created() {
......@@ -142,6 +143,17 @@
},
methods: {
//设置最大值
getMaxInput(item){
if(item.ChooseNum>item.QuestionTypeNum){
item.ChooseNum='';
}
},
getMaxMiniInput(item){
if(item.ChooseNum>item.DifficultyTypeCount){
item.ChooseNum='';
}
},
//获取题型列表
getQuestionType() {
queryQuestionTypeList({}).then(res => {
......@@ -345,7 +357,7 @@
if (!this.$refs.TemplateNum.hasError) {
let TotalNum = 0;
for(let i=0;i<this.templateMsg.TemplateData.length;i++){
if(this.templateMsg.TemplateData[i].ChooseType==1&&this.templateMsg.TemplateData[i].ChooseNum==''){
if(this.templateMsg.TemplateData[i].ChooseType==1&&this.templateMsg.TemplateData[i].ChooseNum===''){
this.$q.notify({
type: 'negative',
position: "top",
......@@ -363,7 +375,9 @@
})
return
}
this.saveLoading=true;
savePaperTemplate(this.templateMsg).then(res => {
this.saveLoading=false;
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
......
src/pages/exam/paperEdit.vue
View file @ b92c788d
This diff is collapsed.
src/pages/exam/paperInfo.vue
View file @ b92c788d
......@@ -445,7 +445,7 @@
this.examNum += x.DetailsList.length;
x.DetailsList.forEach(y => {
if (y.Score) {
this.examScore += parseInt(y.Score);
this.examScore += Number(y.Score);
}
})
}
......
src/pages/exam/paperPublish.vue
View file @ b92c788d
......@@ -231,7 +231,7 @@
<div class="row">
<q-btn color="accent" @click="setPublishExam" class="q-mr-md" label="发布考试"  />
</div>
<classstutreeForm v-if="isShowClassStu"  @close="closeClassStuForm"  @success="getClassStuList">
<classstutreeForm v-if="isShowClassStu" :sendStudent="sendStudent"  @close="closeClassStuForm"  @success="getClassStuList">
</classstutreeForm>
</div>
</template>
......@@ -282,6 +282,7 @@
},
isShowClassStu: false, //是否显示学员弹窗
sendStudent:[], //传送已选学生
}
},
created() {
......@@ -295,6 +296,23 @@
},
mounted() {
},
watch:{
"postMsg.StudentList":{
handler(val){
this.sendStudent = [];
val.forEach(x=>{
let obj={
ClassId:x.ClassId,
CourseId:x.CourseId,
GuestId:x.GuestId,
Name:x.GuestName,
OrderId:x.OrderId
}
this.sendStudent.push(obj);
})
}
}
},
methods: {
//删除发放对象
......@@ -305,7 +323,6 @@
queryExamPublish({
Id: this.postMsg.Id
}).then(res => {
console.log("res", res);
if (res.Code == 1) {
var tempData = res.Data;
if (tempData) {
......@@ -347,6 +364,7 @@
},
//获取选中的需要列表
getClassStuList(array) {
this.postMsg.StudentList=[];
if (array && array.length > 0) {
array.forEach(item => {
this.postMsg.StudentList.push({
......
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