From e0925115edc6b966cee908f1f4d29c6ed852e4e9 Mon Sep 17 00:00:00 2001
From: lisl <1223762861@qq.com>
Date: Thu, 23 Sep 2021 14:53:10 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontCode2/sunshine_levy/src/main.js          |  9 ++--
 FrontCode2/sunshine_levy/src/store/index.js   | 24 ++++++++-
 FrontCode2/sunshine_levy/src/views/index.vue  |  7 ++-
 .../src/views/pdf/evaluateResultPdf.vue       | 34 +++----------
 .../src/views/pdf/evaluteResult.vue           |  6 +++
 .../sunshine_levy/src/views/project/index.vue | 30 +++---------
 .../src/views/report/agreement.vue            |  2 +-
 .../src/views/report/evaluatePage.vue         | 49 ++++++++++---------
 .../src/views/report/evalute.vue              | 48 ++++++------------
 9 files changed, 93 insertions(+), 116 deletions(-)

diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js
index adeb132..dac0876 100644
--- a/FrontCode2/sunshine_levy/src/main.js
+++ b/FrontCode2/sunshine_levy/src/main.js
@@ -11,13 +11,16 @@ import Vue from "vue";
 import App from "./App";
 import router from "./router";
 import store from "./store";
-import { Button, NavBar, Cell, CellGroup } from "vant";
+import { Button, NavBar, Cell, CellGroup, Notify } from "vant";
 
 Vue.use(Button)
   .use(NavBar)
   .use(Cell)
-  .use(CellGroup)
-  .use(ElementUI);
+  .use(CellGroup);
+
+Vue.use(ElementUI);
+
+Vue.use(Notify);
 
 import { Image as VanImage } from "vant";
 
diff --git a/FrontCode2/sunshine_levy/src/store/index.js b/FrontCode2/sunshine_levy/src/store/index.js
index f66447c..d7e2837 100644
--- a/FrontCode2/sunshine_levy/src/store/index.js
+++ b/FrontCode2/sunshine_levy/src/store/index.js
@@ -5,16 +5,36 @@ Vue.use(Vuex);
 export default new Vuex.Store({
   // state 中存放的就是全局共享的数据
   state: {
-    info: {}
+    info: {},
+    // 首页数据
+    homeData: {},
+    // 评估详情页面类型
+    type: ""
   },
   mutations: {
     getData: (state, data) => {
       state.info = data;
+    },
+    // 首页数据
+    getHomeData: (state, data) => {
+      state.homeData = data;
+    },
+    setType: (state, data) => {
+      state.type = data;
     }
   },
   actions: {
-    GETDATA: ({ commit }, data) => {
+    // 评估详情页面数据
+    GET_DATA: ({ commit }, data) => {
       commit("getData", data);
+    },
+    // 首页数据
+    GET_HOMEDATA: ({ commit }, data) => {
+      commit("getHomeData", data);
+    },
+    // 设置评估详情页面类型
+    SET_TYPE: ({ commit }, data) => {
+      commit("setType", data);
     }
   }
 });
\ No newline at end of file
diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue
index 0880041..a54e057 100644
--- a/FrontCode2/sunshine_levy/src/views/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/index.vue
@@ -316,7 +316,7 @@ export default {
           totalCount: 0
         }
       },
-      ticket: "8a1188537bda78db017c0cb56c2d3f85-ticket"
+      ticket: "8a1188537bda78db017c11306d640ca7-ticket"
     };
   },
   async created() {
@@ -339,6 +339,7 @@ export default {
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
           console.log("首页数据", data);
+          this.$store.dispatch("GET_HOMEDATA", data);
           if (data.data && data.data.success == true) {
             this.data = data.data.data;
             // 埋点
@@ -363,9 +364,7 @@ export default {
       this.$router.push({
         name: "projectSelect",
         params: {
-          type: type,
-          ticket: this.$route.query.ticket || this.ticket,
-          prjId: id || ""
+          type: type
         }
       });
     },
diff --git a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
index d60463d..f2e540c 100644
--- a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
+++ b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
@@ -38,32 +38,14 @@ export default {
   mounted() {},
   methods: {
     onInit() {
-      mgop({
-        api: "mgop.kykj.houseexpropriat.getagreementinfop",
-        host: "https://mapi.zjzwfw.gov.cn/",
-        dataType: "JSON",
-        type: "POST",
-        data: {
-          ticket:
-            this.$route.params.ticket ||
-            window.sessionStorage.getItem("ticket"),
-          id: "C655515B-FD91-48F2-BD79-EAABAFB7077C"
-        },
-        appKey: "es4b8zmz+2001833218+dehllx",
-        onSuccess: result => {
-          console.log("pdf.vue页面请求pdf文件:", result);
-          if (result.data && result.data.success == true) {
-            console.log("result.data.data:", result.data.data);
-            this.apidata = result.data.data;
-            this.pic_width = "100%";
-            this.pic_height = "100%";
-            this.isloading = false;
-          }
-        },
-        onFail: err => {
-          console.log("用户无数据，不展示");
-        }
-      });
+      const result = JSON.parse(JSON.stringify(this.$store.state.info));
+      if (result.data && result.data.success == true) {
+        console.log("result.data.data:", result.data.data);
+        this.apidata = result.data.data;
+        this.pic_width = "100%";
+        this.pic_height = "100%";
+        this.isloading = false;
+      }
     },
     saveImages() {
       ZWJSBridge.onReady(() => {
diff --git a/FrontCode2/sunshine_levy/src/views/pdf/evaluteResult.vue b/FrontCode2/sunshine_levy/src/views/pdf/evaluteResult.vue
index 3fab0b2..9925827 100644
--- a/FrontCode2/sunshine_levy/src/views/pdf/evaluteResult.vue
+++ b/FrontCode2/sunshine_levy/src/views/pdf/evaluteResult.vue
@@ -480,6 +480,12 @@ export default {
     return {};
   },
   methods: {},
+  created() {
+    Notify({
+      message: "无附件",
+      duration: 3000
+    });
+  },
   mounted() {
     html2canvas(this.$refs.image).then(canvas => {
       canvas.id = "mycanvas";
diff --git a/FrontCode2/sunshine_levy/src/views/project/index.vue b/FrontCode2/sunshine_levy/src/views/project/index.vue
index 2090395..ef3e37f 100644
--- a/FrontCode2/sunshine_levy/src/views/project/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/project/index.vue
@@ -51,7 +51,7 @@
           </div>
           <van-divider style="margin:8px 0;" />
           <div class="proDateBox">
-            <div>{{ item.prjId }}</div>
+            <div>{{ item.createRecordTime }}</div>
           </div>
         </div>
       </van-list>
@@ -96,25 +96,9 @@ export default {
       if (this.$route.params.type) {
         window.sessionStorage.setItem("type", this.$route.params.type);
       }
-      this.ticket = this.$route.params.ticket;
-      mgop({
-        api: "mgop.kykj.houseexpropriat.getprjlist",
-        host: "https://mapi.zjzwfw.gov.cn/",
-        dataType: "JSON",
-        type: "POST",
-        data: {
-          ticket:
-            this.$route.params.ticket || window.sessionStorage.getItem("ticket")
-        },
-        appKey: "es4b8zmz+2001833218+dehllx",
-        onSuccess: data => {
-          const { data: res } = data;
-          this.info = res.data;
-        },
-        onFail: err => {
-          console.log("用户无数据，不展示");
-        }
-      });
+      this.info = JSON.parse(
+        JSON.stringify(this.$store.state.homeData.data.data)
+      );
     },
     // 页面跳转
     gotoDetail(id) {
@@ -123,8 +107,7 @@ export default {
         this.$router.push({
           name: "evalute",
           params: {
-            prjId: id,
-            ticket: this.$route.params.ticket
+            prjId: id
           }
         });
       } else if (window.sessionStorage.getItem("type") == "xy") {
@@ -132,8 +115,7 @@ export default {
         this.$router.push({
           name: "reportAgreement",
           params: {
-            prjId: id,
-            ticket: this.$route.params.ticket
+            prjId: id
           }
         });
       }
diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue
index 922f30d..4d4fd43 100644
--- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue
+++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue
@@ -23,7 +23,7 @@
         <div>
           <img alt src="@/assets/img/address.png" />
           协议类型：
-          <b>{{ item.type }}</b>
+          <b>{{ item.switchProductionWay }}</b>
         </div>
         <div>
           <img alt src="@/assets/img/money.png" />
diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue
index 040d6b8..404252d 100644
--- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue
+++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue
@@ -6,14 +6,14 @@
           <img src="@/assets/img/houseLocation.png" alt="" />
           <span>被征收房屋座落:</span>
         </div>
-        <span>{{ info.address }}</span>
+        <span>{{ info.houseAddress }}</span>
       </div>
       <div>
         <div>
           <img src="@/assets/img/evaluateType.png" alt="" />
           <span>评估方式:</span>
         </div>
-        <span>{{ info.address }}</span>
+        <span>{{ info.valuationMethodText }}</span>
       </div>
       <div class="evaluateNumber">
         <div>
@@ -43,15 +43,15 @@
       </div>
       <div>
         <span>超容积率土地补偿费:</span>
-        <span>{{ info.ExceedLandMoney }}</span>
+        <span>{{ info.exceedLandMoney }}</span>
       </div>
       <div>
         <span>阁楼补偿费:</span>
-        <span>{{ info.AtticAssessedValue }}</span>
+        <span>{{ info.atticAssessedValue }}</span>
       </div>
       <div>
         <span>备注:</span>
-        <span>{{ info.Remark }}</span>
+        <span>{{ info.remark }}</span>
       </div>
     </el-card>
     <div class="bottom">
@@ -65,41 +65,43 @@ export default {
   data() {
     return {
       info: {
-        address: "地址",
-        type: "价值录入",
+        houseAddress: "地址",
+        valuationMethodText: "价值录入",
         number: "0001",
-        HousingAssessmentValue: "168612元",
+        housingAssessmentValue: "168612元",
         countValue: "168612元",
-        AttachedAssessedValue: "168612元",
-        DecorateAssessedValue: "16861元",
-        ExceedLandMoney: "报告录入",
-        AtticAssessedValue: "报告录入",
-        Remark: "Remark"
+        attachedAssessedValue: "168612元",
+        decorateAssessedValue: "16861元",
+        exceedLandMoney: "报告录入",
+        atticAssessedValue: "报告录入",
+        remark: "Remark"
       }
     };
   },
   created() {
     this.getData();
-    console.log("this.state", this.$store.state);
   },
   methods: {
     // 获取数据
     getData() {
+      if (this.$route.params.type) {
+        this.$store.dispatch("SET_TYPE", this.$route.params.type);
+      }
       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.fhpgId,
-          type: this.$route.params.type
+          ticket: window.sessionStorage.getItem("ticket"),
+          id:
+            "FDE2318D-A545-4C95-9666-D01CE5EA635C" || this.$route.params.fhpgId,
+          type: this.$store.state.type
         },
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
-          console.log("数据", data);
+          this.$store.dispatch("GET_DATA", data);
+          console.log("分户评估", data);
           const { data: res } = data.data;
           this.info = res;
         },
@@ -110,7 +112,7 @@ export default {
     },
     // 跳转评估结果pdf
     pageJump() {
-      if (this.info.valuationMethod == "0") {
+      if (!this.info.isExistPdf) {
         this.$router.push({
           name: "evaluteResult"
         });
@@ -128,7 +130,7 @@ export default {
   font-size: 14px;
   .top {
     background-color: #eff2fa;
-    padding: 10px 0;
+    padding: 10px 7%;
     .evaluateNumber {
       > span {
         color: #3da4fc;
@@ -136,7 +138,6 @@ export default {
     }
     > div {
       margin: 20px 0;
-      padding: 0 10px;
       height: 20px;
       display: flex;
       justify-content: space-between;
@@ -152,7 +153,7 @@ export default {
         }
       }
       > span {
-        width: 20%;
+        // width: 20%;
       }
     }
   }
diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue
index 8b42d73..1b63f58 100644
--- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue
+++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue
@@ -11,7 +11,7 @@
     </div>
     <div
       :key="index"
-      v-for="(item, index) in this.prjList.fhpgList"
+      v-for="(item, index) in this.info.prjList.fhpgList"
       @click="pageJump(item.id, item.type)"
     >
       <div v-if="item.type === '1'">
@@ -61,8 +61,8 @@
       <span><b>非住宅</b></span>
     </div>
     <div
-      :key="index"
-      v-for="(item, index) in this.prjList.fhpgList"
+      :key="item.assessmentNo"
+      v-for="item in this.info.prjList.fhpgList"
       @click="pageJump()"
     >
       <div v-if="item.type == '2'">
@@ -128,11 +128,14 @@ export default {
           }
         ]
       },
-      prjList: [],
       prjListLength: ""
     };
   },
   created() {
+    console.log(
+      "this.$store.state.homeData.data.data;",
+      this.$store.state.homeData.data.data
+    );
     this.onInit();
   },
   methods: {
@@ -141,35 +144,16 @@ export default {
       if (!window.sessionStorage.getItem("projectId")) {
         SetProjectId(this.$route.params.prjId);
       }
-      mgop({
-        api: "mgop.kykj.houseexpropriat.getprjlist",
-        host: "https://mapi.zjzwfw.gov.cn/",
-        dataType: "JSON",
-        type: "POST",
-        data: {
-          ticket:
-            this.$route.params.ticket || window.sessionStorage.getItem("ticket")
-        },
-        appKey: "es4b8zmz+2001833218+dehllx",
-        onSuccess: data => {
-          const { data: res } = data.data;
-          this.info = res;
-          const prjList = res.prjList.find((item, index) => {
-            return (
-              item.prjId ==
-              (this.$route.params.prjId ||
-                window.sessionStorage.getItem("projectId"))
-            );
-          });
-          this.prjList = prjList;
-          console.log("prjList", prjList);
-          this.$store.dispatch("GETDATA", prjList);
-          this.prjListLength = prjList.fhpgList.length;
-        },
-        onFail: err => {
-          console.log("请求出错", err);
+      this.info = JSON.parse(
+        JSON.stringify(this.$store.state.homeData.data.data)
+      );
+      const prjList = this.$store.state.homeData.data.data.prjList.find(
+        item => {
+          return item.prjId == window.sessionStorage.getItem("projectId");
         }
-      });
+      );
+      this.info.prjList = prjList;
+      this.prjListLength = prjList.fhpgList.length;
     },
     // 跳转评估结果二级页面
     pageJump(id, type) {