Merge branch 'dev-tracking-20201221' into 'release'

添加页面埋点管理功能 code reviewer: 张平添加页面埋点管理功能 See merge request !7

Merge branch 'dev-tracking-20201221' into 'release'
添加页面埋点管理功能 code reviewer: 张平添加页面埋点管理功能 See merge request !7
156abda3 · wensu.huang · 3d2a4329 · 14a37620 · 156abda3 · 156abda3
--- a/index.html
+++ b/index.html
@@ -8,13 +8,24 @@
    <meta content="" name="description"/>
    <meta content="" name="author"/>
    <link rel="shortcut icon" href="./static/img/index_logoicon.png">
+    <link
+  rel="stylesheet"
+  href="https://uicdn.toast.com/tui-image-editor/latest/tui-image-editor.css"
+/>
+
 </head>
 <body>
 <div id="app"></div>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/3.6.0/fabric.js"></script>
+<script type="text/javascript" src="https://uicdn.toast.com/tui.code-snippet/v1.5.0/tui-code-snippet.min.js"></script>
+<script type="text/javascript" src="https://uicdn.toast.com/tui-color-picker/v2.2.6/tui-color-picker.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.3/FileSaver.min.js"></script>
+<script src="https://uicdn.toast.com/tui-image-editor/latest/tui-image-editor.js"></script>
 <script src="https://pv.sohu.com/cityjson?ie=utf-8"></script>
 <!--oss upload start-->
 <script src="https://gosspublic.alicdn.com/aliyun-oss-sdk-5.1.1.min.js"></script>
 <script src="https://unpkg.com/qiniu-js@2.2.0/dist/qiniu.min.js"></script>
+
 <!--oss upload end-->
 </body>
 </html>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -10,10 +10,15 @@
        "build:dll": "webpack --config build/webpack.dll.conf.js"
    },
    "dependencies": {
+        "@toast-ui/vue-image-editor": "^1.3.0",
        "axios": "^0.18.0",
        "babel-polyfill": "^6.23.0",
        "echarts": "^4.9.0",
-        "element-ui": "^2.7.2",
+        "element-ui": "^2.15.0",
+        "fabric": "^4.3.0",
+        "file-saver": "^2.0.5",
+        "tui-image-editor": "^3.11.0",
+        "v-viewer": "^1.5.1",
        "vue": "^2.3.2",
        "vue-core-image-upload": "2.1.11",
        "vue-datasource": "1.0.9",

--- a/src/common/env.js
+++ b/src/common/env.js
@@ -54,7 +54,7 @@ export const getAddress = () => {
        Url = ipAddress + "/ADMIN_CMS_FE/rest/";
        //msUrl = "http://10.177.15.117:10201" + "/contents/";
        // msUrl = "http://10.177.15.154:10203" + "/contents/";
-        msUrl = "http://dev-sc.yunqueyi.com" + "/contents/";
+        msUrl = "https://dev-sc.yunqueyi.com" + "/contents/";
        lectureUrl = "https://dev-sc.yunqueyi.com"
        liveUrl = "https://dev-sc.yunqueyi.com/campaign/";
        kfUrl = "http://test1-kf.yunqueyi.com" + "/api/";
@@ -63,7 +63,7 @@ export const getAddress = () => {
        // qiniuUrl = "http://10.177.15.154:10203/contents/admin/qiniu/token"; //不再使用middle服务获取七牛token
        qiniuUrl = "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token";
        // qiniuFileUrl = "http://10.177.15.154:10203/contents/admin/qiniu/token1";
-        qiniuFileUrl = "http://dev-sc.yunqueyi.com/contents/admin/qiniu/token1";
+        qiniuFileUrl = "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1";
        qiniuResourceUrl = "https://test1-videos.yunqueyi.com";
    } else if (isNotEmptyUtils(env)) {//测试test1 test2 uat
        versionUrl = 'https://' + env + '-dev.yunqueyi.com';

--- a/src/main.js
+++ b/src/main.js
@@ -5,10 +5,11 @@ import router from './router';
 import store from './vuex/store'
 import axios from 'axios';
 import ElementUI from 'element-ui';
-import echarts from 'echarts';
 import 'element-ui/lib/theme-chalk/index.css';    // 默认主题
 import {getAddress, loadCommonFilter} from './common/env'
 import vueFilter from './common/filter';
+import vViewer from 'v-viewer';
+import 'viewerjs/dist/viewer.css';


 //加载环境变量
@@ -16,7 +17,9 @@ getAddress();
 loadCommonFilter();
 //加载elementUi
 Vue.use(ElementUI);
-Vue.prototype.$echarts = echarts;
+Vue.use(vViewer, {
+	button: false
+});
 // Vue.use(vueXlsxTable, {rABS: false})

 if (localStorage.getItem("token")) {

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,6 +43,20 @@ export default new Router({
                    path: '/path-data',
                    component: resolve => require(['../views/user-path/funnel-data.vue'], resolve)
                },
+                { // 页面管理
+                    path: '/strack-list',
+                    component: resolve => require(['../views/strack-data/strack-list.vue'], resolve),
+                    meta: {
+                        keepAlive: true
+                    }
+                },
+                { // 埋点管理
+                    path: '/create-point',
+                    component: resolve => require(['../views/strack-data/create-point.vue'], resolve),
+                    meta: {
+                        keepAlive: true
+                    }
+                }
            ]
        },
        {  // 短信中的 数据查看页面

--- a/src/views/strack-data/create-point.vue
+++ b/src/views/strack-data/create-point.vue
--- a/src/views/strack-data/strack-detail.vue
+++ b/src/views/strack-data/strack-detail.vue
--- a/src/views/strack-data/strack-list.vue
+++ b/src/views/strack-data/strack-list.vue
--- a/static/img/test.png
+++ b/static/img/test.png