Merge branch 'http_mock' into http_test

src/router/newRouter.js

@@ -360,6 +360,7 @@ const layout = [
     name: '数据大盘',
     component: Layout,
     icon: 'data-big',
+    key: 'data_market',
     redirect: '/dataBigManage/index',
     children: [
       {

src/views/dataBigManage/index.vue

@@ -195,6 +195,7 @@ export default {
   created() {
     this.getProvence()
     this.settingGetBizList(false)
+    window.log({ c: 'data_market', d: 'get_data_market_page' })
   },
   methods: {
     // 业务线与团队架构互斥

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -192,6 +192,7 @@ export default {
           this.reportreleaseGetReportById(newV.id)
         } else { // 新建
           this.tpsltId = newV
+          // this.reportreleaseInitReportRelease(newV)
           this.settingGetReportModuleById(newV)
         }
       },
@@ -252,9 +253,9 @@ export default {
         } else {
           this.customList = [...this.customList]
         }
-        this.from = res.data
+        // this.from = res.data
         this.modelID = res.data.id
-        this.from = { ...this.from, 'moduleName': res.data.moduleName, 'passStatus': 0 }
+        this.from = { ...this.from, ...res.data, 'moduleName': res.data.moduleName, 'passStatus': 0 }
       }
     },