Explorar el Código

10/23 添加签退地点

mo hace 4 años
padre
commit
e35724714f

+ 3 - 3
src/layout/components/AppMain.vue

@@ -3,9 +3,9 @@
     <!--   -->
     <transition name="fade-transform"
                 mode="out-in">
-      <!-- <keep-alive> -->
-      <router-view :key="key" />
-      <!-- </keep-alive> -->
+      <keep-alive>
+        <router-view :key="key" />
+      </keep-alive>
     </transition>
   </section>
 </template>

+ 2 - 2
src/layout/components/TagsView.vue

@@ -6,7 +6,7 @@
                    class="tags-view-item"
                    :class="isActive(tag)?'active':''"
                    v-for="(tag,index) in Array.from(visitedViews)"
-                   :to="{path:tag.path,query:tag.query}"
+                   :to="{path:tag.fullPath,query:tag.query,some:tag.path}"
                    :key="index"
                    @contextmenu.prevent.native="openMenu(tag,$event)">
         {{generateTitle(tag.title)}}
@@ -90,7 +90,7 @@ export default {
       const tags = this.$refs['tag']
       this.$nextTick(() => {
         for (const tag of tags) {
-          if (tag.to === this.$route.path) {
+          if (tag.path === this.$route.path) {
             this.$refs.scrollPane.moveToTarget(tag.$el)
             break
           }

+ 1 - 1
src/store/modules/tagsView.js

@@ -19,7 +19,7 @@ const tagsView = {
           name: view.name,
           path: view.path,
           fullPath: view.fullPath,
-          query: view.query, 
+          query: view.query,
           title: view.meta.title || 'no-name'
         })
       }

+ 10 - 0
src/views/teamDetail/componentCourse/gpsLocation.vue

@@ -96,6 +96,16 @@ export default {
             this.signInLongitudeLatitude = res.data.signInLongitudeLatitude.split(',')
             this.markers.push(add)
           }
+          if (res.data && res.data.signOutLongitudeLatitude) {
+            let add = {
+              title: '签退点',
+              location: res.data.signOutLongitudeLatitude.split(',')
+            }
+            this.center = res.data.signOutLongitudeLatitude.split(',');
+            this.signOutLongitudeLatitude = res.data.signOutLongitudeLatitude.split(',')
+            this.markers.push(add)
+          }
+
           if (res.data && res.data.schoolLongitudeLatitude) {
             let add = {
               title: '教学点',

+ 0 - 1
src/views/teamDetail/teamListComponent/teamSteam.vue

@@ -39,7 +39,6 @@ export default {
   watch: {
     activeId (val) {
       if (val) {
-        console.log(val)
         this.getProcess()
       }