Procházet zdrojové kódy

修改教师的版本字段显示优化

plg před 4 týdny
rodič
revize
734a5f51cc

+ 6 - 3
src/components/GroupCompare.vue

@@ -20,11 +20,14 @@
           {{ planInfo.planName }}群体报告统计
         </p>
         <div>
-          <el-form :inline="true">
+        
+          <div style="margin-bottom: 40px" v-show="(planInfo.planType =='1')"></div>
+          <el-form :inline="true"  v-show="(planInfo.planType =='0')">
             <el-form-item label="首选项" class="plan_lang">
               <el-select v-model="groupType" @change="groupChangeFun">
                 <el-option label="全院" value="1"> </el-option>
-                <el-option label="年级" value="2" v-show="planInfo.planType=='0'"> </el-option>
+                <el-option label="年级" value="2" v-show="planInfo.planType == '0'">
+                </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="年级" class="plan_lang" v-show="groupType != '1'">
@@ -258,7 +261,7 @@ export default {
       //规定好跳转到哪个页面--然后跳转的类型
       // this.$router.push({path:'/manage/tendency',query:{orgNo:'1212',type:'1'}})
       //planInfo
-      this.planInfo.orgNo=val.orgNo
+      this.planInfo.orgNo = val.orgNo;
       sessionStorage.setItem("tendency", JSON.stringify(this.planInfo));
       this.$router.push({
         path: "/manage/tendency",

+ 1 - 1
src/components/PlanReport.vue

@@ -304,7 +304,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="年级选择">
+          <el-form-item label="年级选择" v-show="planType=='0'">
             <el-select v-model="grade" placeholder="请选择年级" @change="gradeChange">
               <el-option
                 v-for="item in gradeList"

+ 1 - 0
src/views/manage/channelManagement/channelManagement.vue

@@ -1087,6 +1087,7 @@ export default {
       }
     },
     addRegisterUser(val) {
+      debugger;
       let obj = {
         planType: val.planType,
         id: val.id,

+ 1 - 1
src/views/manage/channelManagement/contract.vue

@@ -746,7 +746,7 @@ export default {
         }`;
       } else {
         //planType
-        url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}${
+        url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}&orgNo=${this.userInfo.orgNo}${
           this.planType == "" ? "" : `&planType=${this.planType}`
         }${this.planName == "" ? "" : `&planName=${this.planName}`}`;
       }

+ 4 - 2
src/views/manage/tendency.vue

@@ -698,8 +698,9 @@ export default {
           //需要循环列表
           //且、路径上有参数的话
           let params = this.$route.query;
-          this.isJump = true;
+        
           if (params.hasOwnProperty("orgNo")) {
+            this.isJump = true;
             //当存在该属性时
             //  this. channelTmp
             //循环拿到orgNo 等于当前的数据
@@ -787,8 +788,9 @@ export default {
         if (val) {
           let params = this.$route.query;
           console.log(params.hasOwnProperty("orgNo"));
-          this.isJump = true;
+        
           if (params.hasOwnProperty("orgNo")) {
+            this.isJump = true;
             //当存在该属性时
             this.group = [params.orgNo];
             //