Skip to content

T
thinkApp
Commit d7ec9568 authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

parents fc8f6f8e 244ec4dc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 347 deletions
src/components/setComments/rulesPopup.vue
View file @ d7ec9568
<template> <template>
<view class="rulesPopup-box"> <view class="rulesPopup-box">
<van-popup :show="show" :round="true" @close="closepopup"> <van-popup :show="show" :round="true" @close="closepopup">
<view class="rulesPopup-box"> <view class="rulesPopup-box">
<van-icon class="rulesPopup-closure" name="cross" @click="closepopup"/> <van-icon class="rulesPopup-closure" name="cross" @click="closepopup" />
<view class="rulesPopup-title">自定义评论规则</view> <view class="rulesPopup-title">自定义评论规则</view>
<view class="rulesPopup-content"> <view class="rulesPopup-content">
<input v-model="uploadParm.ExamName" class="rulesPopup-name" placeholder="请输入本组自定义规则名称"/> <input v-model="ruleObj.Title" class="rulesPopup-name" placeholder="请输入本组自定义规则名称" />
<view class="rulesPopup-RuleSettings"> <view class="rulesPopup-RuleSettings">
<text class="RuleSettings-title">规则设置</text> <text class="RuleSettings-title">规则设置</text>
<view class="RuleSettings-slider"> <view class="RuleSettings-slider">
<van-slider v-model="value" bar-height="10rpx" active-color="#ee0a24"> <van-slider v-model="valueNum" :range="isRange" @change="onChange" />
<template #button> </view>
<div class="custom-button">{{ value }}</div> </view>
</template> </view>
</van-slider> <view class="RuleSettings-content">
<!-- <van-slider v-model="valueNum" range <textarea placeholder="请填写评论内容" v-model="ruleObj.Info"></textarea>
bar-height="4px" active-color="#ee0a24" </view>
@change="onChange" /> --> <view class="rulesPopup-save flex">
</view> <view @click="save">保存</view>
</view> </view>
</view> </view>
<view class="RuleSettings-content"> </van-popup>
<textarea placeholder="请填写评论内容"></textarea>
</view>
<view class="rulesPopup-save flex">
<view @click="save">保存</view>
</view>
</view>
</van-popup>
</view> </view>
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
onMounted, onMounted,
getCurrentInstance, getCurrentInstance,
inject, inject,
watch watch
} from "vue"; } from "vue";
import { uploadFile } from "@/utils/index"; import {
uploadFile
} from "@/utils/index";
export default { export default {
props: { props: {
}, },
emits: ['change'],
components: {}, components: {},
setup(props,ctx) { setup(props, ctx) {
// 双滑块模式时，值必须是数组 let {
const value = ref([10, 50]);
let {
proxy proxy
} = getCurrentInstance(); } = getCurrentInstance();
let data = reactive({ let data = reactive({
valueNum: ref([0, 0]), valueNum: [10, 50],
show: false, show: false,
loading: false, loading: false,
isRange: true,
ruleObj: {
DetailId: 0, //详情编号
Title: "", //标题
StartNum: 0, //开始值
EndNum: 0, //结束值
Info: "", //评价
}
}); });
let methods = { let methods = {
showFun(){ showFun(item) {
data.show = true if (item) {
}, data.ruleObj.DetailId = item.DetailId;
closepopup(){ data.ruleObj.StartNum = item.StartNum;
data.show = false data.ruleObj.EndNum = item.EndNum;
}, data.ruleObj.Info = item.Info;
onChange(value){ } else {
console.log(value) data.ruleObj.DetailId = 0;
// data.valueNum = value data.ruleObj.StartNum = 0;
// console.log(data.valueNum) data.ruleObj.EndNum = 0;
}, data.ruleObj.Info = "";
save(){ }
data.show = false data.show = true
} },
}; closepopup() {
data.show = false
},
onChange(value) {
console.log(value)
},
save() {
data.ruleObj.StartNum = data.valueNum[0];
data.ruleObj.EndNum = data.valueNum[1];
ctx.emit("change", data.ruleObj);
data.show = false
}
};
let that = methods; let that = methods;
return { return {
...toRefs(data), ...toRefs(data),
value, ...methods
...methods
}; };
}, },
onLoad(){ onLoad() {
}, },
onShow() { onShow() {
} }
}; };
</script> </script>
<style scoped> <style scoped>
.custom-button { .custom-button {
width: 26rpx; width: 26rpx;
color: #fff; color: #fff;
font-size: 20rpx; font-size: 20rpx;
line-height: 36rpx; line-height: 36rpx;
text-align: center;
background-color: #ee0a24;
border-radius: 100rpx;
}
.RuleSettings-slider{
padding: 52rpx 0 66rpx 0;
}
.rulesPopup-save view{
background: #C91727;
font-size: 30rpx;
font-weight: bold;
letter-spacing: 1rpx;
width: 260rpx;
line-height: 88rpx;
border-radius: 44rpx;
text-align: center;
color: #FFFFFF;
}
.rulesPopup-save{
justify-content: flex-end;
margin-top: 40rpx;
}
.RuleSettings-content textarea{
width: 100%;
}
.RuleSettings-content{
background: #F7F7F7;
border-radius: 30rpx;
min-height: 152rpx;
padding: 37rpx 43rpx;
}
.RuleSettings-title{
font-size: 30rpx;
font-weight: bold;
color: #282828;
}
.rulesPopup-box .noData{
text-align: center; text-align: center;
flex:1; background-color: #ee0a24;
border-radius: 100rpx;
}
.RuleSettings-slider {
padding: 52rpx 0 66rpx 0;
}
.rulesPopup-save view {
background: #C91727;
font-size: 30rpx;
font-weight: bold;
letter-spacing: 1rpx;
width: 260rpx;
line-height: 88rpx;
border-radius: 44rpx;
text-align: center;
color: #FFFFFF;
}
.rulesPopup-save {
justify-content: flex-end;
margin-top: 40rpx;
}
.RuleSettings-content textarea {
width: 100%; width: 100%;
} }
.rulesPopup-box .noData image{
width:200rpx; .RuleSettings-content {
background: #F7F7F7;
border-radius: 30rpx;
min-height: 152rpx;
padding: 37rpx 43rpx;
}
.RuleSettings-title {
font-size: 30rpx;
font-weight: bold;
color: #282828;
}
.rulesPopup-box .noData {
text-align: center;
flex: 1;
width: 100%;
}
.rulesPopup-box .noData image {
width: 200rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
.rulesPopup-box .noData view{
.rulesPopup-box .noData view {
font-size: 24rpx; font-size: 24rpx;
color: #cecece; color: #cecece;
text-align: center; text-align: center;
} }
.rulesPopup-RuleSettings{
background: #FCEEEF; .rulesPopup-RuleSettings {
border-radius: 30rpx; background: #FCEEEF;
padding: 35rpx 41rpx; border-radius: 30rpx;
margin-top: 51rpx; padding: 35rpx 41rpx;
margin-bottom: 40rpx; margin-top: 51rpx;
} margin-bottom: 40rpx;
.rulesPopup-name{ }
background-color: #F7F7F7;
text-align: center; .rulesPopup-name {
border: 1px solid #F7F7F7; background-color: #F7F7F7;
height: 88rpx; text-align: center;
line-height: 88rpx; border: 1px solid #F7F7F7;
padding: 0 10rpx; height: 88rpx;
border-radius: 44rpx; line-height: 88rpx;
font-size: 30rpx; padding: 0 10rpx;
letter-spacing: 1rpx; border-radius: 44rpx;
} font-size: 30rpx;
.rulesPopup-title{ letter-spacing: 1rpx;
width: 100%; }
text-align: center;
font-size: 30rpx; .rulesPopup-title {
font-weight: 500; width: 100%;
margin-bottom: 73rpx; text-align: center;
letter-spacing: 1rpx; font-size: 30rpx;
} font-weight: 500;
.rulesPopup-closure{ margin-bottom: 73rpx;
position: absolute; letter-spacing: 1rpx;
right: 31rpx; }
top: 31rpx;
color: #282828; .rulesPopup-closure {
font-size: 38rpx; position: absolute;
} right: 31rpx;
.rulesPopup-box{ top: 31rpx;
position: relative; color: #282828;
width: 548rpx; font-size: 38rpx;
padding: 48rpx 55rpx 60rpx 55rpx; }
}
.rulesPopup-box{ .rulesPopup-box {
position: relative;
} width: 548rpx;
padding: 48rpx 55rpx 60rpx 55rpx;
}
.rulesPopup-box {}
</style> </style>
src/pages/index/workSituation.vue
View file @ d7ec9568
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
> >
<operation v-if="tabNme=='作业情况'" :dataList="homeWorks"></operation> <operation v-if="tabNme=='作业情况'" :dataList="homeWorks"></operation>
<studentList @selected="selectStuHandler" v-if="tabNme=='学生列表'" :dataList="students"></studentList> <studentList @selected="selectStuHandler" v-if="tabNme=='学生列表'" :dataList="students"></studentList>
<examList v-if="tabNme=='考试信息'" :dataList="exams"></examList> <examList v-if="tabNme=='考试信息'" :dataList="exams" :CourseId="currentCourseId"></examList>
</scroll-view> </scroll-view>
<Loadmore :state="pageState" /> <Loadmore :state="pageState" />
</view> </view>
......
src/pages/setComments/commentRulesList.vue
View file @ d7ec9568
This diff is collapsed.
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