Merge pull request #33 from a54552239/dev

Dev
a54552239 · Feb 25, 2020 · ff1aa4d · ff1aa4d
2 parents 1cf7eab + 649e839
commit ff1aa4d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/public/index.html b/public/index.html
@@ -12,14 +12,5 @@
 <!--<script src="https://webapi.amap.com/js/marker.js"></script>
 <script type="text/javascript"
         src="https://webapi.amap.com/maps?v=1.4.7&key=936c5eca7d2e763f953a0483e75637c8&plugin=AMap.Transfer,AMap.Driving,AMap.Walking,AMap.LineSearch,AMap.Geocoder"></script>-->
-<script>
-  var _hmt = _hmt || [];
-  (function() {
-    var hm = document.createElement("script");
-    hm.src = "https://hm.baidu.com/hm.js?eb6ecfed64ffefae6d5d74ea2945e7aa";
-    var s = document.getElementsByTagName("script")[0];
-    s.parentNode.insertBefore(hm, s);
-  })();
-</script>
 </body>
 </html>
diff --git a/src/components/project/projectSelect.vue b/src/components/project/projectSelect.vue
@@ -48,7 +48,7 @@
 <script>
     import _ from 'lodash'
     import {mapState} from 'vuex'
-    import {selfList as getProjectList} from "../../api/project";
+    import {read as getProject, selfList as getProjectList} from "../../api/project";
     import pagination from "../../mixins/pagination";
 
     export default {
@@ -92,18 +92,22 @@
         },
         methods: {
             init() {
+                this.getProject();
                 this.getProjectList(true);
             },
+            getProject() {
+                getProject(this.code).then((res) => {
+                    this.currentProject = res.data;
+                });
+            },
             getProjectList(loading = true) {
                 this.loading = loading;
                 this.requestData.pageSize = 50;
                 this.requestData.archive = -1;
                 getProjectList(this.requestData).then(res => {
-                    console.log(res);
                     this.projectList = res.data.list;
                     this.projectListCopy = res.data.list;
                     this.projectTotal = res.data.total;
-                    this.currentProject = res.data.list.find(item => item.code == this.code);
                     this.loading = false;
                 });
             },

diff --git a/src/config/version.js b/src/config/version.js
@@ -1,3 +1,3 @@
 export default {
-    VERSION: '2.8.9',
+    VERSION: '2.8.10',
 };
diff --git a/src/router/index.js b/src/router/index.js
@@ -151,11 +151,6 @@ router.beforeEach((to, from, next) => {
         });
         return false;
     }
-    // 统计代码
-    if (to.path) {
-        _hmt.push(['_trackPageview', '/#' + to.fullPath]);
-        console.log(_hmt);
-    }
     next();
 });
 router.afterEach(route => {

diff --git a/src/views/project/space/overview.vue b/src/views/project/space/overview.vue
@@ -292,20 +292,20 @@
                 burnoutMap: {
                     loading: true,
                     chartData: {
-                        columns: ['日期', '剩余任务', '基线'],
+                        columns: ['日期', '实际剩余任务', '理想剩余任务'],
                         rows: []
                     },
                     series: [
                         {
                             type: 'line',
-                            name: '剩余任务',
+                            name: '实际剩余任务',
                             smooth: false,
                             color: '#1890ff',
                             data: [],
                         },
                         {
                             type: 'line',
-                            name: '基线',
+                            name: '理想剩余任务',
                             color: '#52C41A',
                             smooth: false,
                             lineStyle: {

diff --git a/src/views/project/template/index.vue b/src/views/project/template/index.vue
@@ -130,7 +130,8 @@
                 showLoadingMore: false,
                 loadingMore: false,
                 currentTemplate: {},
-                cover: config.PROD_URL + '/static/image/default/cover.png',
+                cover:'https://beta.vilson.xyz/static/image/default/project-cover.png',
+                // cover: config.PROD_URL + '/static/image/default/cover.png',
                 newData: {
                     id: 0,
                 },