Merge branch 'dev-1224-fix-2.4.4' into release

src/store/education/common.js

@@ -2,7 +2,17 @@ const common = {
     state: {
         _token: '',
         idType: '',
-        masterAdministratorFlag: false
+        masterAdministratorFlag: false,
+        itemComponents:{
+          name:'',
+          status:''
+        },
+        itemManager:{
+          projectName: '',
+          projectBegintime: '',
+          projectEndtime: '',
+          projectStatus: ''
+        }
     },
     mutations: {
         CHANGE_TOKEN: (state, data) => {
@@ -13,7 +23,15 @@ const common = {
         },
         CHANGE_MASTER: (state, data) => {
             state.masterAdministratorFlag = data
-        }
+        },
+        UPDATEITEM_COMPONENTS:(state, data) => {
+          //console.log(data)
+            state.itemComponents = {...data}
+        },
+        UPDATEITEM_MANAGER:(state, data) => {
+          console.log(data)
+            state.itemManager = {...data}
+        },
     },
     actions: {
         changeToken({ commit }, tokenData) {
@@ -24,8 +42,14 @@ const common = {
         },
         changeMaster({ commit }, masterData) {
             commit('CHANGE_MASTER', masterData)
-        }
+        },
+        updateItemComponents({ commit }, masterData) {
+            commit('UPDATEITEM_COMPONENTS', masterData)
+        },
+        updateItemManager({ commit }, masterData) {
+            commit('UPDATEITEM_MANAGER', masterData)
+        },
     }
 }
 
-export default common
+export default common
\ No newline at end of file

src/utils/filter.js

@@ -171,6 +171,8 @@ const vueFilter = {
         return '进行中'
     }else if(value == 2)  {
         return '已结束'
+    }else if(value == 3)  {
+        return '已下架'
     }
   },
   partJoin: (value) => {

src/views/education/edit-manager.vue

@@ -192,6 +192,16 @@
             </el-form-item>
             <p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
           </div>
+          <el-form-item label="项目结束后：">
+            <el-radio-group
+              size="small"
+              v-model="formData.allowLearn"
+              :disabled="showAllowType()"
+            >
+              <el-radio :label="1">允许继续学习(停止发证)</el-radio>
+              <el-radio :label="2">不允许继续学习</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <p class="p_label">项目范围来源：（一经选择无法更改）</p>
           <el-form-item label="">
             <el-radio-group
@@ -1048,6 +1058,7 @@ export default {
         visibleFlag: 1,
         learnableFlag: 2,
         authorityType:1,
+        allowLearn:2
       },
       pickerOptions0: {
         disabledDate: time => {
@@ -1466,6 +1477,7 @@ export default {
         visibleFlag:　editData.projectData.visibleFlag,
         learnableFlag:　editData.projectData.learnableFlag,
         authorityType:editData.projectData.authorityType,
+        allowLearn:editData.projectData.allowLearn || 2,
       };
       this.organizationContent = editData.projectData.creatorOrganizationName;
       if (editData.attachmentData.length > 2) {
@@ -1573,6 +1585,7 @@ export default {
         visibleFlag: this.formData.visibleFlag,
         learnableFlag: this.formData.learnableFlag,
         authorityType:this.formData.authorityType,
+        allowLearn:this.formData.allowLearn,
       };
       let attachmentModel = [
         {
@@ -3079,6 +3092,13 @@ export default {
       }
       return true;
     },
+    //判断通知展示问题
+    showAllowType() {
+      if(this.peopleLevel == 'L3' || this.peopleLevel == 'L0') {
+        return true;
+      }
+      return false;
+    },
     //选择小生态
     selectChangeEcology(value) {
       this.formEcology.pageNum = 1;
@@ -3536,14 +3556,13 @@ export default {
                   return 1;
               } else {
                   return 0;
-              }            
-          } 
+              }
+          }
           vm.formExam.exam.sort(compare)
-          console.log(vm.formExam.exam);
+
           let isCross = vm.checkCrossFun(vm.formExam.exam).isRepart;
-          let parm = vm.checkCrossFun(vm.formExam.exam).parm;
           if(isCross){
-             let l = vm.checkCrossFun(vm.formExam.exam).index
+            let l = vm.checkCrossFun(vm.formExam.exam).index
             if(parm == '1' || parm == '3'){
               vm.formExam.exam[l].minClass = 'is-error'
               vm.formExam.exam[l].minError = '分数最小值不能大于最大值'
@@ -3553,17 +3572,9 @@ export default {
               vm.formExam.exam[l].minError = '请重新输入，不能出现重合分数'
 
             }
-
-
-//             if(l > 0){
-//               vm.formExam.exam[l-1].minClass = 'is-error'
-//               vm.formExam.exam[l-1].minError = '请重新输入，不能出现重合分数'
-//             }
-//
             this.$set(vm.formExam.exam, l, vm.formExam.exam[l])
             return
           }
-
           for(let i=0;i<vm.formExam.exam.length;i++) {
 
 

src/views/education/item-component.vue

@@ -80,7 +80,7 @@
 import BreadCrumb from '../../components/breadcrumb.vue'
 import { doUpload, getFilePath } from "../../utils/qiniu-util"
 import { validateWord } from "../../utils/validate.js"
-import { mapGetters } from 'vuex'
+import { mapGetters,mapActions } from 'vuex'
 import { openLoading, closeLoading } from '../../utils/utils'
 import * as commonUtil from '../../utils/utils'
 let vm = null
@@ -146,6 +146,9 @@ export default {
         vm.idType = localStorage.getItem('storageIdType')
         vm.masterAdministratorFlag = localStorage.getItem('storageMaster')
         if(this.$route.query.pageNum){
+           console.log(this.$store.state.common.itemComponents)
+           vm.searchParam.status = this.$store.state.common.itemComponents.status
+           vm.searchParam.name = this.$store.state.common.itemComponents.name
           vm.searchParam.pageNo = parseInt(this.$route.query.pageNum)
         }
         vm.search()
@@ -155,6 +158,9 @@ export default {
         commonUtil.resizeHeight()
     },
     methods: {
+      ...mapActions([
+      	'updateItemComponents'
+      ]),
         // 列表查询
         search(flag) {
             if(flag) vm.searchParam.pageNo = 1
@@ -193,6 +199,7 @@ export default {
             }
             vm.GET('portal/portalComponent/componentEditRange',req).then((res) => {
                 if(res.code == "000000") {
+                  vm.updateItemComponents({name:vm.searchParam.name,status:vm.searchParam.status})
                     vm.$router.push({path: 'create-component',query: {id:row.id,status: row.status,resultFlag: res.data.resultFlag,pageNum:vm.searchParam.pageNo}})
                 }else {
 					vm.$message.info(res.message)

src/views/education/item-manager.vue

@@ -195,7 +195,7 @@
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
 import { create } from "domain";
-import { mapGetters } from 'vuex'
+import { mapGetters,mapActions } from 'vuex'
 import { returnData } from "../../utils/mock";
 import { openLoading, closeLoading } from "../../utils/utils";
 import * as commonUtil from "../../utils/utils";
@@ -290,6 +290,7 @@ export default {
     vm.masterAdministratorFlag = localStorage.getItem('storageMaster');
     console.log('idType:',vm.idType);
     if(this.$route.query.pageNum){
+      this.formInline = {...this.$store.state.common.itemManager}
       this.formInline.pageNo = parseInt(this.$route.query.pageNum)
     }
     this.$nextTick(function() {;
@@ -301,6 +302,9 @@ export default {
     commonUtil.resizeHeight();
   },
   methods: {
+    ...mapActions([
+    	'updateItemManager'
+    ]),
     toPage() {
       this.$router.push("edit-manager");
     },
@@ -362,6 +366,7 @@ export default {
       let projectId = row.id;
       let level = row.level;
       if (type === 0) {
+        this.updateItemManager(this.formInline)
         //编辑
         this.$router.push("edit-manager?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
       } else if (type === 7) {

src/views/learning/report-list.vue

@@ -105,6 +105,10 @@ export default {
         {
           label: "已结束",
           value: 2
+        },
+        {
+          label: "已下架",
+          value: 3
         }
       ],
       tableData: [],