Merge branch 'private-yang' into 'master'

merge

See merge request spfm/spfm-market-front!174

src/pages/main/competitor/index.vue

@@ -307,6 +307,289 @@ export default {
   },
   data() {
     return {
+       celldata: [
+        { r: 0, c: 0, v: { v: "运营商", bl: 1, ht: 0, vt: 0 } },
+        {
+          r: 0,
+          c: 1,
+          tb: 2,
+          v: {
+            tb: 2,
+            fs: 11,
+            ht: 0,
+            vt: 0,
+            v: "套餐档位（从低到高进行填写）低档：58元以下套餐中档：58元（含）-128元套餐（不含）高档：128元及以上套餐",
+            ct: { fa: "General", t: "n" },
+            m: "2",
+          },
+        },
+        {
+          r: 0,
+          c: 2,
+          v: {
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+            v: "套餐名称",
+            ct: { fa: "General", t: "n" },
+            m: "3",
+          },
+        },
+        {
+          r: 0,
+          c: 3,
+          v: {
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+            v: "是否为主推套餐",
+            ct: { fa: "General", t: "n" },
+            m: "0",
+          },
+        },
+        {
+          r: 0,
+          c: 4,
+          v: {
+            v: "月费(元)",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 5,
+          v: {
+            v: "优惠价",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 6,
+          v: {
+            v: "预存款(元)",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 7,
+          v: {
+            v: "套餐内容",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 8,
+          v: {
+            v: "酬金",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 9,
+          v: {
+            v: "在售区域",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 10,
+          v: {
+            v: "在售渠道",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 11,
+          v: {
+            v: "月销量",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 12,
+          v: {
+            v: "是否包含宽带",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 13,
+          v: {
+            v: "宽带具体内容",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 14,
+          v: {
+            v: "是否包括电视",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 15,
+          v: {
+            v: "是否包括副卡",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 16,
+          v: {
+            v: "是否包括亲情网",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 17,
+          v: {
+            v: "是否包括v网产品",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 18,
+          v: {
+            v: "其他补充信息",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 19,
+          v: {
+            v: "上报人",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+        {
+          r: 0,
+          c: 20,
+          v: {
+            v: "联系电话",
+            bl: 0,
+            it: 0,
+            ff: 0,
+            fs: 11,
+            fc: "rgb(51, 51, 51)",
+            ht: 0,
+            vt: 0,
+          },
+        },
+      ],
       excelList: [],
       dialogTableVisible: false,
       exportType: "1", // 1是违规  2是正常
@@ -415,7 +698,7 @@ export default {
         //        console.log(items)
         //    })
         // })
-        if (res.data.body) {
+        if (res.data.body != null ) {
           // let data = res.data.body[0].data;
           // res.data.body[0].data = [];
           // for (let i = 0; i <= data.length - 1; i++) {