Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-ui/src/api/asEditor/index.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 //新增JSON数据
-export function addDate(data) {
+export function addData(data) {
     return request({
       url: '/system/mobilePageData',
       method: 'post',
@@ -10,7 +10,7 @@ export function addDate(data) {
     })
 }
 // 获取JSON
-export function getDate() {
+export function getData() {
     return request({
       url: '/system/mobilePageData/2',
       method: 'get',

zkqy-ui/src/views/asEditor/layout/home/home.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { getDate } from "@/api/asEditor/index";
+import { getData } from "@/api/asEditor/index";
 import headerTop1 from '../../components/headerTop1'
 import collect from '../../components/collect'
 import {
@@ -95,17 +95,17 @@ export default {
   },
   async created() {
     // 是否是iframe使用
-    if (this.$route.query.type === 'iframe') {
-      window.addEventListener('message', e => {
-        console.log(e.data, '-------------message')
-        let datas = e.data
-        this.pageComponents = JSON.parse(datas.component)
-        this.pageSetup = JSON.parse(datas.templateJson)
-      })
-      return
-    }
+    // if (this.$route.query.type === 'iframe') {
+    //   window.addEventListener('message', e => {
+    //     console.log(e.data, '-------------message')
+    //     let datas = e.data
+    //     this.pageComponents = JSON.parse(datas.component)
+    //     this.pageSetup = JSON.parse(datas.templateJson)
+    //   })
+    //   return
+    // }
 
-    await this.loadShopData()
+    // await this.loadShopData()
     let miniprogram = window.localStorage.getItem('miniprogram')
     console.log(miniprogram, '-------------------miniprogram')
   },
@@ -114,12 +114,14 @@ export default {
   },
   methods: {
     initData(){
-      getDate().then(response=>{
+      getData().then(response=>{
         if(response.code==200){
           console.log(response.data);
           this.getJSONList = response.data;
           console.log(this.getJSONList);
           console.log(this.getJSONList.component);
+          this.pageComponents=JSON.parse(this.getJSONList.component)
+          this.pageSetup=JSON.parse(this.getJSONList.templateJson)
         }else{
           this.$message.error("获取数据失败")
         }
@@ -147,23 +149,7 @@ export default {
         })
         this.orgid = false
         //  模板数据替换 shopTemplateData.data.shopTemplate 此处可替换成接口
-        let shopTemplateData = this.getJSONList.map(item => (
-          {
-            code: 0,
-            success: true,
-            error: false ,
-            data:{
-              shopTemplate: {    
-                id: item.id,
-                name: item.name,
-                // templateJson: item.templateJson,
-                // component: item.component, 
-              }
-            },
-            msg: '成功'
-          }
-        ));
-        /* {
+        /* let shopTemplateData = {
           code: 0,
           success: true,
           error: false ,
@@ -177,10 +163,10 @@ export default {
           },
           msg: '成功'
         } */
-        console.log(shopTemplateData, '----------shopTemplateData')
-        if (shopTemplateData.code !== 0) {
-          return this.$toast(shopTemplateData.msg)
-        }
+        // console.log(shopTemplateData, '----------shopTemplateData')
+        // if (shopTemplateData.code !== 0) {
+        //   return this.$toast(shopTemplateData.msg)
+        // }
         let datas = shopTemplateData.data.shopTemplate
         if (!datas) return this.tota?.clear()
         this.pageComponents = JSON.parse(datas.component)

zkqy-ui/src/views/asEditor/layout/home/index.vue

@@ -164,7 +164,7 @@
 </template>
 
 <script>
-import { addDate } from "@/api/asEditor/index";
+import { addData } from "@/api/asEditor/index";
 import sliderassembly from '../../components/sliderassembly/index.vue'
 import headerTop from '../../components/headerTop/index.vue'
 import phoneBottom from '../../components/phoneBottom/index.vue'
@@ -293,7 +293,7 @@ export default {
     addJSONData(){
       let payload = this.getJSONData();
       console.log(payload);
-      addDate(payload).then(response=>{
+      addData(payload).then(response=>{
         if(response.code==200){//成功
 
         }else{//失败

zkqy-ui/src/views/index.vue

@@ -175,6 +175,7 @@ export default {
     };
   },
   mounted() {
+    this.title = sessionStorage.getItem("title") || "智能制造平台";
     // 初始化 echarts
     this.initChart1();
     this.initChart2();
@@ -613,9 +614,6 @@ export default {
       return formatDate(new Date());
     },
   },
-  // mounted() {
-  //   this.title = sessionStorage.getItem("title") || "智能制造平台";
-  // },
 };
 </script>