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

FrontCode2/sunshine_levy/src/views/index.vue

@@ -54,8 +54,8 @@
           <!-- window图标 -->
           <div>
             <div class="projectIcon">
-              <van-image
+              <img
-                :src="require('@/assets/img/project.png')"
+                src="@/assets/img/project.png"
                 style="width: 25px;height: 25px;"
               />
             </div>
@@ -293,7 +293,30 @@ export default {
         },
         prjList: [
           {
-            name: "无数据",
+            name: "请求出错暂时没有可用数据",
+            currentState: "无数据",
+            area: "无数据",
+            zsbm: "无数据",
+            year: "无数据",
+            zsjdh: "无数据",
+            fhpgList: [
+              {
+                assessmentNo: "无数据",
+                houseAddress: "无数据",
+                countValue: "无数据"
+              }
+            ],
+            bcxyList: [
+              {
+                xyNo: "无数据",
+                houseAddress: "无数据",
+                switchProductionWay: "无数据",
+                summationShouldCompensateMoney: "无数据"
+              }
+            ]
+          },
+          {
+            name: "请求出错",
             currentState: "无数据",
             area: "无数据",
             zsbm: "无数据",
@@ -403,7 +426,7 @@ export default {
     pageJump(id) {
       this.$router.push({
         name: "policyInfo",
-        params: { ticket: window.sessionStorage.getItem("ticket"), id: id }
+        params: { id }
       });
     },
     setZwUserAplus(Userid, userName) {
@@ -581,6 +604,7 @@ export default {
   span {
     white-space: nowrap;
     overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 
@@ -588,7 +612,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 50px;
+  padding: 0 8px;
   height: 100%;
   margin-right: 10px;
   border-radius: 5px 0 0;
@@ -601,9 +625,6 @@ export default {
   font-family: PingFangSC-Semibold, PingFang SC;
   font-size: 16px;
   font-weight: 600;
-  line-height: 20px;
-  height: 20px;
-  vertical-align: middle;
   color: #fff;
 }
 

FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div class="title">{{ info.title }}</div>
-    <div class="date">{{ info.publicTime }}</div>
+    <div class="date">{{ modifyDate(info.publicTime) }}</div>
     <hr />
     <div class="content"></div>
     <div class="bottomContent">
@@ -24,18 +24,22 @@ export default {
   methods: {
     // 获取数据
     getData() {
+      if (this.$route.params.id) {
+        window.sessionStorage.setItem("zszcId", this.$route.params.id);
+      }
       mgop({
         api: "mgop.kykj.houseexpropriat.getpoliciesinfo",
         host: "https://mapi.zjzwfw.gov.cn/",
         dataType: "JSON",
         type: "POST",
         data: {
-          ticket: this.$route.params.ticket,
+          ticket: window.sessionStorage.getItem("ticket"),
-          id: this.$route.params.id
+          id: window.sessionStorage.getItem("zszcId")
         },
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
           const { data: res } = data;
+          console.log("res.data", res.data);
           this.info = res.data;
           let content = document.querySelector(".content");
           content.innerHTML = res.data.contents;
@@ -44,6 +48,9 @@ export default {
           console.log("错误信息", err);
         }
       });
+    },
+    modifyDate(date) {
+      return (date + "").substr(0, 10);
     }
   }
 };

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

@@ -70,7 +70,7 @@ export default {
               xyNo: "无数据",
               switchProductionWay: "无数据",
               countValue: "无数据",
-              signTime: "无数据"
+              signTime: "2021-9-28 10:07:24 aaaaaaaaaaa"
             }
           ],
           fhpgList: [{ countValue: "无数据", assessmentNo: "无数据" }]
@@ -165,6 +165,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        overflow: hidden;
         > div {
           height: 100%;
         }
@@ -175,8 +176,10 @@ export default {
       }
       .backgroundColor {
         background-color: #e3ebfd;
+        overflow: hidden;
         span {
           padding-right: 10px;
+          white-space: nowrap;
         }
       }
     }

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

@@ -76,7 +76,7 @@ export default {
     return {
       loading: true,
       info: {
-        houseAddress: "地址",
+        houseAddress: "宁波市档案管理和数据中心百丈东路口",
         valuationMethodText: "价值录入",
         assessmentNo: "无数据",
         number: "0001",
@@ -133,7 +133,11 @@ export default {
             const { data: res } = data.data;
             this.info = res;
           } else {
-            return;
+            this.loading = false;
+            this.$notify({
+              message: "请求出错",
+              duration: 3000
+            });
           }
         },
         onFail: err => {
@@ -164,7 +168,6 @@ export default {
   .top {
     background-color: #eff2fa;
     padding: 10px 26px 10px 16px;
-    // height: 500px;
     .evaluateNumber {
       > span {
         color: #3da4fc;
@@ -176,11 +179,15 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      > span {
+        max-width: 50%;
+      }
       > div {
         display: flex;
         align-items: center;
         height: 100%;
         width: 50%;
+
         img {
           height: 100%;
           margin-right: 10px;

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

@@ -66,7 +66,7 @@
       @click="pageJump()"
     >
       <div v-if="item.type == '2'">
-        <el-card body-style="padding:10px">
+        <el-card body-style="padding:4px">
           <div class="absolute" style="background-color:#268FF2">
             <span>商业</span>
           </div>
@@ -115,7 +115,6 @@
 <script>
 import { SetProjectId } from "@/common/util/tools";
 import $ from "jquery";
-import { mgop } from "@aligov/jssdk-mgop";
 export default {
   data() {
     return {
@@ -125,9 +124,9 @@ export default {
           fhpgList: [
             {
               assessmentNo: "无数据",
-              houseAddress: "无数据",
+              houseAddress: "宁波市档案管理和数据中心百丈东路口",
               countValue: "无数据",
-              type: "2",
+              type: "1",
               createUserName: "无数据",
               createTime: "无数据"
             }
@@ -215,7 +214,6 @@ export default {
     .el-card__body {
       > div {
         margin: 14px 0;
-        // line-height: 20px;
         display: flex;
         align-items: center;
         img {
@@ -224,6 +222,7 @@ export default {
         }
         b {
           font-size: 14px;
+          max-width: 50%;
         }
       }
       .absolute {