Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf'

src/store/actions.js

 export default {
   //保存数据
   saveUploadImg({ commit }, imgArr) {
-    commit('SAVE_UPLOAD_IMG',imgArr)
+    commit("SAVE_UPLOAD_IMG", imgArr);
   },
   //清除数据
   clearUploadkImg({ commit }) {
     commit("CLEAR_UPLOAD_IMG");
-  },
-}
+  }
+};

src/store/index.js

-import Vue from 'vue'
-import Vuex from 'vuex'
-import state from './state'
-import actions from './actions'
-import mutations from './mutations'
+import Vue from "vue";
+import Vuex from "vuex";
+import state from "./state";
+import actions from "./actions";
+import mutations from "./mutations";
 
-Vue.use(Vuex)
+Vue.use(Vuex);
 
 export default new Vuex.Store({
   state,
   mutations,
   actions,
-  modules: {}
-})
+  modules: {},
+  getters: {
+    present: state => key => state.present[key]
+  }
+});

src/store/mutations.js

 export default {
   //保存数据
   SAVE_UPLOAD_IMG(state, imgArr) {
-      state.uploadImgArr = imgArr
+    state.uploadImgArr = imgArr;
   },
   //清除数据
-     CLEAR_UPLOAD_IMG(state){
-      state.uploadImgArr = []
+  CLEAR_UPLOAD_IMG(state) {
+    state.uploadImgArr = [];
+  },
+
+  /* 保存风险现状图片 */
+  SET_PRESENT_IMG(state, data) {
+    data.forEach(({ key, value }) => {
+      state.present[key] = value;
+    });
+  },
+  CLEAR_PRESENT_IMG(state) {
+    for (let i in state.present) {
+      state.present[i] = [];
+    }
   }
-}
+};

src/store/state.js

 export default {
-  uploadImgArr: []
-}
+  uploadImgArr: [],
+  present: {
+    measuresProjectFile: []
+  }
+};

src/views/riskProject/add/addPresent.vue

@@ -669,6 +669,12 @@ export default {
     if (sessionStorage.getItem("presentForm")) {
       this.form = JSON.parse(sessionStorage.getItem("presentForm"));
       this.form.level = sessionStorage.getItem("level");
+      const getImg = (key)=>this.$store.getters.present(key)
+      this.uploaderImg = getImg('uploaderImg');
+      this.measuresAdministrationFile = getImg('measuresAdministrationFile');
+      this.measuresEmergencyFile = getImg('measuresEmergencyFile');
+      this.measuresProjectFile = getImg('measuresProjectFile');
+      this.$store.commit('CLEAR_PRESENT_IMG')
       sessionStorage.removeItem("presentForm");
     } else {
       this.postReturnEcho();
@@ -948,6 +954,22 @@ export default {
     //开始测评
     goResultPage() {
       sessionStorage.setItem("presentForm", JSON.stringify(this.form));
+      /* measuresAdministrationFile: [], //管理措施图片
+      measuresProjectFile: [], //管理措施图片
+      measuresEmergencyFile: [], //管理措施图片 */
+      this.$store.commit('SET_PRESENT_IMG',[{
+        key:'uploaderImg',
+        value:this.uploaderImg
+      },{
+        key:'measuresAdministrationFile',
+        value:this.measuresAdministrationFile
+      },{
+        key:'measuresProjectFile',
+        value:this.measuresProjectFile
+      },{
+        key:'measuresEmergencyFile',
+        value:this.measuresEmergencyFile
+      },])
       this.$router.push({
         name: "resultPage",
         params: {