Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

FrontCode2/sunshine_levy/src/views/index.vue

@@ -316,7 +316,7 @@ export default {
           totalCount: 0
         }
       },
-      ticket: "8a1189377bdad67c017c0b132df851f6-ticket"
+      ticket: "8a1188527bda7a4d017c0bf804381ed5-ticket"
     };
   },
   async created() {

FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue

@@ -20,14 +20,14 @@
           <img src="@/assets/img/evaluateNumber.png" alt="" />
           <span>评估编号:</span>
         </div>
-        <span>{{ info.number }}</span>
+        <span>{{ info.assessmentNo }}</span>
       </div>
     </div>
     <!-- 卡片视图部分 -->
     <el-card :body-style="{ padding: '0px' }">
       <div>
         <span>被征收房屋评估金额:</span>
-        <span>{{ info.HousingAssessmentValue }}</span>
+        <span>{{ info.housingAssessmentValue }}</span>
       </div>
       <div>
         <span>被征收房屋评估价值:</span>
@@ -35,11 +35,11 @@
       </div>
       <div>
         <span>附属物评估金额:</span>
-        <span>{{ info.AttachedAssessedValue }}</span>
+        <span>{{ info.attachedAssessedValue }}</span>
       </div>
       <div>
         <span>装修评估金额:</span>
-        <span>{{ info.DecorateAssessedValue }}</span>
+        <span>{{ info.decorateAssessedValue }}</span>
       </div>
       <div>
         <span>超容积率土地补偿费:</span>
@@ -60,6 +60,7 @@
   </div>
 </template>
 <script>
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
   data() {
     return {
@@ -77,7 +78,34 @@ export default {
       }
     };
   },
+  created() {
+    this.getData();
+  },
   methods: {
+    // 获取数据
+    getData() {
+      mgop({
+        api: "mgop.kykj.houseexpropriat.getHouseEstimateInfoJzlr",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
+        data: {
+          ticket:
+            this.$route.params.ticket ||
+            window.sessionStorage.getItem("ticket"),
+          id: this.$route.params.projectId
+        },
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          console.log("数据", data);
+          const { data: res } = data.data;
+          this.info = res;
+        },
+        onFail: err => {
+          console.log("请求失败", err);
+        }
+      });
+    },
     // 跳转评估结果pdf
     pageJump() {
       this.$router.push({
@@ -137,6 +165,7 @@ export default {
   .bottom {
     display: flex;
     justify-content: center;
+    margin-bottom: 20px;
   }
 }
 </style>

FrontCode2/sunshine_levy/src/views/report/evalute.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div class="image">
-      <img alt src="@/assets/img/evalute.png" />
+      <img alt src="@/assets/img/evaluate.png" />
     </div>
     <div class="text">为您查询到{{ this.prjListLength }}条结果</div>
     <!-- 标题区 -->
@@ -12,15 +12,13 @@
     <div
       :key="index"
       v-for="(item, index) in this.prjList.fhpgList"
-      @click="pageJump()"
+      @click="pageJump(item.id)"
     >
+      <div v-if="item.type === '1'">
         <el-card body-style="padding:10px">
-        <div class="absolute" v-if="title == '住宅'">
+          <div class="absolute">
             <span>住宅</span>
           </div>
-        <div class="absolute" v-else>
-          <span>商业</span>
-        </div>
           <div>
             <img alt src="@/assets/img/bianhao.png" />
             评估报告编号：
@@ -56,6 +54,7 @@
           </div>
         </el-card>
       </div>
+    </div>
     <!-- 标题区 -->
     <div class="title">
       <img src="@/assets/img/zhuzhai.png" alt="" />
@@ -66,11 +65,9 @@
       v-for="(item, index) in this.prjList.fhpgList"
       @click="pageJump()"
     >
+      <div v-if="item.type == '2'">
         <el-card body-style="padding:10px">
-        <div class="absolute" v-if="title == '住宅'">
-          <span>住宅</span>
-        </div>
-        <div class="absolute" v-else>
+          <div class="absolute" style="background-color:#268FF2">
             <span>商业</span>
           </div>
           <div>
@@ -109,6 +106,7 @@
         </el-card>
       </div>
     </div>
+  </div>
 </template>
 <script>
 import { mgop } from "@aligov/jssdk-mgop";
@@ -131,8 +129,7 @@ export default {
         ]
       },
       prjList: [],
-      prjListLength: "",
-      title: "住宅"
+      prjListLength: ""
     };
   },
   created() {
@@ -168,14 +165,17 @@ export default {
           this.prjListLength = prjList.fhpgList.length;
         },
         onFail: err => {
-          console.log("用户无数据，不展示");
+          console.log("请求出错", err);
         }
       });
     },
     // 跳转评估结果二级页面
-    pageJump() {
+    pageJump(id) {
       this.$router.push({
-        name: "evaluatePage"
+        name: "evaluatePage",
+        params: {
+          projectId: id
+        }
       });
     }
   }
@@ -234,7 +234,7 @@ export default {
         top: 0;
         margin: 0;
         width: 50px;
-        height: 30px;
+        height: 25px;
         display: flex;
         align-items: center;
         justify-content: center;