Skip to content

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

no message

parent fddae8d0
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 46 deletions
src/components/index/workSituation/examList.vue
View file @ 2ffabe70
...@@ -5,10 +5,18 @@ ...@@ -5,10 +5,18 @@
<text>导入考试信息</text> <text>导入考试信息</text>
</view> </view>
<block v-if="dataList && dataList.length>0"> <block v-if="dataList && dataList.length>0">
<view class="examList activeOne" v-for="(item,index) in dataList" :key="index"> <view style="border-radius: 50rpx;background: #ffffff;overflow: hidden;box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);margin-bottom: 40rpx;"
<view class="examList-center-box" @click="examDetails(item)"> class="examList activeOne" v-for="(item,index) in dataList" :key="index">
<van-swipe-cell
id="swipe-cell"
:right-width="116"
async-close
:key="index"
@close="onClose">
<view class="examList-center-box">
<view class="examList-center-line"></view> <view class="examList-center-line"></view>
<view class="examList-center flex"> <view class="examList-center flex" @click="examDetails(item)">
<view class="examList-left"> <view class="examList-left">
<view class="examList-name">{{item.ExamName}}</view> <view class="examList-name">{{item.ExamName}}</view>
<view class="examList-state flex"> <view class="examList-state flex">
...@@ -31,7 +39,7 @@ ...@@ -31,7 +39,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="examList-center-hint flex" v-if="item.FailNum>0"> <view class="examList-center-hint flex" v-if="item.FailNum>0" @click="examDetails(item)">
<view class="examList-hint-left flex"> <view class="examList-hint-left flex">
<van-icon name="warning" /> <van-icon name="warning" />
<view> <view>
...@@ -42,8 +50,12 @@ ...@@ -42,8 +50,12 @@
<view @click.stop="clickReimport(item)">重新导入</view> <view @click.stop="clickReimport(item)">重新导入</view>
</view> </view>
</view> </view>
<view slot="right" class="van-swipe-cell__right">
<van-button square type="danger" @click.stop="DelExamInfo(item)" custom-style="height:100%;">删除</van-button>
</view>
</view> </view>
</van-swipe-cell>
</view> </view>
</block> </block>
<view class="noData" v-else> <view class="noData" v-else>
...@@ -140,6 +152,17 @@ ...@@ -140,6 +152,17 @@
} }
) )
let methods = { let methods = {
onClose(event) {
const { position, instance } = event.detail;
console.log(position,'55555'+instance)
switch (position) {
case 'left':
case 'cell':
case 'right':
instance.close();
break;
}
},
// 跳web上传 // 跳web上传
goUrlWebview(){ goUrlWebview(){
if(data.platform=='windows'||data.platform=='mac'){ if(data.platform=='windows'||data.platform=='mac'){
...@@ -171,12 +194,29 @@ ...@@ -171,12 +194,29 @@
}, },
// 重新导入 // 重新导入
clickReimport(item){ clickReimport(item){
this.goUrlWebview()
},
// 删除接口
DelExamInfo(item){
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '重新导入将要清除此考试数据,是否继续', content: '将要清除此考试数据,是否继续',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.DelExamInfo(item) let Msg = {
ExamId: item.ExamId
}
proxy.$request("/Exam/DelExamInfo", Msg).then(res => {
if(res.Code ==1){
uni.showToast({
title:'删除成功',
icon:'none',
duration: 500
})
proxy.$parent.getExamPageList();
}
})
} else if (res.cancel) { } else if (res.cancel) {
uni.showToast({ uni.showToast({
title:'已取消', title:'已取消',
...@@ -186,23 +226,7 @@ ...@@ -186,23 +226,7 @@
} }
} }
}); });
},
// 删除接口
DelExamInfo(item){
let Msg = {
ExamId: item.ExamId
}
proxy.$request("/Exam/DelExamInfo", Msg).then(res => {
if(res.Code ==1){
uni.showToast({
title:'删除成功',
icon:'none',
duration: 500
})
data.show = true ;
proxy.$parent.getExamPageList();
}
})
}, },
ImportInformation(){ ImportInformation(){
data.show = true data.show = true
...@@ -330,6 +354,16 @@ ...@@ -330,6 +354,16 @@
}; };
</script> </script>
<style scoped> <style scoped>
.van-swipe-cell__left,
.van-swipe-cell__right {
position: absolute;
top: 0;
height: 100%;
right: -96rpx;
width:232px;
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
}
.examList-box .noData{ .examList-box .noData{
text-align: center; text-align: center;
flex:1; flex:1;
...@@ -531,16 +565,14 @@ ...@@ -531,16 +565,14 @@
top: 46rpx; top: 46rpx;
} }
.examList.activeOne .examList-center-box{ .examList.activeOne .examList-center-box{
background: #FFFFFF; /* background: #FFFFFF; */
} }
.examList-center-box{ .examList-center-box{
flex-grow: 1; flex-grow: 1;
position: relative; position: relative;
border-radius: 30rpx;
padding: 31rpx 40rpx 0 22rpx; padding: 31rpx 40rpx 0 22rpx;
margin-bottom: 50rpx; /* margin-bottom: 50rpx; */
box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);
border-radius: 30px;
} }
.examList{ .examList{
margin: 0 50rpx; margin: 0 50rpx;
......
src/components/signOut.vue
View file @ 2ffabe70
<template> <template>
<view class="signOut-box" @click="signOut"> <view class="signOut-box">
<view class="index-header-signOut flex"> <view class="index-header-signOut flex">
<van-image width="72rpx" height="72rpx" fit="cover" class="img" <van-image @click="signOut" width="72rpx" height="72rpx" fit="cover" class="img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654580469000_635.png" /> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654580469000_635.png" />
<text>退出登录</text> <text @click="signOut">退出登录</text>
<view v-if="changePasswordShow"
class="changePassword flex"
@click="goChangePassword">
<van-image width="38rpx" height="38rpx"
fit="cover" class="img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1655279741000_34.png" />
修改密码
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -11,15 +19,18 @@ ...@@ -11,15 +19,18 @@
import { reactive, toRefs, onMounted } from "vue"; import { reactive, toRefs, onMounted } from "vue";
export default { export default {
name: "", name: "",
props: { props: ["AccountType"],
},
components: {}, components: {},
setup(props) { setup(props) {
let data = reactive({ let data = reactive({
changePasswordShow: false
}); });
let methods = { let methods = {
goChangePassword(){
uni.navigateTo({
url:'/pages/login/changePassword'
})
},
signOut(){ signOut(){
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
...@@ -40,7 +51,7 @@ ...@@ -40,7 +51,7 @@
}; };
onMounted(() => { onMounted(() => {
data.changePasswordShow = props.AccountType
}); });
return { return {
...toRefs(data), ...toRefs(data),
...@@ -63,4 +74,19 @@ ...@@ -63,4 +74,19 @@
.signOut-box{ .signOut-box{
padding: 0 30rpx; padding: 0 30rpx;
} }
.changePassword{
color: #282828;
font-size: 26rpx;
font-weight: bold;
/* border-left: 1rpx solid #AFAFAF; */
margin-left: 20rpx;
padding: 10rpx 10rpx 10rpx 35rpx;
letter-spacing: 2rpx;
align-items: center;
}
.changePassword .img{
margin-right: 20rpx;
position: relative;
top: 4rpx;
}
</style> </style>
\ No newline at end of file
src/pages.json
View file @ 2ffabe70
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
} }
},{ },{
"path": "pages/login/accountLogin", "path": "pages/login/accountLogin",
"text": "修改密码"
},{
"path": "pages/login/changePassword",
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
......
src/pages/index/index.vue
View file @ 2ffabe70
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<view class="index-header-name">{{userData.AccountName}}</view> <view class="index-header-name">{{userData.AccountName}}</view>
</view> </view>
</view> --> </view> -->
<signOut></signOut> <signOut :AccountType="0"></signOut>
</navbar> </navbar>
<view style="margin: 40rpx 0 10rpx 0;"> <view style="margin: 40rpx 0 10rpx 0;">
<view style="padding:0 50rpx;font-weight: 800;color: #282828;"> <view style="padding:0 50rpx;font-weight: 800;color: #282828;">
......
src/pages/index/jobDetails.vue
View file @ 2ffabe70
...@@ -163,13 +163,6 @@ ...@@ -163,13 +163,6 @@
z-index: 0; z-index: 0;
} }
.jobDetails-header-title{ .jobDetails-header-title{
/* position: absolute;
left: 0;
right: 0;
top: 0;
padding: 37rpx 31rpx;
text-align: center;
letter-spacing: 1rpx; */
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: #282828; color: #282828;
......
src/pages/index/workSituation.vue
View file @ 2ffabe70
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view class="index-header-name">{{userData.AccountName}}</view> <view class="index-header-name">{{userData.AccountName}}</view>
</view> </view>
</view> --> </view> -->
<signOut></signOut> <signOut :AccountType="1"></signOut>
</navbar> </navbar>
<view style="margin: 40rpx 0 10rpx 0;" class="workSituationAccountName flex"> <view style="margin: 40rpx 0 10rpx 0;" class="workSituationAccountName flex">
<view style="padding:0 50rpx;font-weight: 800;color: #282828;"> <view style="padding:0 50rpx;font-weight: 800;color: #282828;">
......
src/pages/login/accountLogin.vue
View file @ 2ffabe70
...@@ -158,6 +158,8 @@ ...@@ -158,6 +158,8 @@
data.loading=false data.loading=false
Toast.fail("账号类型选择错误，请根据真实身份选择") Toast.fail("账号类型选择错误，请根据真实身份选择")
} }
}else{
data.loading=false
} }
}).catch(e=>{ }).catch(e=>{
data.loading=false data.loading=false
......
src/utils/request.js
View file @ 2ffabe70
...@@ -3,6 +3,8 @@ let host = '' ...@@ -3,6 +3,8 @@ let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
//host = 'http://localhost:5004/api' //host = 'http://localhost:5004/api'
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
// host = 'http://192.168.10.46:8900/api'
// host = 'http://192.168.10.36:8082/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
...@@ -42,13 +44,15 @@ let request = (param) => { ...@@ -42,13 +44,15 @@ let request = (param) => {
duration: 2000, duration: 2000,
icon: "none", icon: "none",
success() { success() {
if(res.data.Code === 0 && res.data.Data.Error==-1){//如果电话号码没有 if(res.data.Code === 0){
resolve(res.data) resolve(res.data)
}else{ }else{
reject() reject()
} }
} }
}); });
} }
} }
......
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