Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/api/jyzx.js

@@ -71,10 +71,10 @@ export default {
     getcurrents: function (data) {
         return post('/common/TrSurvey/find-summary-by-teacher', data)
     },
-    //提交问卷
+    /* //提交问卷
     submitquestionnaire: function (data) {
-        return post('/common/TrSurvey/record-in', data)
-    },
+        return post('/common/survey/answer', data)
+    }, */
     //提交评测
     submitExam: function (data) {
         return post('/common/ExamLite/record-in',data)

TEAMModelOS/ClientApp/src/locale/lang/en-US/jyzx.js

@@ -180,4 +180,23 @@ export default{
         message2: "存在未作答的题目！",
         message3: "已作答的问卷无法修改！",
     },
+    homePage: {
+        totalTime: '总学时',
+        online: "线上研修",
+        offline: "线下研修",
+        application: "应用考核",
+        classRecord: "课堂实录",
+        studyPoint: "已学能力点",
+        okPoint: "检测合格能力点",
+        achievements: "成果提交",
+        area: "区级研修",
+        areaQue: "区级问卷",
+        areaVote: "区级投票",
+        school: "校本研修",
+        schoolQue: "校本问卷",
+        schoolVote: "校本投票",
+        time: "学时",
+        remarks1: "总学时：线上研修 + 校本研修 + 应用考核 + 课堂实录",
+        remarks2: "注：各指标达到要求后，多余学时不再计入总学时",
+    }
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/jyzx.js

@@ -180,4 +180,23 @@ export default{
         message2: "存在未作答的题目！",
         message3: "已作答的问卷无法修改！",
     },
+    homePage: {
+        totalTime: '总学时',
+        online: "线上研修",
+        offline: "线下研修",
+        application: "应用考核",
+        classRecord: "课堂实录",
+        studyPoint: "已学能力点",
+        okPoint: "检测合格能力点",
+        achievements: "成果提交",
+        area: "区级研修",
+        areaQue: "区级问卷",
+        areaVote: "区级投票",
+        school: "校本研修",
+        schoolQue: "校本问卷",
+        schoolVote: "校本投票",
+        time: "学时",
+        remarks1: "总学时：线上研修 + 校本研修 + 应用考核 + 课堂实录",
+        remarks2: "注：各指标达到要求后，多余学时不再计入总学时",
+    }
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js

@@ -180,4 +180,23 @@ export default{
         message2: "存在未作答的題目！",
         message3: "已作答的問卷無法修改！",
     },
+    homePage: {
+        totalTime: '總學時',
+        online: "線上研修",
+        offline: "線下研修",
+        application: "應用考核",
+        classRecord: "課堂實錄",
+        studyPoint: "已學能力點",
+        okPoint: "檢測合格能力點",
+        achievements: "成果提交",
+        area: "區級研修",
+        areaQue: "區級問卷",
+        areaVote: "區級投票",
+        school: "校本研修",
+        schoolQue: "校本問卷",
+        schoolVote: "校本投票",
+        time: "學時",
+        remarks1: "總學時：線上研修 + 校本研修 + 應用考核 + 課堂實錄",
+        remarks2: "注：各指標達到要求後，多餘學時不再計入總學時",
+    }
 }

TEAMModelOS/ClientApp/src/view/abilityMgmt/Index.vue

@@ -1604,14 +1604,15 @@
 						this.$Message.warning(this.$t('syllabus.noPreview'))
 						break;
 					case 'doc':
+					    let userProfile2 = JSON.parse(decodeURIComponent(localStorage.user_profile, "utf-8"))
 						let copyLink = JSON.parse(JSON.stringify(item.link))
-						let docSas = '?' + this.$store.state.user.osblob_sas
+						let docSas = '?' + userProfile2.osblob_sas
 						// if (item.code !== this.curTeammodelId) {
 						// 	docSas = await this.$evTools.getBlobPrivateSas(item.code)
 						// } else {
 						// 	docSas = sasObj.sas
 						// }
-						let fullLink = this.$store.state.user.osblob_uri  + item.link + docSas
+						let fullLink = userProfile2.osblob_uri  + item.link + docSas
 						console.log(fullLink)
 						if (this.getSuffix(item.title) === 'pdf') {
 							this.openPdf(fullLink, item.title)
@@ -1622,15 +1623,16 @@
 						}
 						break;
 					default:
+						let userProfile = JSON.parse(decodeURIComponent(localStorage.user_profile, "utf-8"))
 						let fileTmdId = item.code.replace('Item-', '')
-						let sas = '?' + this.$store.state.user.osblob_sas
+						let sas = '?' + userProfile.osblob_sas
 						// if (fileTmdId !== this.curTeammodelId) {
 						// 	sas = '?' + this.$store.state.user.osblob_sas
 						// } else {
 						// 	sas = sasObj.sas
 						// }
 						this.previewFile = JSON.parse(JSON.stringify(item))
-						this.previewFile.link = this.$store.state.user.osblob_uri  + item.link + sas
+						this.previewFile.link = userProfile.osblob_uri  + item.link + sas
 						this.previewStatus = true
 						break;
 				}
@@ -1879,6 +1881,9 @@
 			inSchoolAbility(){
 				return this.$route.name === 'abilityMgmt'
 			},
+			isAreaAbility(){
+				return this.$route.name === 'areaAbilityMgmt'
+			}
 		},
 		watch: {
 			volumeList: {

TEAMModelOS/ClientApp/src/view/jyzx/HomePage.vue

@@ -5,18 +5,17 @@
                 <div class="home-score">
                     <div class="score-total box-border">
                         <p>
-                            <span class="total-font">总学时：</span>
+                            <span class="total-font">{{ $t("jyzx.homePage.totalTime") }}：</span>
                             <b :class="['point-num', totalTime == 50 ? 'ok-time' : 'study-time']">{{ totalTime }}</b>
-                            /50(学时)
+                            /50({{ $t("jyzx.homePage.time") }})
                             <Tooltip max-width="200">
                                 <Icon type="ios-alert" size="15" />
                                 <div slot="content">
                                     <div>
-                                        总学时：线上研修 + 校本研修 +
-                                        应用考核 + 课堂实录
+                                        {{ $t("jyzx.homePage.remarks1") }}
                                     </div>
                                     <div>
-                                        注：各指标达到要求后，多余学时不再计入总学时
+                                        {{ $t("jyzx.homePage.remarks2") }}
                                     </div>
                                 </div>
                             </Tooltip>
@@ -64,10 +63,10 @@
                         <ul>
                             <li>
                                 <p class="act-font">
-                                    线上研修：
+                                    {{ $t("jyzx.homePage.online") }}：
                                     <b :class="['point-num', onlineTime == 20 ? 'ok-time' : 'study-time']">{{ onlineTime }}</b>
                                     /20
-                                    <span class="timeNum">(学时)</span>
+                                    <span class="timeNum">({{ $t("jyzx.homePage.time") }})</span>
                                 </p>
                                 <i-circle :percent="onlinePer" :stroke-color="onlinePer == 100 ? '#19BE6B' : ['#2D8CF0','#19BE6B']" :stroke-width="10" :size="90">
                                     <span style="font-size: 17px">{{ onlinePer }}%</span>
@@ -75,10 +74,10 @@
                             </li>
                             <li>
                                 <p class="act-font">
-                                    线下研修：
+                                    {{ $t("jyzx.homePage.offline") }}：
                                     <b :class="['point-num', classTime == 10 ? 'ok-time' : 'study-time']">{{ classTime }}</b>
                                     /10
-                                    <span class="timeNum">(学时)</span>
+                                    <span class="timeNum">({{ $t("jyzx.homePage.time") }})</span>
                                 </p>
                                 <i-circle :percent="classPer" :stroke-color="classPer == 100 ? '#19BE6B' : ['#2D8CF0','#19BE6B']" :stroke-width="10" :size="90">
                                     <span style="font-size: 17px">{{ classPer }}%</span>
@@ -88,10 +87,10 @@
                         <ul>
                             <li>
                                 <p class="act-font">
-                                    应用考核：
+                                    {{ $t("jyzx.homePage.application") }}：
                                     <b :class="['point-num', applicaTime == 15 ? 'ok-time' : 'study-time']">{{ applicaTime }}</b>
                                     /15
-                                    <span class="timeNum">(学时)</span>
+                                    <span class="timeNum">({{ $t("jyzx.homePage.time") }})</span>
                                 </p>
                                 <i-circle :percent="applicaPer" :stroke-color="applicaPer == 100 ? '#19BE6B' : ['#2D8CF0','#19BE6B']" :stroke-width="10" :size="90">
                                     <span style="font-size: 17px">{{ applicaPer }}%</span>
@@ -99,10 +98,10 @@
                             </li>
                             <li>
                                 <p class="act-font">
-                                    课堂实录：
+                                    {{ $t("jyzx.homePage.classRecord") }}：
                                     <b :class="['point-num', discussTime == 5 ? 'ok-time' : 'study-time']">{{ discussTime }}</b>
                                     /5
-                                    <span class="timeNum">(学时)</span>
+                                    <span class="timeNum">({{ $t("jyzx.homePage.time") }})</span>
                                 </p>
                                 <i-circle :percent="discussPer" :stroke-color="discussPer == 100 ? '#19BE6B' : ['#2D8CF0','#19BE6B']" :stroke-width="10" :size="90">
                                     <span style="font-size: 17px">{{ discussPer }}%</span>
@@ -116,21 +115,21 @@
                         <li class="act-border ability-style">
                             <img src="@/assets/image/study_point.png" alt="">
                             <div>
-                                <p class="act-font">已学能力点</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.studyPoint") }}</p>
                                 <p><b class="point-num">{{ allAbilityCount }}</b> / 30</p>
                             </div>
                         </li>
                         <li class="act-border ability-style">
                             <img src="@/assets/image/ok_point.png" alt="">
                             <div>
-                                <p class="act-font">检测合格能力点</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.okPoint") }}</p>
                                 <p><b class="point-num">{{ allAbilityOkNum }}</b> / {{ allAbilityOkTotal }}</p>
                             </div>
                         </li>
                         <li class="act-border ability-style">
                             <img src="@/assets/image/jyzx_app.png" alt="">
                             <div>
-                                <p class="act-font">成果提交</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.achievements") }}</p>
                                 <p><b class="point-num">{{ appNum }}</b> / {{ appTotal }}</p>
                             </div>
                         </li>
@@ -139,21 +138,21 @@
                         <li class="act-border ability-style">
                             <img src="@/assets/image/area_study.png" alt="">
                             <div>
-                                <p class="act-font">区级研修</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.area") }}</p>
                                 <p><b class="point-num">{{ areaNum }}</b> / {{ areaTotal }}</p>
                             </div>
                         </li>
                         <li class="act-border ability-style">
                             <img src="@/assets/image/area_survey.png" alt="">
                             <div>
-                                <p class="act-font">区级问卷</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.areaQue") }}</p>
                                 <p><b class="point-num">{{ areaSurveyNum }}</b> / {{ areaSurveyTotal }}</p>
                             </div>
                         </li>
                         <li class="act-border ability-style">
                             <img src="@/assets/image/area_vote.png" alt="">
                             <div>
-                                <p class="act-font">区级投票</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.areaVote") }}</p>
                                 <p><b class="point-num">{{ areaVoteNum }}</b> / {{ areaVoteTotal }}</p>
                             </div>
                         </li>
@@ -169,21 +168,21 @@
                         <li class="act-border ability-style">
                             <img src="@/assets/image/school_study.png" alt="">
                             <div>
-                                <p class="act-font">校本研修</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.school") }}</p>
                                 <p><b class="point-num">{{ schoolNum }}</b> / {{ schoolTotal }}</p>
                             </div>
                         </li>
                         <li class="act-border ability-style">
                             <img src="@/assets/image/school_survey.png" alt="">
                             <div>
-                                <p class="act-font">校本问卷</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.schoolQue") }}</p>
                                 <p><b class="point-num">{{ surveyNum }}</b> / {{ surveyTotal }}</p>
                             </div>
                         </li>
                         <li class="act-border ability-style">
                             <img src="@/assets/image/school_vote.png" alt="">
                             <div>
-                                <p class="act-font">校本投票</p>
+                                <p class="act-font">{{ $t("jyzx.homePage.schoolVote") }}</p>
                                 <p><b class="point-num">{{ voteNum }}</b> / {{ voteTotal }}</p>
                             </div>
                         </li>

TEAMModelOS/ClientApp/src/view/jyzx/offline.vue

@@ -50,9 +50,9 @@
                                             {{ resource.endTime }}
                                         </span>
                                     </div>
-                                    <div class="site">
+                                    <div class="site" v-if="targets.length">
                                         <span class="info-label">{{ $t('jyzx.offline.target') }}：</span>
-                                        <span v-for="(item, index) in resource.targets" :key="index" style="margin-right: 10px">{{ item }}</span>
+                                        <span v-for="(item, index) in targets" :key="index" style="margin-right: 10px">{{ item }}</span>
                                     </div>
                                 </div>
                                 <div class="img-box" :style="{backgroundImage: `url(${resource.img || defImg})`}"></div>
@@ -216,6 +216,7 @@ export default {
             workInfo: undefined, //作业信息
             allteach:[],//所有老师
             ansShow: false, //是否合格：2:不合格  1:合格
+            targets: [], //学习对象
         }
     },
     created() {
@@ -242,12 +243,12 @@ export default {
         saveSurvey() {
             if(this.myAnswer.length && this.myAnswer.length == this.itemCount && !this.myAnswer.includes(undefined)) {
                 let params = {
-                    id: this.surveyInfo.id,
-                    code: this.$store.state.userInfo.schoolCode,
-                    tId: this.$store.state.userInfo.TEAMModelId,
-                    ans: this.myAnswer.map(i => Array.isArray(i) ? i : [i])
+                    "userid": this.$store.state.userInfo.TEAMModelId,
+                    "code": this.surveyInfo.code,
+                    "id": this.surveyInfo.id,
+                    record: this.myAnswer.map(i => Array.isArray(i) ? i : [i])
                 }
-                this.$api.jyzx.submitquestionnaire(params).then(res => {
+                this.$api.jyzx.answerSurvey(params).then(res => {
                     if(res.code == 200) {
                         this.isSurvey = true
                         this.$Message.success(this.$t("jyzx.offline.success1"))
@@ -340,6 +341,7 @@ export default {
         },
         // 查询活动的信息
         getApiAct() {
+            this.targets.length = 0
             this.resource={}
             this.homeWork = ""
             let req = {
@@ -358,6 +360,8 @@ export default {
                     })
                 } else if(res.status == 200) {
                     if (res.study) {
+                        this.getTarget(res.study.tchLists)
+
                         res.study.startTime = this.dateFormat(
                             res.study.startTime
                         )
@@ -454,26 +458,41 @@ export default {
             detailsDatas.teachers = teachnameArr
             this.resource = detailsDatas
         },
+        getTarget(targets) {
+            let params = {
+                school_code: this.$store.state.userInfo.schoolCode,
+                ids: targets
+            }
+            this.$api.learnActivity.findResearchList(params).then(res => {
+                if(!res.error) {
+                    let list = []
+                    res.list.map(item => {
+                        list.push(item.class.name)
+                    })
+                    this.targets = list
+                }
+            })
+        },
         getSurveyInfo(surveyId) {
             let params = {
                 id: surveyId,
-                code: this.$store.state.userInfo.schoolCode
+                code: 'Survey-' + this.$store.state.userInfo.schoolCode
             }
-            /* this.$api.ability.getSurveySummary(params).then(
+           /*  this.$api.questionnaire.FindSurveysSummary(params).then(
                 res => {
-                    if (res.trSurveys && res.trSurveys[0]) {
-                        res.trSurveys[0].teachers.forEach(item => {
+                    if (res.survey) { */
+                        /* res.survey.teachers.forEach(item => {
                             item.answer = item.answer || []
-                        })
-                        this.surveyInfo = res.trSurveys[0]
+                        }) */
+                        this.surveyInfo = res.survey
 
-                        let tea = res.trSurveys[0].teachers.find(item => {
+                        /* let tea = res.survey.teachers.find(item => {
                             return item.id == this.$store.state.userInfo.TEAMModelId
                         })
                         if (tea) {
                             this.isSurvey = !!tea.time
-                        }
-                    }
+                        } */
+                    /* }
                 }
             ) */
         },