开始评估的修改

src/views/customerService.vue

@@ -64,6 +64,7 @@ import { getChatRecords, sendMsg, readMsg } from '@/api/service';
 export default {
   data() {
     return {
+      // path: 'ws://192.168.0.125:1919/webStock/' + this.$store.state.user.userId,
       path: 'ws://121.5.136.69:1919/webStock/' + this.$store.state.user.userId,
       socket: '',
       numTop: 0,
@@ -153,6 +154,7 @@ export default {
         }
       });
       this.chats.push(msgInfo);
+      this.chatWindowActive();
     },
     send: function(params) {
       this.socket.send(params);

src/views/home/assessment.vue

@@ -4,9 +4,9 @@
       <img src="@/assets/image/banner-2.png" alt="" />
     </div>
     <div class="btn">
-      <router-link target="_blank" :to="{ path: '/startEvaluation' }">
+      <el-button type="primary" style="font-size: 18px" @click="handlePage"
-        <el-button type="primary" style="font-size: 18px">开始评估</el-button>
+        >开始评估</el-button
-      </router-link>
+      >
     </div>
     <div class="list">
       <div class="box">
@@ -53,11 +53,23 @@
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex';
 export default {
   data() {
     return {};
   },
-  methods: {},
+  computed: {
+    ...mapGetters(['token'])
+  },
+  methods: {
+    handlePage() {
+      if (!this.token) return this.msgError('请先登录再做评估');
+      let routerJump = this.$router.resolve({
+        path: '/startEvaluation'
+      });
+      window.open(routerJump.href, '_blank');
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/home/info.vue

@@ -282,5 +282,8 @@ export default {
   /deep/.el-form-item__label {
     font-size: 16px;
   }
+  /deep/.el-dialog {
+    height: auto;
+  }
 }
 </style>

src/views/startEvaluation.vue

@@ -167,7 +167,7 @@
           >
             <el-input-number
               class="w165"
-              v-model="formB.ipropertyNum"
+              v-model="formB.propertyNumI"
             ></el-input-number>
             <!-- <el-input v-model="formB.name" class="w120"></el-input> -->
           </el-form-item>
@@ -176,7 +176,7 @@
           >
             <el-input-number
               class="w120"
-              v-model="formB.iipropertyNum"
+              v-model="formB.propertyNumII"
             ></el-input-number>
           </el-form-item>
           <el-form-item
@@ -355,12 +355,13 @@ export default {
         scienceEmployee: 0,
         hasBad: 0
       }, // 高企认定门槛
+      formAData: {},
       badSeason: [], // A 没有通过的数据
       score: 0, // 分数
       badSeason1: [], // B 没有通过的数据
       formB: {
-        ipropertyNum: 0,
+        propertyNumI: 0,
-        iipropertyNum: 0,
+        propertyNumII: 0,
         hasStandard: 0,
         achievementNum: 0,
         management: [],
@@ -391,10 +392,17 @@ export default {
     submitFormA(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
+          this.formA.territoryIName = this.oneMenuList.find(item => {
+            return item.id == this.formA.one;
+          }).name;
+          this.formA.territoryIIName = this.twoMenuList.find(item => {
+            return item.id == this.formA.territoryId;
+          }).name;
           firstAssess(this.formA).then(({ data }) => {
             if (!data.badSeason.length) {
               // 通过
               this.status = 2;
+              this.formAData = data;
             } else {
               // 没通过
               this.badSeason = data.badSeason;
@@ -416,16 +424,18 @@ export default {
     submitFormB(formName) {
       if (!this.formB.management.length)
         return this.msgError('请至少选择一项组织管理水平');
-      secondAssess(this.formB).then(({ data }) => {
+      secondAssess(Object.assign({}, this.formAData, this.formB)).then(
-        this.badSeason1 = data.badSeason1;
+        ({ data }) => {
-        this.score = data.score;
+          this.badSeason1 = data.badSeason1;
-        if (data.score >= 71) {
+          this.score = data.score;
-          this.status = 4;
+          if (data.score >= 71) {
-        } else {
+            this.status = 4;
-          this.status = -3;
+          } else {
+            this.status = -3;
+          }
+          this.index++;
         }
-        this.index++;
+      );
-      });
     }
   },
   created() {