增加评估公司，合计安置面积，修改图标，取消部分内容

FrontCode2/sunshine_levy/index.html

@@ -7,7 +7,7 @@
       content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0"
     />
     <title>宁波房屋征收</title>
-    <script>
+    <!-- <script>
       function getQueryString(name) {
         var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
         var r = window.location.search.substr(1).match(reg);
@@ -25,7 +25,7 @@
           location.replace('https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs')
         }
       }
-    </script>
+    </script> -->
     <script
       type="text/javascript"
       src="https://d.alicdn.com/alilog/mlog/aplus.js?id=202951085"

FrontCode2/sunshine_levy/src/main.js

@@ -11,7 +11,6 @@ import "element-ui/lib/theme-chalk/index.css";
 import Vue from "vue";
 import App from "./App";
 import router from "./router";
-import store from "./store";
 import "@/assets/css/global.css";
 import {
   Button,
@@ -71,7 +70,7 @@ Vue.prototype.$bus = new Vue();
 const vm = new Vue({
   el: "#app",
   router,
-  store,
+
   components: { App },
   template: "<App/>"
 });

FrontCode2/sunshine_levy/src/store/index.js

@@ -1,59 +0,0 @@
-import Vuex from "vuex";
-import Vue from "vue";
-Vue.use(Vuex);
-
-const store = new Vuex.Store({
-  // state 中存放的就是全局共享的数据
-  state: {
-    info: {},
-    // 首页数据
-    homeData: {},
-    // 评估详情页面类型
-    type: "",
-    //分户评估id
-    id: "",
-    isConfirmReload: false
-  },
-  mutations: {
-    getData: (state, data) => {
-      state.info = data;
-    },
-    // 首页数据
-    getHomeData: (state, data) => {
-      state.homeData = data;
-    },
-    setType: (state, data) => {
-      state.type = data;
-    },
-    // 设置分户评估id
-    setFhpgId: (state, id) => {
-      state.id = id;
-    },
-    aa: (state, data) => {
-      state.isConfirmReload = data;
-    }
-  },
-  actions: {
-    // 评估详情页面数据
-    GET_DATA: ({ commit }, data) => {
-      commit("getData", data);
-    },
-    // 首页数据
-    GET_HOMEDATA: ({ commit }, data) => {
-      commit("getHomeData", data);
-    },
-    // 设置评估详情页面类型
-    SET_TYPE: ({ commit }, type) => {
-      commit("setType", type);
-    },
-    // 设置分户评估id
-    SET_FHPGID: ({ commit }, id) => {
-      commit("setFhpgId", id);
-    },
-    AA: ({ commit }, val) => {
-      commit("aa", val);
-    }
-  }
-});
-
-export default store;

FrontCode2/sunshine_levy/src/views/index.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="container">
-    <!-- v-loading="loading" -->
-    <!-- element-loading-text="页面加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="#c9c0c0" -->
     <div class="topBox">
       <div class="olderVersion">
         <div class="titleBox">被征收人信息查询</div>
@@ -97,7 +93,7 @@
         <!-- 分户评估结果部分 -->
         <div class="assess">
           <van-image :src="require('@/assets/img/assess_1.png')" />
-          <span>分户评估结果</span>
+          <span>分户评估报告</span>
           <i></i>
           <div class="absolute1" v-on:click="absolute1_click($event)"></div>
         </div>
@@ -123,6 +119,10 @@
               >¥{{ assess.countValue }}</span
             >
           </div>
+          <div>
+            <span>评估公司：</span>
+            <span>{{ assess.EvaluationCompany }}</span>
+          </div>
         </div>
         <!-- 补偿协议部分 -->
         <div class="assess2">
@@ -133,7 +133,7 @@
         </div>
         <div
           :key="protocol.id"
-          @click="toAgreement(protocol.id)"
+          @click="toAgreement(item.prjId)"
           class="assessCenter2"
           v-for="protocol in item.bcxyList"
         >
@@ -159,6 +159,10 @@
               >¥{{ protocol.summationShouldCompensateMoney }}</span
             >
           </div>
+          <div>
+            <span>合计安置面积：</span>
+            <span>{{ protocol.TotalAllocationArea }}</span>
+          </div>
         </div>
       </div>
     </div>
@@ -219,9 +223,9 @@ export default {
         userName: "加载中...",
         policiesRegulationsLists: {
           totalCount: 0,
-          list: [],
-        },
-      },
+          list: []
+        }
+      }
     };
   },
   created() {
@@ -249,13 +253,13 @@ export default {
     //debugger;
     if (from.name == "final" && to.name == "index") {
       ZWJSBridge.close()
-        .then((result) => {
+        .then(result => {
           console.log(
             "1201-index页面的close回调3--form-to:" + from.name + "->" + to.name
           );
           console.log(result);
         })
-        .catch((error) => {
+        .catch(error => {
           console.log(
             "1201-index页面的close回调异常4--form-to:" +
               from.name +
@@ -283,11 +287,12 @@ export default {
         type: "POST",
         data: {
           ticket:
-            this.$route.query.ticket || window.sessionStorage.getItem("ticket"),
+            this.$route.query.ticket || window.sessionStorage.getItem("ticket")
         },
         appKey: "es4b8zmz+2001833218+dehllx",
-        onSuccess: (data) => {
+        onSuccess: data => {
           this.loading = false;
+
           window.sessionStorage.setItem("homeData", JSON.stringify(data));
           if (data.data.success) {
             this.data = data.data.data;
@@ -301,7 +306,7 @@ export default {
                 message: "登录超时，请重新登录",
                 duration: 3000,
                 type: "info",
-                center: true,
+                center: true
               });
               setTimeout(() => {
                 window.location.replace(
@@ -313,20 +318,20 @@ export default {
                 message: "请求出错",
                 duration: 3000,
                 type: "error",
-                center: true,
+                center: true
               });
             }
           }
         },
-        onFail: (err) => {
+        onFail: err => {
           this.loading = false;
           this.$notify({
             title: "错误",
             message: "请求失败",
             duration: 3000,
-            type: "error",
+            type: "error"
           });
-        },
+        }
       });
     },
     toOlderMode() {
@@ -356,8 +361,8 @@ export default {
       this.$router.push({
         name: "projectSelect",
         params: {
-          type: type,
-        },
+          type: type
+        }
       });
     },
     // 直接跳转分户评估结果页面
@@ -368,8 +373,8 @@ export default {
         name: "evaluatePage",
         params: {
           fhpgId: id,
-          type,
-        },
+          type
+        }
       });
     },
     // 直接跳转协议结果pdf
@@ -377,10 +382,10 @@ export default {
       $(".logout").css("display", "block");
       $("#app").removeClass("old_app3");
       this.$router.push({
-        name: "showPdf",
+        name: "reportAgreement",
         params: {
-          id,
-        },
+          prjId: id
+        }
       });
     },
     // 加载项目数统计信息
@@ -395,38 +400,38 @@ export default {
       $("#app").removeClass("old_app3");
       this.$router.push({
         name: "policyInfo",
-        params: { id },
+        params: { id }
       });
     },
     setZwUserAplus(Userid, userName) {
       // 设置用户信息埋点
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_hold", "BLOCK"],
+        arguments: ["_hold", "BLOCK"]
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_user_nick", userName], // this.userInfoData.username],
+        arguments: ["_user_nick", userName] // this.userInfoData.username],
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_user_id", Userid],
+        arguments: ["_user_id", Userid]
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_hold", "START"],
+        arguments: ["_hold", "START"]
       });
     },
     setLocationAplus() {
       ZWJSBridge.onReady(() => {
         // console.log("初始化完成后，执行bridge方法");
         ZWJSBridge.getUserType()
-          .then((result1) => {
+          .then(result1 => {
             // console.log("getUserType():" + JSON.stringify(result1));
             // console.log("result1.userType:" + result1.userType);
             //经纬度
             ZWJSBridge.getLocation()
-              .then((result2) => {
+              .then(result2 => {
                 // console.log("getLocation():" + JSON.stringify(result2));
                 // console.log("result2.longitude:" + result2.longitude);
                 // console.log("result2.latitude:" + result2.latitude);
@@ -434,7 +439,7 @@ export default {
                   action: "aplus.sendPV",
                   arguments: [
                     {
-                      is_auto: false,
+                      is_auto: false
                     },
                     {
                       isMini: true,
@@ -442,16 +447,16 @@ export default {
                       miniAppName: "房屋征收",
                       long: result2.longitude,
                       lati: result2.latitude,
-                      userType: result1.userType,
-                    },
-                  ],
+                      userType: result1.userType
+                    }
+                  ]
                 });
               })
-              .catch((error) => {
+              .catch(error => {
                 // console.log(error);
               });
           })
-          .catch((error) => {
+          .catch(error => {
             // console.log(error);
           });
       });
@@ -460,7 +465,7 @@ export default {
       //this.$router.push("http://localhost:8080/#/");
       //扫一扫
       ZWJSBridge.scan({ type: "qrCode" })
-        .then((data) => {
+        .then(data => {
           // data =>{"text" : "扫描到的内容"}
           if (data.text.indexOf("http") > -1) {
             window.location.replace(data.text);
@@ -469,11 +474,11 @@ export default {
               message: data.text,
               duration: 3000,
               type: "info",
-              center: true,
+              center: true
             });
           }
         })
-        .catch((error) => {
+        .catch(error => {
           console.log(error);
         });
     },
@@ -568,93 +573,8 @@ export default {
           .find("i")
           .css("transform", "rotate(-45deg)");
       }
-    },
-    /**
-     * @项目折叠与隐藏
-     */
-
-    setDisplay() {
-      $(".absolute").click((e) => {
-        if (
-          $(e.target.parentNode.parentNode)
-            .find(".projectCenter")
-            .css("display") == "none"
-        ) {
-          $(e.target.parentNode.parentNode)
-            .find(".projectCenter")
-            .css("display", "block");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
-        } else {
-          $(e.target.parentNode.parentNode)
-            .find(".projectCenter")
-            .css("display", "none");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
-        }
-      });
-
-      $(".absolute0").click((e) => {
-        if (
-          $(e.target.parentNode.parentNode.parentNode)
-            .find(".projectCenter")
-            .css("display") == "none"
-        ) {
-          $(e.target.parentNode.parentNode.parentNode)
-            .find(".projectCenter")
-            .css("display", "block");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
-        } else {
-          $(e.target.parentNode.parentNode.parentNode)
-            .find(".projectCenter")
-            .css("display", "none");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
-        }
-      });
-
-      $(".absolute1").click((e) => {
-        if (
-          $(e.target.parentNode.parentNode)
-            .find(".assessCenter1")
-            .css("display") == "none"
-        ) {
-          $(e.target.parentNode.parentNode)
-            .find(".assessCenter1")
-            .css("display", "block");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
-        } else {
-          $(e.target.parentNode.parentNode)
-            .find(".assessCenter1")
-            .css("display", "none");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
-        }
-      });
-
-      $(".absolute2").click((e) => {
-        if (
-          $(e.target.parentNode.parentNode)
-            .find(".assessCenter2")
-            .css("display") == "none"
-        ) {
-          $(e.target.parentNode.parentNode)
-            .find(".assessCenter2")
-            .css("display", "block");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
-        } else {
-          $(e.target.parentNode.parentNode)
-            .find(".assessCenter2")
-            .css("display", "none");
-
-          $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
-        }
-      });
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -886,7 +806,6 @@ export default {
       width: 24px;
       height: 24px;
       margin-right: 10px;
-      background: #2468f2;
     }
     span {
       font-family: PingFangSC-Regular, PingFang SC;
@@ -935,6 +854,9 @@ export default {
     > :nth-child(2) {
       margin: 15px 0;
     }
+    > :nth-child(3) {
+      margin: 15px 0;
+    }
   }
   .assess2 {
     display: flex;
@@ -946,7 +868,6 @@ export default {
       width: 24px;
       height: 24px;
       margin-right: 10px;
-      background: #2468f2;
     }
     span {
       font-size: 16px;

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

@@ -37,16 +37,18 @@
           <b class="red">{{ item.summationShouldCompensateMoney }}</b>
           <b>元</b>
         </div>
+        <div>
+          <img alt src="@/assets/img/area.png" />
+          <span>合计安置面积</span>
+          <b>{{ item.TotalAllocationArea }}</b>
+        </div>
         <div class="line">
           <img alt src="@/assets/img/hengxian.png" />
         </div>
         <div class="smallBox">
-          <div class="flex backgroundColor">
-            <img alt src="@/assets/img/shijian.png" />
-            <span>签订日期：{{ item.signTime }}</span>
-          </div>
-
-          <span @click="showPdf(item.id)">查看协议附件</span>
+          <el-button type="primary" @click="showPdf(item.id)"
+            >查看协议附件</el-button
+          >
         </div>
       </el-card>
     </div>
@@ -180,38 +182,12 @@ export default {
           height: 2px;
         }
       }
-      .flex {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        overflow: hidden;
-        height: 20px;
-        img {
-          margin-right: 10px;
-          height: 100%;
-        }
-      }
-      .backgroundColor {
-        background-color: #e3ebfd;
-        overflow: hidden;
-        span {
-          color: #688bf3;
-          padding-right: 10px;
-          white-space: nowrap;
-        }
-      }
 
       .smallBox {
-        display: flex;
-        flex-direction: column;
         height: auto;
-
-        > :nth-child(2) {
-          text-align: center;
-          margin-top: 10px;
-          padding: 2px 5px;
-          color: #3c70dd;
-          border: 1px solid #2d6df2;
+        .el-button {
+          font-size: 16px;
+          margin: 0 auto;
         }
       }
     }

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

@@ -12,14 +12,14 @@
           <img src="@/assets/img/houseLocation.png" alt="" />
           <span>被征收房屋座落:</span>
         </div>
-        <span>({{ info.houseAddress }})</span>
+        <span>{{ info.houseAddress }}</span>
       </div>
       <div>
         <div>
           <img src="@/assets/img/evaluateType.png" alt="" />
           <span>评估方式:</span>
         </div>
-        <span>({{ info.valuationMethodText }})</span>
+        <span>{{ info.valuationMethodText }}</span>
       </div>
       <div class="evaluateNumber">
         <div>
@@ -48,16 +48,20 @@
         <span>{{ info.decorateAssessedValue }}元</span>
       </div>
       <div>
+        <span>评估公司:</span>
+        <span>{{ info.EvaluationCompany }}</span>
+      </div>
+      <!-- <div>
         <span>超容积率土地补偿费:</span>
-        <div>({{ info.exceedLandMoney }})</div>
+        <div>{{ info.exceedLandMoney }}</div>
       </div>
       <div>
         <span>阁楼补偿费:</span>
-        <div>({{ info.atticAssessedValue }})</div>
-      </div>
+        <div>{{ info.atticAssessedValue }}</div>
+      </div> -->
       <div>
         <span>备注:</span>
-        <div>({{ info.remark }})</div>
+        <div>{{ info.remark }}</div>
       </div>
     </el-card>
     <div class="bottom">

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

@@ -40,18 +40,10 @@
             <b class="red">{{ item.countValue }}</b
             ><b>元</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>
+            <img alt src="@/assets/img/company.png" />
+            <span> 评估公司</span>
+            <b>{{ item.EvaluationCompany }}</b>
           </div>
         </el-card>
       </div>
@@ -92,18 +84,10 @@
             <b class="red">{{ item.countValue }}</b
             ><b>元</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>
+            <img alt src="@/assets/img/company.png" />
+            <span> 评估公司</span>
+            <b>{{ item.EvaluationCompany }}</b>
           </div>
         </el-card>
       </div>
@@ -277,26 +261,6 @@ export default {
           height: 2px;
         }
       }
-      .content {
-        display: flex;
-        justify-content: space-between;
-        > div {
-          display: flex;
-          align-items: center;
-        }
-        .backgroundColor {
-          background-color: #e3ebfd;
-          img {
-            margin-right: 4px;
-            width: 20px;
-          }
-          span {
-            padding-right: 10px;
-            font-size: 12px;
-            color: #3876f3;
-          }
-        }
-      }
     }
   }
 }

FrontCode2/sunshine_levy/src/views/test.vue

@@ -98,7 +98,7 @@
         <!-- 分户评估结果部分 -->
         <div class="assess">
           <van-image :src="require('@/assets/img/assess_1.png')" />
-          <span>分户评估结果</span>
+          <span>分户评估报告</span>
           <i></i>
 
           <div class="absolute1"></div>
@@ -125,6 +125,10 @@
               >¥{{ assess.countValue }}</span
             >
           </div>
+          <div>
+            <span>评估公司：</span>
+            <span>{{ assess.EvaluationCompany }}</span>
+          </div>
         </div>
         <!-- 补偿协议部分 -->
         <div class="assess2">
@@ -135,7 +139,7 @@
         </div>
         <div
           :key="protocol.id"
-          @click="toAgreement(protocol.id)"
+          @click="toAgreement(item.prjId)"
           class="assessCenter2"
           v-for="protocol in item.bcxyList"
         >
@@ -161,6 +165,10 @@
               >¥{{ protocol.summationShouldCompensateMoney }}</span
             >
           </div>
+          <div>
+            <span>合计安置面积：</span>
+            <span>{{ protocol.TotalAllocationArea }}</span>
+          </div>
         </div>
       </div>
     </div>
@@ -417,7 +425,8 @@ export default {
       }
     };
     // debugger;
-    this.data = a.data.data;
+    // this.data = a.data.data;
+    this.onInit();
     $(".logout").css("display", "none");
     if (sessionStorage.getItem("mode") == "older") {
       changeStyle();
@@ -448,6 +457,7 @@ export default {
         },
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
+          console.log("mm", data);
           this.loading = false;
           window.sessionStorage.setItem("homeData", JSON.stringify(data));
           if (data.data.success) {
@@ -538,9 +548,9 @@ export default {
       $(".logout").css("display", "block");
       $("#app").removeClass("old_app3");
       this.$router.push({
-        name: "showPdf",
+        name: "reportAgreement",
         params: {
-          id
+          prjId: id
         }
       });
     },
@@ -645,6 +655,7 @@ export default {
 
     setDisplay() {
       $(".absolute").click(e => {
+        console.log(e);
         if (
           $(e.target.parentNode.parentNode)
             .find(".projectCenter")
@@ -974,7 +985,6 @@ export default {
       width: 24px;
       height: 24px;
       margin-right: 10px;
-      background: #2468f2;
     }
     span {
       font-family: PingFangSC-Regular, PingFang SC;
@@ -1023,6 +1033,9 @@ export default {
     > :nth-child(2) {
       margin: 15px 0;
     }
+    > :nth-child(3) {
+      margin: 15px 0;
+    }
   }
   .assess2 {
     display: flex;
@@ -1034,7 +1047,6 @@ export default {
       width: 24px;
       height: 24px;
       margin-right: 10px;
-      background: #2468f2;
     }
     span {
       font-size: 16px;