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

FrontCode2/sunshine_levy/src/router/index.js

@@ -24,10 +24,10 @@ export default new Router({
       component: () =>
         import ("../views/project")
     },
-    // 评估结果页面
+    // 评估结果一级页面
     {
       path: "/report/evalute",
-      name: "evaluteResult",
+      name: "evalute",
       component: () =>
         import ("../views/report/evalute")
     },
@@ -45,6 +45,13 @@ export default new Router({
       component: () =>
         import ("../views/pdf/pdf")
     },
+    // 评估结果二级页面
+    {
+      path: "/evaluatePage",
+      name: "evaluatePage",
+      component: () =>
+        import ("../views/report/evaluatePage")
+    },
     // 评估结果pdf
     {
       path: "/evaluteResult",

FrontCode2/sunshine_levy/src/views/index.vue

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

FrontCode2/sunshine_levy/src/views/project/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div :class="type == 'pg' ? 'proTopBoxpg' : 'proTopBoxxy'">
+    <div :class="this.type == 'pg' ? 'proTopBoxpg' : 'proTopBoxxy'">
       <div class="proCenterBox">
         <div class="proCenterInfo">
           <van-image
@@ -30,30 +30,29 @@
     </div>
     <div class="proList">
       <van-list>
+        <!-- 跳转项目详情 -->
         <div
           :key="item.id"
           class="proListBox shadow"
           v-for="item in info.prjList"
+          @click="gotoDetail(item.prjId)"
         >
-          <!-- 跳转项目详情 -->
-          <div @click="gotoDetail(item.prjId)">
-            <div class="proAreaBox">
-              <div class="proArea">{{ item.area }}</div>
-              <div class="proCenterFont" v-if="item.state_cd == 1">
-                · {{ item.currentState }}
-              </div>
-              <div class="proCenterFont" style="color:#179D5C" v-else>
-                · {{ item.currentState }}
-              </div>
+          <div class="proAreaBox">
+            <div class="proArea">{{ item.area }}</div>
+            <div class="proCenterFont" v-if="item.state_cd == 1">
+              · {{ item.currentState }}
             </div>
-            <div class="proAreaBox">
-              <div class="proTitleBox">{{ item.name }}</div>
-            </div>
-            <van-divider style="margin:8px 0;" />
-            <div class="proDateBox">
-              <div>{{ item.prjId }}</div>
+            <div class="proCenterFont" style="color:#179D5C" v-else>
+              · {{ item.currentState }}
             </div>
           </div>
+          <div class="proAreaBox">
+            <div class="proTitleBox">{{ item.name }}</div>
+          </div>
+          <van-divider style="margin:8px 0;" />
+          <div class="proDateBox">
+            <div>{{ item.prjId }}</div>
+          </div>
         </div>
       </van-list>
     </div>
@@ -118,11 +117,10 @@ export default {
     },
     // 页面跳转
     gotoDetail(id) {
-      console.log("跳转了");
       if (window.sessionStorage.getItem("type") == "pg") {
-        // 评估结果页面
+        // 评估结果一级页面
         this.$router.push({
-          name: "evaluteResult",
+          name: "evalute",
           params: {
             prjId: id,
             ticket: this.$route.params.ticket

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

@@ -9,7 +9,7 @@
       @click="showPdf(item.url)"
       v-for="(item, index) in prjList.bcxyList"
     >
-      <el-card body-style="padding:10px 10px 0">
+      <el-card body-style="padding:0 10px 0">
         <div>
           <img alt src="@/assets/img/bianhao.png" />
           协议编号：
@@ -79,7 +79,6 @@ export default {
   },
   methods: {
     onInit() {
-      console.log("id", this.$route.params.prjId);
       if (!window.sessionStorage.getItem("projectId")) {
         SetProjectId(this.$route.params.prjId);
       }
@@ -95,7 +94,6 @@ export default {
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
           const { data: res } = data.data;
-          console.log("res", res);
           this.info = res;
           const prjList = res.prjList.find((item, index) => {
             return (
@@ -104,7 +102,6 @@ export default {
                 window.sessionStorage.getItem("projectId"))
             );
           });
-          console.log("协议", prjList);
           this.prjList = prjList;
           this.prjListLength = prjList.bcxyList.length;
         },
@@ -120,9 +117,7 @@ export default {
   }
 };
 </script>
-<style>
-/* @import url(./global.css); */
-</style>
+
 <style lang="less" scoped>
 .container {
   font-size: 12px;
@@ -156,6 +151,17 @@ export default {
           height: 100%;
         }
       }
+      .line {
+        opacity: 1;
+        margin: 0;
+        height: unset;
+        img {
+          width: 100%;
+        }
+        img {
+          height: 2px;
+        }
+      }
       .flex {
         display: flex;
         align-items: center;
@@ -168,15 +174,6 @@ export default {
           height: 100%;
         }
       }
-      .line {
-        opacity: 1;
-        img {
-          width: 100%;
-        }
-        img {
-          height: 2px;
-        }
-      }
       .backgroundColor {
         background-color: #e3ebfd;
         span {

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

@@ -0,0 +1,142 @@
+<template>
+  <div class="container">
+    <div class="top">
+      <div>
+        <div>
+          <img src="@/assets/img/houseLocation.png" alt="" />
+          <span>被征收房屋座落:</span>
+        </div>
+        <span>{{ info.address }}</span>
+      </div>
+      <div>
+        <div>
+          <img src="@/assets/img/evaluateType.png" alt="" />
+          <span>评估方式:</span>
+        </div>
+        <span>{{ info.address }}</span>
+      </div>
+      <div class="evaluateNumber">
+        <div>
+          <img src="@/assets/img/evaluateNumber.png" alt="" />
+          <span>评估编号:</span>
+        </div>
+        <span>{{ info.number }}</span>
+      </div>
+    </div>
+    <!-- 卡片视图部分 -->
+    <el-card :body-style="{ padding: '0px' }">
+      <div>
+        <span>被征收房屋评估金额:</span>
+        <span>{{ info.HousingAssessmentValue }}</span>
+      </div>
+      <div>
+        <span>被征收房屋评估价值:</span>
+        <span>{{ info.countValue }}</span>
+      </div>
+      <div>
+        <span>附属物评估金额:</span>
+        <span>{{ info.AttachedAssessedValue }}</span>
+      </div>
+      <div>
+        <span>装修评估金额:</span>
+        <span>{{ info.DecorateAssessedValue }}</span>
+      </div>
+      <div>
+        <span>超容积率土地补偿费:</span>
+        <span>{{ info.ExceedLandMoney }}</span>
+      </div>
+      <div>
+        <span>阁楼补偿费:</span>
+        <span>{{ info.AtticAssessedValue }}</span>
+      </div>
+      <div>
+        <span>备注:</span>
+        <span>{{ info.Remark }}</span>
+      </div>
+    </el-card>
+    <div class="bottom">
+      <el-button type="primary" @click="pageJump()">查看评估报告</el-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      info: {
+        address: "地址",
+        type: "价值录入",
+        number: "0001",
+        HousingAssessmentValue: "168612元",
+        countValue: "168612元",
+        AttachedAssessedValue: "168612元",
+        DecorateAssessedValue: "16861元",
+        ExceedLandMoney: "报告录入",
+        AtticAssessedValue: "报告录入",
+        Remark: "Remark"
+      }
+    };
+  },
+  methods: {
+    // 跳转评估结果pdf
+    pageJump() {
+      this.$router.push({
+        name: "evaluteResult"
+      });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.container {
+  font-size: 14px;
+  .top {
+    background-color: #eff2fa;
+    padding: 10px 0;
+    .evaluateNumber {
+      > span {
+        color: #3da4fc;
+      }
+    }
+    > div {
+      margin: 20px 0;
+      padding: 0 10px;
+      height: 20px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      > div {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        width: 50%;
+        img {
+          height: 100%;
+          margin-right: 10px;
+        }
+      }
+      > span {
+        width: 20%;
+      }
+    }
+  }
+  .el-card {
+    margin: 10px 10px 30px;
+    .el-card__body {
+      > div {
+        margin: 20px 7px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        > span:nth-child(2) {
+          color: red;
+        }
+      }
+    }
+  }
+  .bottom {
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

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

@@ -4,12 +4,75 @@
       <img alt src="@/assets/img/evalute.png" />
     </div>
     <div class="text">为您查询到{{ this.prjListLength }}条结果</div>
+    <!-- 标题区 -->
+    <div class="title">
+      <img src="@/assets/img/zhuzhai.png" alt="" />
+      <span><b>住宅</b></span>
+    </div>
     <div
       :key="index"
       v-for="(item, index) in this.prjList.fhpgList"
       @click="pageJump()"
     >
       <el-card body-style="padding:10px">
+        <div class="absolute" v-if="title == '住宅'">
+          <span>住宅</span>
+        </div>
+        <div class="absolute" v-else>
+          <span>商业</span>
+        </div>
+        <div>
+          <img alt src="@/assets/img/bianhao.png" />
+          评估报告编号：
+          <b>{{ item.assessmentNo }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/name.png" />
+          被征收人姓名：
+          <b>{{ info.userName }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/address.png" />
+          被征收人房屋地址：
+          <b>{{ item.houseAddress }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/money.png" />
+          评估总金额：
+          <b style="color: red">{{ item.countValue }}</b>
+        </div>
+        <div class="line">
+          <img alt src="@/assets/img/hengxian.png" />
+        </div>
+        <div class="content">
+          <div class=" backgroundColor">
+            <img alt src="@/assets/img/renyuan.png" />
+            <span> 评估人员：{{ item.createUserName }}</span>
+          </div>
+          <div class="backgroundColor">
+            <img alt src="@/assets/img/shijian.png" />
+            <span> 评估时间：{{ item.createTime }}</span>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <!-- 标题区 -->
+    <div class="title">
+      <img src="@/assets/img/zhuzhai.png" alt="" />
+      <span><b>非住宅</b></span>
+    </div>
+    <div
+      :key="index"
+      v-for="(item, index) in this.prjList.fhpgList"
+      @click="pageJump()"
+    >
+      <el-card body-style="padding:10px">
+        <div class="absolute" v-if="title == '住宅'">
+          <span>住宅</span>
+        </div>
+        <div class="absolute" v-else>
+          <span>商业</span>
+        </div>
         <div>
           <img alt src="@/assets/img/bianhao.png" />
           评估报告编号：
@@ -68,7 +131,8 @@ export default {
         ]
       },
       prjList: [],
-      prjListLength: ""
+      prjListLength: "",
+      title: "住宅"
     };
   },
   created() {
@@ -108,10 +172,10 @@ export default {
         }
       });
     },
-    // 跳转评估结果pdf
+    // 跳转评估结果二级页面
     pageJump() {
       this.$router.push({
-        path: "/evaluteResult"
+        name: "evaluatePage"
       });
     }
   }
@@ -134,23 +198,51 @@ export default {
     text-align: center;
     color: #2d6df2;
   }
+  .title {
+    margin: 10px 10px;
+    font-size: 14px;
+    height: 20px;
+    display: flex;
+    align-items: center;
 
+    img {
+      margin-right: 7px;
+      height: 100%;
+    }
+  }
   .el-card {
     margin: 0 10px 10px;
+    position: relative;
     .el-card__body {
+      padding: 0 10px;
       > div {
         margin: 14px 0;
         display: flex;
         align-items: center;
         img {
           margin-right: 6px;
+          width: 20px;
         }
         b {
           font-size: 14px;
         }
       }
+      .absolute {
+        background-color: #f7be24;
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin: 0;
+        width: 50px;
+        height: 30px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+      }
       .line {
         opacity: 1;
+        margin: 0;
         img {
           width: 100%;
         }