Skip to content

C
confucius
Commit def99056 authored by zhengke's avatar zhengke
Browse files
Options

111

parents e390038c 84cda05e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1382 additions and 607 deletions
package.json
View file @ def99056
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"cos-js-sdk-v5": "^1.1.5", "cos-js-sdk-v5": "^1.1.5",
"echarts": "^5.1.2", "echarts": "^5.1.2",
"element-ui": "^2.14.1", "element-ui": "^2.14.1",
"flv.js": "^1.6.2",
"html2canvas": "^1.3.2", "html2canvas": "^1.3.2",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"jsencrypt": "^3.2.1", "jsencrypt": "^3.2.1",
...@@ -36,6 +37,8 @@ ...@@ -36,6 +37,8 @@
"quasar": "^1.0.0", "quasar": "^1.0.0",
"relation-graph": "^1.0.8", "relation-graph": "^1.0.8",
"v-viewer": "^1.5.1", "v-viewer": "^1.5.1",
"videojs-flash": "^2.2.1",
"videojs-swf": "^5.4.2",
"vue-amap": "^0.5.10", "vue-amap": "^0.5.10",
"vue-apexcharts": "^1.6.2", "vue-apexcharts": "^1.6.2",
"vue-draggable-resizable": "^1.7.2", "vue-draggable-resizable": "^1.7.2",
......
quasar.conf.js
View file @ def99056
...@@ -51,11 +51,14 @@ module.exports = function (ctx) { ...@@ -51,11 +51,14 @@ module.exports = function (ctx) {
// API: 'http://192.168.10.46:8300/api', // API: 'http://192.168.10.46:8300/api',
// API: 'https://eduapi.oytour.com/api', // API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://192.168.10.17:8087/api', API_ZC: 'http://192.168.10.17:8087/api',
API_SK: 'ws:192.168.10.214:' API_SK: 'ws:192.168.10.214:',
API_SIG: 'http://localhost:5001/messagecenter'
} : { } : {
API: 'https://eduapi.oytour.com/api', API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://propertyedu.oytour.com/api', API_ZC: 'http://propertyedu.oytour.com/api',
API_SK: 'ws://47.96.23.199:' API_SK: 'ws://47.96.23.199:',
API_SK_WSS: 'wss://sk.kookaku.com',
API_SIG: 'http://eduapi.oytour.com/messagecenter'
}, },
// transpile: false, // transpile: false,
...@@ -75,12 +78,11 @@ module.exports = function (ctx) { ...@@ -75,12 +78,11 @@ module.exports = function (ctx) {
// https://quasar.dev/quasar-cli/handling-webpack // https://quasar.dev/quasar-cli/handling-webpack
extendWebpack(cfg) { extendWebpack(cfg) {
// cfg.module.rules.push({ cfg.module.rules.push({
// enforce: 'pre', enforce: 'pre',
// test: /\.(js|vue)$/, test: /\.swf$/,
// loader: 'eslint-loader', loader: 'url-loader'
// exclude: /node_modules/ })
// })
} }
}, },
...@@ -252,7 +254,7 @@ module.exports = function (ctx) { ...@@ -252,7 +254,7 @@ module.exports = function (ctx) {
// More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration
nodeIntegration: true, nodeIntegration: true,
extendWebpack( /* cfg */ ) { extendWebpack( /* cfg */) {
// do something with Electron main process Webpack cfg // do something with Electron main process Webpack cfg
// chainWebpack also available besides this extendWebpack // chainWebpack also available besides this extendWebpack
} }
......
src/assets/css/font.css
View file @ def99056
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
font-family: 'perfectFont'; font-family: 'perfectFont';
src: url('../font/MicrosoftYaHeiLight.woff') format('woff'); src: url('../font/MicrosoftYaHeiLight.woff') format('woff');
} }
@font-face { @font-face {
font-family: 'pingfang'; font-family: 'pingfang';
src: url('../font/PingFang2.ttf'); src: url('../font/PingFang2.ttf');
} }
.perfectFont {
font-family: 'perfectFont' !important;
}
src/components/sale/addSuppliesStockOut-from.vue
View file @ def99056
...@@ -631,7 +631,8 @@ import { ...@@ -631,7 +631,8 @@ import {
ClassId:'', ClassId:'',
CourseName:'', CourseName:'',
SuppliesId:item.Id, SuppliesId:item.Id,
Number:item.Number Number:item.Number,
haocaiList:item.hcItemList,
} }
arr.push(obj) arr.push(obj)
}) })
......
src/components/stuMan/eventsCalendar.vue
View file @ def99056
...@@ -206,13 +206,24 @@ ...@@ -206,13 +206,24 @@
} }
.hover_Suspended{ .hover_Suspended{
position: relative; position: relative;
padding: 0 3px; padding: 0 8px;
background-color: #fff;
border-radius: 10px; border-radius: 10px;
font-size: 15px; font-size: 15px;
color: white;
}
.hover_Suspended.started{
background-color: #eee;
color: #3f4254;
}
.hover_Suspended.progress{
background-color: #21BA45;
}
.hover_Suspended.over{
background-color: #1976D2;
} }
.hover_Suspended:hover{ .hover_Suspended:hover{
color: #F8A535; color: #F8A535;
background-color: #fff;
} }
.hover_Suspended:hover .Suspended{ .hover_Suspended:hover .Suspended{
display: block; display: block;
...@@ -261,14 +272,15 @@ ...@@ -261,14 +272,15 @@
display: inline-block; display: inline-block;
padding: 0 5px; padding: 0 5px;
} }
.Suspended_text p.grey{ .Suspended_text p.started{
background-color: grey; background-color: #eee;
color: #3f4254;
} }
.Suspended_text p.green{ .Suspended_text p.progress{
background-color: green; background-color: #21BA45;
} }
.Suspended_text p.red{ .Suspended_text p.over{
background-color: red; background-color: #1976D2;
} }
</style> </style>
<template> <template>
...@@ -288,17 +300,17 @@ ...@@ -288,17 +300,17 @@
<div class="eventsCalendar_box"> <div class="eventsCalendar_box">
<div class="eventsCalendar" v-for="(items,indexs) in item.ActivityList" :key="indexs" <div class="eventsCalendar" v-for="(items,indexs) in item.ActivityList" :key="indexs"
@click="eventName(items.ActivityName)"> @click="eventName(items.ActivityName)">
<div class="hover_Suspended"> <div class="hover_Suspended" :class="items.ActivityStatus==1?'progress':(items.ActivityStatus==2?'over':'started')">
{{items.ActivityName}} {{items.ActivityName}}
<div class="Suspended"> <div class="Suspended">
<div class="Suspended-b"></div> <div class="Suspended-b"></div>
<div class="Suspended_text"><span>标题 :</span>{{items.ActivityName}}</div> <div class="Suspended_text"><span>标题 :</span>{{items.ActivityName}}</div>
<div class="Suspended_text"><span>时间 :</span>{{items.StartTime}}~{{items.EndTime}}</div> <div class="Suspended_text"><span>时间 :</span>{{items.StartTime}}~{{items.EndTime}}</div>
<div class="Suspended_text"><span>类型 :</span>{{items.ActivityTypeName}}</div> <div class="Suspended_text"><span>类型 :</span>{{items.ActivityTypeName}}</div>
<div class="Suspended_text"><span>价格 :</span>{{!items.IsFree?items.Price:'免费'}}</div> <div class="Suspended_text"><span>价格 :</span>{{items.IsFree==1?'免费':items.Price+' 元'}}</div>
<div class="Suspended_text" v-show="items.LocationName"><span>地址 :</span> {{items.LocationName}}</div> <div class="Suspended_text" v-show="items.LocationName"><span>地址 :</span> {{items.LocationName}}</div>
<div class="Suspended_text"><span>状态 :</span> <div class="Suspended_text"><span>状态 :</span>
<p :class="items.ActivityStatus==1?'green':(items.ActivityStatus==2?'red':'grey')"> <p :class="items.ActivityStatus==1?'progress':(items.ActivityStatus==2?'over':'started')">
{{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'未开始')}}</p> {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'未开始')}}</p>
</div> </div>
</div> </div>
......
src/layouts/MainLayout.vue
View file @ def99056
...@@ -389,7 +389,7 @@ export default { ...@@ -389,7 +389,7 @@ export default {
that.injectTCCC( that.injectTCCC(
r.Data.Token, r.Data.Token,
1400617921, 1400617921,
this.userInfo.Email, that.userInfo.Email,
r.Data.SdkURL r.Data.SdkURL
); );
} }
......
src/pages/classroom/Scheduling.vue
View file @ def99056
This diff is collapsed.
src/pages/classroom/courseInfo.vue
View file @ def99056
<style scoped> <style scoped>
#player-con{ #player-con {
width: 100%; width: 100%;
height: 500px; height: 500px;
background-color: #eee; background-color: #eee;
} }
.no-video{ .no-video {
width: 800px; width: 800px;
height: 450px; height: 450px;
margin: 0 auto; margin: 0 auto;
background-color: #000; background-color: #000;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content:center; justify-content: center;
color: #fff; color: #fff;
font-size: 30px; font-size: 30px;
} }
.title{ .title {
color: #000000; color: #000000;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 20px; margin-bottom: 20px;
} }
.scheduInfo { .scheduInfo {
height: 100%; height: 100%;
width: 100%; width: 100%;
padding: 15px; padding: 15px;
background-color: #f2f4f7; background-color: #f2f4f7;
overflow: hidden; overflow: hidden;
} }
.scheduInfo .schedu_left { .scheduInfo .schedu_left {
width: 248px; width: 248px;
flex: 0 0 auto; flex: 0 0 auto;
position: relative; position: relative;
...@@ -37,49 +37,49 @@ ...@@ -37,49 +37,49 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% auto; background-size: 100% auto;
height: 100%; height: 100%;
} }
.scheduInfo .okr-menu-active { .scheduInfo .okr-menu-active {
color: var(--q-color-primary); color: var(--q-color-primary);
font-weight: bold; font-weight: bold;
background: #ecf1ff; background: #ecf1ff;
} }
.mySched { .mySched {
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
height: 100%; height: 100%;
background-color: #fff; background-color: #fff;
} }
.schedu_ImgDiv { .schedu_ImgDiv {
width: 68px; width: 68px;
height: 68px; height: 68px;
border-radius: 20px; border-radius: 20px;
overflow: hidden; overflow: hidden;
margin: 75px auto 0; margin: 75px auto 0;
} }
.schedu_ImgDiv img { .schedu_ImgDiv img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.schedu_Name { .schedu_Name {
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
margin-top: 26px; margin-top: 26px;
text-align: center; text-align: center;
} }
.schedu_Status { .schedu_Status {
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-align: center; text-align: center;
margin-top: 15px; margin-top: 15px;
} }
.schedu_st { .schedu_st {
display: inline-block; display: inline-block;
width: 10px; width: 10px;
height: 10px; height: 10px;
...@@ -87,24 +87,24 @@ ...@@ -87,24 +87,24 @@
margin-right: 5px; margin-right: 5px;
position: relative; position: relative;
top: 1px; top: 1px;
} }
.zbz { .zbz {
background-color: #00DB4E; background-color: #00db4e;
} }
.xxz { .xxz {
background-color: #DBDBDB; background-color: #dbdbdb;
} }
.wdk { .wdk {
background-color: #FE4475; background-color: #fe4475;
} }
.clockon_Duty { .clockon_Duty {
width: 120px; width: 120px;
height: 34px; height: 34px;
background: linear-gradient(90deg, #00BDD3, #00D761); background: linear-gradient(90deg, #00bdd3, #00d761);
border-radius: 10px; border-radius: 10px;
margin: 100px auto 24px; margin: 100px auto 24px;
text-align: center; text-align: center;
...@@ -112,120 +112,120 @@ ...@@ -112,120 +112,120 @@
color: #fff; color: #fff;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
} }
.sche_daka { .sche_daka {
font-size: 18px; font-size: 18px;
position: relative; position: relative;
left: 5px; left: 5px;
top: 2px; top: 2px;
} }
.schedu_jiaojie { .schedu_jiaojie {
width: 120px; width: 120px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
text-align: center; text-align: center;
border-radius: 10px; border-radius: 10px;
border: 1px solid #91AEFF; border: 1px solid #91aeff;
color: #C4D4FF; color: #c4d4ff;
font-size: 14px; font-size: 14px;
margin: auto; margin: auto;
cursor: pointer; cursor: pointer;
} }
.scheInfo_rightTop { .scheInfo_rightTop {
width: 100%; width: 100%;
/* height: 80px; */ /* height: 80px; */
padding: 20px 0; padding: 20px 0;
background-color: #fff; background-color: #fff;
} }
.schScroll { .schScroll {
background-color: #F6F8FA; background-color: #f6f8fa;
} }
.scheInfo_Topflex { .scheInfo_Topflex {
display: flex; display: flex;
/* width: 90%; */ /* width: 90%; */
/* height: 80px; */ /* height: 80px; */
align-items: center; align-items: center;
} }
.Sctop_Color { .Sctop_Color {
font-size: 18px; font-size: 18px;
color: #000000; color: #000000;
width: 246px; width: 246px;
text-align: center; text-align: center;
} }
.Scotop_little { .Scotop_little {
color: #AAAAAA; color: #aaaaaa;
font-size: 14px; font-size: 14px;
margin-right: 15px; margin-right: 15px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
width: 60px; width: 60px;
} }
.Scdu_benci::after { .Scdu_benci::after {
content: ""; content: "";
position: absolute; position: absolute;
height: 29px; height: 29px;
width: 2px; width: 2px;
background: #EBEBEB; background: #ebebeb;
right: 0; right: 0;
} }
.sche_mid { .sche_mid {
display: flex; display: flex;
width: 100%; width: 100%;
justify-content: space-between; justify-content: space-between;
} }
.sche_midList { .sche_midList {
width: 31.6%; width: 31.6%;
height: 300px; height: 300px;
background: #fff; background: #fff;
border-radius: 16px; border-radius: 16px;
border: 1px solid #EBEBEB; border: 1px solid #ebebeb;
box-shadow: 0px 1px 1px 0px #E4E7FB; box-shadow: 0px 1px 1px 0px #e4e7fb;
overflow: hidden; overflow: hidden;
font-family: 'MicrosoftYaHei'; font-family: "MicrosoftYaHei";
position: relative; position: relative;
} }
.Sche_Bottom { .Sche_Bottom {
margin: 26px 40px 0 40px; margin: 26px 40px 0 40px;
} }
.scheList_TOP { .scheList_TOP {
width: 100%; width: 100%;
height: 107px; height: 107px;
border-radius: 16px; border-radius: 16px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.scheList_TOP img { .scheList_TOP img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.word_sche { .word_sche {
color: #fff; color: #fff;
font-size: 20px; font-size: 20px;
position: absolute; position: absolute;
top: 25px; top: 25px;
left: 32px; left: 32px;
} }
.word_scheNumber { .word_scheNumber {
display: inline-block; display: inline-block;
width: 36px; width: 36px;
height: 36px; height: 36px;
color: #fff; color: #fff;
background-color: #FE4475; background-color: #fe4475;
position: absolute; position: absolute;
top: 30px; top: 30px;
left: 130px; left: 130px;
...@@ -233,35 +233,33 @@ ...@@ -233,35 +233,33 @@
line-height: 36px; line-height: 36px;
border-radius: 8px; border-radius: 8px;
font-size: 25px; font-size: 25px;
} }
.scheList_Bottom { .scheList_Bottom {
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
height: 46px; height: 46px;
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #F3F3F3; border-bottom: 1px solid #f3f3f3;
} }
.sche_Dian { .sche_Dian {
display: inline-block; display: inline-block;
width: 6px; width: 6px;
height: 6px; height: 6px;
background-color: #6D97FF; background-color: #6d97ff;
border-radius: 50%; border-radius: 50%;
margin-right: 10px; margin-right: 10px;
} }
.schScroll::-webkit-scrollbar { .schScroll::-webkit-scrollbar {
display: none; display: none;
} }
.Sch_MainColor { .Sch_MainColor {
font-size: 18px; font-size: 18px;
color: #000000; color: #000000;
}
}
</style> </style>
<template> <template>
...@@ -280,80 +278,80 @@ ...@@ -280,80 +278,80 @@
</div> </div>
</template> </template>
<script> <script>
import {getTimeDetail} from '../../api/classroom/index' import { getTimeDetail } from "../../api/classroom/index";
import {getVideoPlayAuth,getVideoPlayUrl} from '../../api/classroom/video' import { getVideoPlayAuth, getVideoPlayUrl } from "../../api/classroom/video";
import schedulVisit from './components/schedul-visit' import schedulVisit from "./components/schedul-visit";
import schedulHead from './components/schedul-head' import schedulHead from "./components/schedul-head";
export default { export default {
props: {}, props: {},
components: { components: {
schedulVisit, schedulVisit,
schedulHead, schedulHead
}, },
data() { data() {
return { return {
dataList: {}, dataList: {},
player:null, player: null
} };
}, },
created() { created() {
if (this.$route.query.id) { if (this.$route.query.id) {
this.id = this.$route.query.id; this.id = this.$route.query.id;
} }
}, },
mounted(){ mounted() {
this.getdata(); this.getdata();
}, },
methods: { methods: {
getdata(){ getdata() {
getTimeDetail({ID:this.id}).then(res=>{ getTimeDetail({ ID: this.id }).then(res => {
if(res.Code===1){ if (res.Code === 1) {
this.dataList=res.Data this.dataList = res.Data;
if(res.Data.VideoUrl){ if (res.Data.VideoUrl) {
this.getAuth(res.Data.VideoUrl) this.getAuth(res.Data.VideoUrl);
} // this.$nextTick(() => {
} // this.initPlayer(res.Data.VideoUrl);
}) // });
}
}
});
}, },
//初始化视频播放器 //初始化视频播放器
initPlayer(url,cover,auth){ initPlayer(url, cover, auth) {
this.player = new Aliplayer({ this.player = new Aliplayer(
"id": "player-con", {
"source": url, id: "player-con",
"width": "100%", source: url,
"height": "500px", width: "100%",
"autoplay": true, height: "500px",
"isLive": false, autoplay: false,
"rePlay": false, isLive: false,
"playsinline": true, rePlay: false,
"preload": true, playsinline: true,
"controlBarVisibility": "hover", preload: true,
"useH5Prism": true, controlBarVisibility: "hover",
"cover":cover, useH5Prism: true,
"playauth":auth, cover: cover,
}, function (player) { playauth: auth
},
} function(player) {}
); );
}, },
getAuth(url){ getAuth(url) {
getVideoPlayAuth({strVid:url}).then(res=>{ getVideoPlayAuth({ strVid: url }).then(res => {
if(res.Code===1&&res.Data.PlayAuth){ if (res.Code === 1 && res.Data.PlayAuth) {
this.getUrl(url,res.Data.PlayAuth) this.getUrl(url, res.Data.PlayAuth);
} }
});
})
}, },
getUrl(url,auth){ getUrl(url, auth) {
getVideoPlayUrl({strVid:url}).then(res=>{ getVideoPlayUrl({ strVid: url }).then(res => {
if(res.Code===1){ if (res.Code === 1) {
this.initPlayer(res.Data.URL,res.Data.VideoImg,auth) this.initPlayer(res.Data.URL, res.Data.VideoImg, auth);
} }
}) });
} }
},
} }
};
</script> </script>
src/pages/financial/reportform/performanceCommission.vue 0 → 100644
View file @ def99056
This diff is collapsed.
src/pages/teacher/appraisalList.vue
View file @ def99056
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-2" v-if="isHaveEdit">
<q-select filled v-model="msg.TeacherAccountId" dense use-input label="教师" :options="MyTeacherListData"
option-label="EmployeeName" @input="refreshPage" clearable option-value="Id" emit-value map-options />
</div>
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
...@@ -26,27 +30,21 @@ ...@@ -26,27 +30,21 @@
<div class="col-2 q-table__title">教师月度考核列表</div> <div class="col-2 q-table__title">教师月度考核列表</div>
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="考核" @click="goAssessTable()" /> <q-btn v-if="isHaveEdit" color="accent" size="sm" class="q-mr-md" icon="add" label="考核"
@click="goAssessTable()" />
</div> </div>
</template> </template>
<template v-slot:body-cell-AuditStatus="props">
<q-td :props="props">
<template v-if="props.row.AuditStatus==0">
待提交
</template>
<template v-else>
{{props.row.AuditStatusName}}
</template>
</q-td>
</template>
<template v-slot:body-cell-OptionId="props"> <template v-slot:body-cell-OptionId="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)" <!-- <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)"
label="提交审批" v-if="props.row.AuditStatus==0&&props.row.TeacherSignDate" /> label="提交审批" v-if="props.row.AuditStatus==0&&props.row.TeacherSignDate" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,1)" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,1)"
label="评价" /> label="评价" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)"
label="建议" /> label="建议" /> -->
<q-btn v-if="isHaveEdit" flat size="xs" icon="edit" color="accent" style="font-weight:400"
@click="goAssessTable(props.row)" label="修改" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)"
label="详情" /> label="详情" />
</q-td> </q-td>
...@@ -67,8 +65,14 @@ ...@@ -67,8 +65,14 @@
queryTeacherAssessmentPage, queryTeacherAssessmentPage,
SubmitTeacherAssessmentApproval SubmitTeacherAssessmentApproval
} from '../../api/teacher/index'; } from '../../api/teacher/index';
import {
queryEmployee,
} from "../../api/users/user";
import behaviorForm from "../../components/teacher/behavior-form.vue"; import behaviorForm from "../../components/teacher/behavior-form.vue";
import helpForm from "../../components/teacher/help-form.vue"; import helpForm from "../../components/teacher/help-form.vue";
import {
mapState
} from "vuex";
export default { export default {
meta: { meta: {
title: "教师月度考评" title: "教师月度考评"
...@@ -125,12 +129,6 @@ ...@@ -125,12 +129,6 @@
field: "TotalScore", field: "TotalScore",
align: "left" align: "left"
}, },
{
name: "AuditStatus",
label: "审核状态",
field: "AuditStatus",
align: "left"
},
{ {
name: 'OptionId', name: 'OptionId',
label: '操作', label: '操作',
...@@ -142,21 +140,49 @@ ...@@ -142,21 +140,49 @@
isShowBehavior: false, //是否显示对员工评价弹窗 isShowBehavior: false, //是否显示对员工评价弹窗
isShowHelp: false, //是否显示员工对公司建议弹窗 isShowHelp: false, //是否显示员工对公司建议弹窗
objOption: null, objOption: null,
MyTeacherListData: [], //教师列表
} }
}, },
computed: mapState({
//是否有下载权限
isHaveEdit(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "Edit_TeacherAssessment") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
created() { created() {
let today = new Date(); let today = new Date();
this.msg.YearStr = today.getFullYear().toString(); this.msg.YearStr = today.getFullYear().toString();
this.msg.MonthStr = (today.getMonth() + 1).toString(); this.msg.MonthStr = (today.getMonth() + 1).toString();
this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr; this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
if (this.$route.query) { this.findData();
if (!this.isHaveEdit) {
let userinfo = this.getLocalStorage();
this.msg.TeacherAccountId = userinfo.Id;
} }
}, },
mounted() { mounted() {
this.getTeacherAssessmentPage() this.getTeacherAssessmentPage()
}, },
methods: { methods: {
findData() {
queryEmployee({
AccountTypeStr: "2",
IsLeave: 1
}).then(res => {
if (res.Code == 1) {
this.MyTeacherListData = res.Data;
}
})
},
//翻页 //翻页
changePage(val) { changePage(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -181,8 +207,12 @@ ...@@ -181,8 +207,12 @@
this.getTeacherAssessmentPage(); this.getTeacherAssessmentPage();
}, },
//跳转考核新增修改页面 //跳转考核新增修改页面
goAssessTable() { goAssessTable(item) {
this.OpenNewUrl('/teacher/jobEvaluation', {}); var qObj = {};
if (item) {
qObj.Id = item.Id;
}
this.OpenNewUrl('/teacher/jobEvaluation', qObj);
}, },
//跳转到考核详情页面 //跳转到考核详情页面
gotoDetail(item) { gotoDetail(item) {
......
src/pages/teacher/jobEvaluation.vue
View file @ def99056
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
<div class="col-2 jobEvaluationDate q-mr-lg"> <div class="col-2 jobEvaluationDate q-mr-lg">
<q-field filled stack-label dense label="考核月份"> <q-field filled stack-label dense label="考核月份">
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="teacherDate" value-format="yyyy-MM" size="mini" type="month" placeholder="选择考核月份"> <el-date-picker v-model="teacherDate" value-format="yyyy-MM" size="mini" type="month"
placeholder="选择考核月份">
</el-date-picker> </el-date-picker>
</template> </template>
</q-field> </q-field>
...@@ -107,8 +108,8 @@ ...@@ -107,8 +108,8 @@
TotalScore: 0, //总分 TotalScore: 0, //总分
DetailsList: [], DetailsList: [],
CheckType: 0, //1-教学主管，2-教务主管 CheckType: 0, //1-教学主管，2-教务主管
IsJiaoWuFinish:0,//教务主管是否完成打分 IsJiaoWuFinish: 0, //教务主管是否完成打分
IsTeacherFinish:0,//教学主管是否完成打分 IsTeacherFinish: 0, //教学主管是否完成打分
}, },
isAuth: false, //是否有权限 isAuth: false, //是否有权限
saveLoading: false, saveLoading: false,
...@@ -122,7 +123,10 @@ ...@@ -122,7 +123,10 @@
this.GetTeacherList(); this.GetTeacherList();
}, },
mounted() { mounted() {
if (this.$route.query && this.$route.query.Id) {
this.saveObj.Id = this.$route.query.Id;
this.getInfo();
}
}, },
methods: { methods: {
changeStatus(subItem, optionItem) { changeStatus(subItem, optionItem) {
...@@ -161,6 +165,7 @@ ...@@ -161,6 +165,7 @@
TeacherAccountId: this.saveObj.TeacherAccountId, TeacherAccountId: this.saveObj.TeacherAccountId,
YearStr: this.saveObj.YearStr, YearStr: this.saveObj.YearStr,
MonthStr: this.saveObj.MonthStr, MonthStr: this.saveObj.MonthStr,
Id:this.saveObj.Id,
}; };
queryTeacherAssessmentInfo(qMsg).then(res => { queryTeacherAssessmentInfo(qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -176,8 +181,8 @@ ...@@ -176,8 +181,8 @@
this.saveObj.TotalScore = tempData.TotalScore; this.saveObj.TotalScore = tempData.TotalScore;
this.saveObj.CheckType = tempData.CheckType; this.saveObj.CheckType = tempData.CheckType;
this.saveObj.DetailsList = tempData.DetailsList; this.saveObj.DetailsList = tempData.DetailsList;
this.saveObj.IsTeacherFinish=tempData.IsTeacherFinish; this.saveObj.IsTeacherFinish = tempData.IsTeacherFinish;
this.saveObj.IsJiaoWuFinish=tempData.IsJiaoWuFinish; this.saveObj.IsJiaoWuFinish = tempData.IsJiaoWuFinish;
} else { } else {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
......
src/pages/teacher/teacherAssessment.vue
View file @ def99056
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
{{saveObj.S_JiaoWu_Time}} {{saveObj.S_JiaoWu_Time}}
</td> </td>
</tr> </tr>
<tr> <!-- <tr>
<td colspan="9" style="text-align:left;padding-left:5px;"> <td colspan="9" style="text-align:left;padding-left:5px;">
注：以下由部门考核者填写 注：以下由部门考核者填写
</td> </td>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<td colspan="9" style="text-align:left;padding-left:5px;"> <td colspan="9" style="text-align:left;padding-left:5px;">
签字/日期：{{saveObj.TeacherSignDate}} 签字/日期：{{saveObj.TeacherSignDate}}
</td> </td>
</tr> </tr> -->
</tfoot> </tfoot>
</table> </table>
</div> </div>
......
src/pages/user/login.vue
View file @ def99056
...@@ -191,6 +191,11 @@ export default { ...@@ -191,6 +191,11 @@ export default {
immediate: true immediate: true
} }
}, },
mounted() {
if (tccc && tccc.Agent) {
tccc.Agent.offline();
}
},
methods: { methods: {
callBackUserInfo(code) { callBackUserInfo(code) {
setUserCodeCallBack({ setUserCodeCallBack({
...@@ -228,7 +233,7 @@ export default { ...@@ -228,7 +233,7 @@ export default {
const s = document.createElement("script"); const s = document.createElement("script");
s.type = "text/javascript"; s.type = "text/javascript";
s.src = s.src =
"http://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.5.js"; "https://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.5.js";
const wxElement = document.body.appendChild(s); const wxElement = document.body.appendChild(s);
// 调用企业微信二维码方法 // 调用企业微信二维码方法
wxElement.onload = function() { wxElement.onload = function() {
......
src/router/routes.js
View file @ def99056
...@@ -618,6 +618,176 @@ const routes = [{ ...@@ -618,6 +618,176 @@ const routes = [{
import ("pages/financial/financalDocument/receiptManager.vue") import ("pages/financial/financalDocument/receiptManager.vue")
}, },
{
path: "/financial/financalDocument/BasicDocuments", //财务 财务单据 审核标准单据
component: () =>
import ("pages/financial/financalDocument/BasicDocuments.vue")
},
{
path: "/financial/reportform/RecPayQueryTeam", //财务报表 月度班级收支统计
component: () =>
import ("pages/financial/reportform/RecPayQueryTeam.vue")
},
{
path: "/financial/reportform/RevenueFileMan", //财务报表 营收文件管理
component: () =>
import ("pages/financial/reportform/RevenueFileMan.vue")
},
{
path: "/financial/reportform/performanceCommission", //财务报表 业绩提成汇总
component: () =>
import ("pages/financial/reportform/performanceCommission.vue")
},
{
path: "/financial/reportform/settleAccounts", //财务报表 财务轧账月份列表
component: () =>
import ("pages/financial/reportform/settleAccounts.vue")
},
{
path: "/financial/reportform/activityDeploy", //财务流程 获取活动配置
component: () =>
import ("pages/financial/reportform/activityDeploy.vue")
},
{
path: "/financial/reportform/activityCommissionDetails", //工作台 活动提成明细
component: () =>
import ("pages/financial/reportform/activityCommissionDetails.vue")
},
{
path: "/financial/reportform/activityCommissionForOrderList", //工作台 查询订单活动提成明细
component: () =>
import ("pages/financial/reportform/activityCommissionForOrderList.vue")
},
{
path: "/financial/reportform/activityCommissionUserList", //工作台 获取活动提成用户列表
component: () =>
import ("pages/financial/reportform/activityCommissionUserList.vue")
},
{
path: "/financial/reportform/activityStatistics", //工作台 获取活动提成统计
component: () =>
import ("pages/financial/reportform/activityStatistics.vue")
},
{
path: "/financial/studyabroad/studyAbroadRules", //财务流程 留学提成规则
component: () =>
import ("pages/financial/studyabroad/studyAbroadRules.vue")
},
{
path: "/financial/studyabroad/studyAbroadCommission", //工作台 留学销售提成
component: () =>
import ("pages/financial/studyabroad/studyAbroadCommission.vue")
},
{
path: "/financial/studyabroad/studyAbroadCommissionTJ", //工作台 留学销售统计
component: () =>
import ("pages/financial/studyabroad/studyAbroadCommissionTJ.vue")
},
{
path: "/financial/studyabroad/commissionDetail", //工作台 留学销售列表
component: () =>
import ("pages/financial/studyabroad/commissionDetail.vue")
},
{
path: "/financial/studyabroad/sBuserCommissionDetails", //工作台 留学销售明细
component: () =>
import ("pages/financial/studyabroad/sBuserCommissionDetails.vue")
},
{
path: "/financial/studyabroad/ordercommission", //工作台 获取销售提成-订单跳转列表 传的参数不同
component: () =>
import ("pages/financial/studyabroad/ordercommission.vue")
},
{
path: "/financial/contribution/toConfigure", //财务流程 投稿规则
component: () =>
import ("pages/financial/contribution/toConfigure.vue")
},
{
path: "/financial/contribution/contributeCommission", // 工作台 投稿销售提成
component: () =>
import ("pages/financial/contribution/contributeCommission.vue")
},
{
path: "/financial/contribution/commissionUserList", // 工作台 投稿销售提成 用户列表
component: () =>
import ("pages/financial/contribution/commissionUserList.vue")
},
{
path: "/financial/contribution/CommissionUserDetailList", // 工作台 投稿销售提成 用户详情
component: () =>
import ("pages/financial/contribution/CommissionUserDetailList.vue")
},
{
path: "/financial/contribution/commissionStatistics", // 工作台 投稿销售统计
component: () =>
import ("pages/financial/contribution/commissionStatistics.vue")
},
{
path: "/financial/market/commissionRule", // 市场顾问 提现规则
component: () =>
import ("pages/financial/market/commissionRule.vue")
},
{
path: "/financial/market/courseConsultant", // 课程顾问 提现规则
component: () =>
import ("pages/financial/market/courseConsultant.vue")
},
{
path: "/financial/market/achievementPeriodsList", // 业绩提成 分期列表
component: () =>
import ("pages/financial/market/achievementPeriodsList.vue")
},
{
path: "/financial/market/employeeCommission", // 业绩提成 员工提成
component: () =>
import ("pages/financial/market/employeeCommission.vue")
},
{
path: "/financial/market/AchievementsUserDetailList", // 业绩提成 员工提成明细列表
component: () =>
import ("pages/financial/market/AchievementsUserDetailList.vue")
},
{
path: "/financial/market/AchievementsForOrderList", // 业绩提成 获取订单跳转 提成详情
component: () =>
import ("pages/financial/market/AchievementsForOrderList.vue")
},
{
path: "/financial/market/marketStatistics", // 业绩提成 统计
component: () =>
import ("pages/financial/market/marketStatistics.vue")
},
{
path: "/financial/market/empBonus", // 员工人头奖励
component: () =>
import ("pages/financial/market/empBonus.vue")
},
{
path: "/financial/market/empBonusDetail", // 员工人头奖励详情
component: () =>
import ("pages/financial/market/empBonusDetail.vue")
},
{
path: "/financial/returnPassbook/ReturnperiodsList", // 返佣期数列表
component: () =>
import ("pages/financial/returnPassbook/ReturnperiodsList.vue")
},
{
path: "/financial/returnPassbook/ReturnUserList", // 返佣 用户分组列表
component: () =>
import ("pages/financial/returnPassbook/ReturnUserList.vue")
},
{
path: "/financial/returnPassbook/returnpassbookStatistics", // 返佣 幸福存折明细
component: () =>
import ("pages/financial/returnPassbook/returnpassbookStatistics.vue")
},
{
path: "/financial/returnPassbook/PassbookperiodsList", // 幸福存折期数列表
component: () =>
import ("pages/financial/returnPassbook/PassbookperiodsList.vue")
},
{ {
path: "/financial/financalDocument/BasicDocuments", //财务 财务单据 审核标准单据 path: "/financial/financalDocument/BasicDocuments", //财务 财务单据 审核标准单据
......
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