可编辑范围修改

src/App.vue

@@ -51,9 +51,7 @@ export default {
 		vm.getToken()
 	},
 	mounted() {
-		// setInterval(function(){
-		// 	vm.pushMessage()
-		// },60000)
+	
 	},
 	methods: {
 		// 解密token
@@ -64,8 +62,9 @@ export default {
 				let paramStr = href.substring(offset + 1, href.length)
 				let pars = base64decode(paramStr)
 				let paramMap = getUrlParamsMap(pars, "&")
-				if (isNotEmptyUtils(paramMap["token"]) || localStorage.getItem('storageToken')) {
+				if (isNotEmptyUtils(paramMap["token"])) {
 					vm.token = paramMap["token"]
+					localStorage.setItem('storageToken', vm.token)
 				} else {
 					window.location.href = getLoginUrl()  // 没有token返回登录页面
 					return 
@@ -79,14 +78,6 @@ export default {
 			vm.changeToken(vm.token)
 			vm.getUserAuth(vm.token)
 		},
-		// 实时消息推送
-		pushMessage() {
-			vm.$notify({
-				title: '警告',
-				message: '这是一条警告的提示消息',
-				type: 'warning'
-			});
-		},
 		// 修改token
 		...mapActions([
 			'changeToken',

src/utils/fetch.js

@@ -11,12 +11,11 @@ const service = axios.create({
 
 // request拦截器
 service.interceptors.request.use(config => {
-  if(config.data && config.data.token) {
-    localStorage.setItem('storageToken',config.data.token)
-  }
+  // if(config.data && config.data.token) {
+  //   localStorage.setItem('storageToken',config.data.token)
+  // }
   config.headers['sysCode'] = 12
   config.headers['token'] = localStorage.getItem('storageToken')
-  //config.headers['token'] = 'AB14D7D7675E4D09B4B1566170076122'
   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
   // if (config.data && config.data.setEntry) {
   //   config.headers['sysCode'] = config.data.sysCode || 10

src/views/education/create-component.vue

@@ -17,8 +17,8 @@
                 <div class="btn-container">
                     <el-button v-if="stepNum == 1 && (componentStatus == 1 || !componentStatus)" @click="storageAndNext(1)" type="default" size="small">暂存</el-button>
                     <el-button v-if="stepNum == 1" @click="storageAndNext(2)" type="primary" size="small" style="margin-left:0;">下一步</el-button>
-                    <el-button v-if="stepNum == 2 && (componentStatus == 1 || !componentStatus)" @click="finishConponent(1)" :disabled="resultFlag == 2" type="default" size="small">暂存</el-button>
-                    <el-button v-if="stepNum == 2" @click="finishConponent(2)" :disabled="resultFlag == 2" type="primary" size="small" style="margin-left:0;">完成</el-button>
+                    <el-button v-if="stepNum == 2 && (componentStatus == 1 || !componentStatus)" @click="finishConponent(1)" type="default" size="small">暂存</el-button>
+                    <el-button v-if="stepNum == 2" @click="finishConponent(2)" type="primary" size="small" style="margin-left:0;">完成</el-button>
                 </div>
             </div>
             <div class="first-step" v-if="stepNum == 1">
@@ -456,7 +456,7 @@ export default {
         vm = this
         vm.componentId = vm.$route.query.id
         vm.componentStatus = vm.$route.query.status
-        vm.resultFlag = vm.$route.query.resultFlag  // 判断可编辑基础信息还是全部信息  1 为全部  2 为基础
+        vm.resultFlag = vm.$route.query.resultFlag  // 判断可编辑范围是基础信息还是全部信息  1 为全部  2 为基础
         vm.getCertificateList() // 获取证书列表
         vm.componentBasicInfo() // 根据ID查询组件基本信息
     },
@@ -679,6 +679,10 @@ export default {
             for(let i = 0;i<vm.componentList.moduleModelList.length;i++) {
                 if((targetName - 1) == i) {
                     if(vm.componentList.moduleModelList[i].id) {
+                        if(vm.resultFlag == 2) {
+                            vm.$message.info("已关联项目只能编辑组件基础信息")
+                            return
+                        }
                         if(vm.componentList.moduleModelList[i].templetModelList) {
                             vm.$confirm('删除模块会将改模块下已有模板同时删除，确认需要删除吗？', '提示', {
                                     confirmButtonText: '确定',
@@ -781,6 +785,10 @@ export default {
             for(let i = 0; i < vm.componentList.moduleModelList.length; i++) {
                 if(index == i) {
                     if(vm.componentList.moduleModelList[i].templetModelList[index1].id) {
+                        if(vm.resultFlag == 2) {
+                            vm.$message.info("已关联项目只能编辑组件基础信息")
+                            return
+                        }
                         vm.GET('portalComponent/deletePortalTemplateById',{id: vm.componentList.moduleModelList[i].templetModelList[index1].id}).then((res) => {
                             if( res.code == '000000') {
                                 vm.$message.info('成功删除模板！')
@@ -827,6 +835,10 @@ export default {
                             for(let q = 0; q < vm.componentList.moduleModelList[i].templetModelList[j].partModelList.length;q++){
                                 if(index2 == q) {
                                     if(vm.componentList.moduleModelList[i].templetModelList[j].partModelList[q].partContentModelList[index3].id) {
+                                        if(vm.resultFlag == 2) {
+                                            vm.$message.info("已关联项目只能编辑组件基础信息")
+                                            return
+                                        }
                                         vm.GET('portalComponent/deletePortalPartById',{id: vm.componentList.moduleModelList[i].templetModelList[j].partModelList[q].partContentModelList[index3].id}).then((res) => {
                                             if( res.code == '000000') {
                                                 vm.$message.info('成功删除模板元件内容！')
@@ -873,6 +885,10 @@ export default {
         },
         // 完成(暂存)
         finishConponent(flag) {
+            if(vm.resultFlag == 2) {
+                vm.$message.info("已关联项目只能编辑组件基础信息")
+                return
+            }
             let req = null
             if(vm.componentList.moduleModelList && vm.componentList.moduleModelList.length > 0) {
                 for(let i = 0; i < vm.componentList.moduleModelList.length; i++) {
@@ -891,7 +907,7 @@ export default {
                         }
                         for(let j = 0; j < vm.componentList.moduleModelList[i].templetModelList.length; j++) {
                             for(let k = 0; k < vm.componentList.moduleModelList[i].templetModelList[j].partModelList.length; k++) {
-                                if(!vm.componentList.moduleModelList[i].templetModelList[j].partModelList[k].partContentModelList[0].content1 || !vm.componentList.moduleModelList[i].templetModelList[j].partModelList[k].partContentModelList[0].content2) {
+                                if(!vm.componentList.moduleModelList[i].templetModelList[j].partModelList[k].partContentModelList[0].content1) {
                                     vm.$message.info( vm.componentList.moduleModelList[i].templetModelList[j].name + "中名称为空，请添加内容后保存")
                                     return
                                 }
@@ -941,6 +957,15 @@ export default {
             vm.GET('portalComponent/ModuleList',{openFlag: 2}).then((res) => {
                 if( res.code == '000000') {
                    vm.resourceArray = res.data.moduleModelList
+                //    for(let i = 0; i < vm.componentList.moduleModelList.length; i++) {
+                //        if(vm.componentList.moduleModelList[i].moduleType == 2 ) {
+                //             for(let j = 0; j < vm.resourceArray.length; j++) {
+                //                 if( vm.componentList.moduleModelList[i].id == vm.resourceArray[j].id) {
+                //                     vm.resourceArray.splice(j,1)
+                //                 }
+                //             }
+                //         }
+                //     }
                 }
             })
         },
@@ -950,6 +975,7 @@ export default {
                 for(let i = 0; i < vm.resourceArray.length; i++) {
                     if(val == vm.resourceArray[i].id) {
                         vm.dialogData = vm.resourceArray[i]
+                        vm.resourceArray.splice(i,1)
                         break
                     }
                 }
@@ -988,6 +1014,8 @@ export default {
                     vm.componentList.moduleModelList.push(vm.dialogData)
                     vm.firstTab = vm.componentList.moduleModelList.length + ''
                 }
+                vm.dialogData = []
+                vm.selectResource.resourceModuleSelect = ''
             }
         }
     }

src/views/education/item-component.vue

@@ -216,6 +216,11 @@ export default {
         },
         // 删除
         deleteComponent(row) {
+            vm.$confirm('确定要删除该组件吗？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
                     vm.GET('portalComponent/deleteComponentById',{id: row.id}).then((res) => {
                         if(res.code == "000000") {
                             vm.$message({
@@ -227,6 +232,12 @@ export default {
                     }).catch(function (error) {
                         vm.$message.error(error);
                     });
+                }).catch(() => {
+                    vm.$message({
+                        type: 'info',
+                        message: '已取消'
+                    })
+            })
         },
         handleSizeChange(value) {
             vm.searchParam.pageSize = value