Merge branch 'fix_changebug' into online

dist/static/css/chunk-commons.9aec0d4a.css

@@ -0,0 +1 @@
+.pagination-container[data-v-5d1dc94e]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5d1dc94e]{display:none}.content-tooltip[data-v-98517b38]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}

src/views/resetTeaming/index.vue

@@ -103,8 +103,8 @@ export default {
     // this.__init()
   },
   beforeDestroy () {
-    sessionStorage.setItem('setStep', 0)
-    sessionStorage.setItem('resetCode', 1)
+    // sessionStorage.setItem('setStep', 0)
+    // sessionStorage.setItem('resetCode', 1)
   },
   mounted () {
     let obj = {}
@@ -120,7 +120,7 @@ export default {
   },
   methods: {
     __init () {
-      this.activeIndex = sessionStorage.getItem('resetCode') || '1';
+      // this.activeIndex = sessionStorage.getItem('resetCode') || '1';
       this.teamid = this.$route.query.id;
     },
     onCancel () {

src/views/teamBuild/components/forecast-list.vue

@@ -92,7 +92,7 @@
                             {{ scope.row.subjectFirstName ? scope.row.subjectFirstName : null }}
                             {{ !scope.row.subjectFirstName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}，
                             {{ scope.row.subjectSecondName ? scope.row.subjectSecondName : null }}
-                            {{ !scope.row.subjectSecondName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}
+                            {{ !scope.row.subjectSecondName && scope.row.subjectSecond == 999 ? '听从老师安排' : null }}
                             <!-- {{ scope.row.subjectFirstName }}，{{ scope.row.subjectSecondName }} -->
                         </template>
                     </el-table-column>

src/views/teamBuild/forecastName.vue

@@ -125,7 +125,7 @@
                     >
                         <template slot-scope="scope">
                             {{ scope.row.subjectSecondName ? scope.row.subjectSecondName : null }}
-                            {{ !scope.row.subjectSecondName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}
+                            {{ !scope.row.subjectSecondName && scope.row.subjectSecond == 999 ? '听从老师安排' : null }}
                         </template>
                     </el-table-column>
                     <el-table-column