Merge branch 'V4.3.3_mk' into dev

src/views/modules/home/index.vue

@@ -477,7 +477,16 @@ export default {
         this.$router.push({
             path: obj[item.category],
           });
-      }
+      } else if(item.msgType == "sys_version_upgrade_publish"){
+				let {  targetId } = item
+				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+					if (item.name === "notice-version") {
+						return { ...item };
+					}
+					return item;
+				});
+			}
       this.getNoticeData()
     },
    

src/views/modules/shequzhili/eventOld/cpts/event-info.vue

@@ -504,7 +504,12 @@ export default {
                     this.formData.agencyId = "";
                     this.formData.gridId = "";
                 }
-                this.formData.openFlag =  this.formData.operationType == "7"?1:0
+                if(this.formData.operationType == "7"){
+                    this.formData.openFlag =  1
+                    this.formData.operationType = ""
+                }else{
+                    this.formData.openFlag =  0
+                }
                 const url = "/governance/icEventOld/add";
                 const { data, code, msg } = await requestPost(url, {
                     ...this.formData,
@@ -540,7 +545,7 @@ export default {
                     this.replayInfo.icEventId = this.eventId;
                     if(this.formData.operationType === '7'){
                         this.replayInfo.openFlag = 1
-                        this.replayInfo.operationType = '7'//不可以openFlag为true时去掉校验吗?
+                        this.replayInfo.operationType = ''//不可以openFlag为true时去掉校验吗?
                         this.replayInfo.content = '1111'//不可以openFlag为true时去掉校验吗?
                     }else{
                         this.replayInfo.openFlag = 0