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

FrontCode2/sunshine_levy/src/views/home.css

@@ -74,15 +74,22 @@
   background: rgba(255, 255, 255, .28);
 }
 .gridImg {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+
   width: 90px;
   height: 80px;
   margin: 12px 6px;
+  padding-top: 5px;
 
-  opacity: 1;
+  border-radius: 10px;
+}
+.gridImgBg {
+  width: 38px;
+  height: 35px;
 }
-/* .gridImg:hover {
-  opacity: 1;
-} */
 .bigImg {
   width: 100%;
   height: 91px;
@@ -101,12 +108,15 @@
   background-size: 100% 41px;
 }
 .projectIcon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
   width: 40px;
-  height: 39px;
+  height: 40px;
+  margin-right: 10px;
 
-  vertical-align: middle;
+  border-radius: 5px 0 0;
-
-  border-radius: 5px 0 0 0;
   background: #3284cd;
 }
 .projectTitle {
@@ -126,7 +136,6 @@
   display: flex;
   align-items: center;
 
-  width: 95px;
   height: 27px;
 
   opacity: .82;
@@ -136,10 +145,11 @@
 .projectRightFont {
   font-family: PingFangSC-Semibold,
   PingFang SC;
-  font-size: 10px;
+  font-size: 12px;
-  font-weight: 600;
   line-height: 14px;
 
+  padding-right: 5px;
+
   color: #fff;
 }
 .projectRightIcon {

FrontCode2/sunshine_levy/src/views/index.vue

@@ -26,20 +26,35 @@
         <!-- 三张背景图 -->
         <div>
           <div class="gridBg centerMagin">
-            <van-image
+            <div class="gridImg" style="background:#1897FB;">
-              :src="require('@/assets/img/scan.png')"
+              <van-image
-              class="gridImg"
+                :src="require('@/assets/img/scan.png')"
-            />
+                class="gridImgBg"
-            <van-image
+              />
-              :src="require('@/assets/img/evaluation.png')"
+              <span class="baseFont" style="padding-top: 5px;">扫一扫</span>
+            </div>
+            <div
               @click="gotoProject('pg')"
               class="gridImg"
-            />
+              style="background:#F1AE4B;"
-            <van-image
+            >
-              :src="require('@/assets/img/compensation.png')"
+              <van-image
+                :src="require('@/assets/img/evaluation.png')"
+                class="gridImgBg"
+              />
+              <span class="baseFont" style="padding-top: 5px;">查评估结果</span>
+            </div>
+            <div
               @click="gotoProject('xy')"
               class="gridImg"
-            />
+              style="background:#16D7ED;"
+            >
+              <van-image
+                :src="require('@/assets/img/compensation.png')"
+                class="gridImgBg"
+              />
+              <span class="baseFont" style="padding-top: 5px;">查补偿协议</span>
+            </div>
           </div>
         </div>
       </div>
@@ -56,11 +71,13 @@
             <!-- 图标所在行 -->
             <div class="project">
               <!-- window图标 -->
-              <div>
+              <div style="display: flex;align-items: center;">
-                <van-image
+                <div class="projectIcon">
-                  :src="require('@/assets/img/project.png')"
+                  <van-image
-                  class="projectIcon"
+                    :src="require('@/assets/img/project.png')"
-                />
+                    style="width: 25px;height: 25px;"
+                  />
+                </div>
                 <span class="projectTitle">{{ item.name }}</span>
               </div>
               <!-- 补偿协议图标 -->
@@ -114,9 +131,9 @@
                     class="projectCenterImg"
                   />
                   <span class="projectCenterFont">征收决定号：</span>
-                  <span class="projectCenterFont" style="color: #3883f1">{{
+                  <span class="projectCenterFont" style="color: #3883f1">
-                    item.zsjdh
+                    {{ item.zsjdh }}
-                  }}</span>
+                  </span>
                 </div>
               </div>
             </div>
@@ -135,23 +152,23 @@
               <van-list>
                 <div
                   :key="assess.id"
+                  @click="gotoProject('pg', item.prjId)"
                   class="assessCenter1"
                   v-for="assess in item.fhpgList"
-                  @click="gotoProject('pg', item.prjId)"
                 >
                   <div class="assessBox">
                     <span class="projectCenterFont">评估报告编号：</span>
-                    <span class="projectCenterFont">
+                    <span class="projectCenterFont">{{
-                      {{ assess.assessmentNo }}
+                      assess.assessmentNo
-                    </span>
+                    }}</span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont" style="width: 40%"
                       >被征收房屋地址：</span
                     >
-                    <span class="projectCenterFont protocolTitle">{{
+                    <span class="projectCenterFont protocolTitle">
-                      assess.houseAddress
+                      {{ assess.houseAddress }}
-                    }}</span>
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">评估总金额：</span>
@@ -178,9 +195,9 @@
               <van-list>
                 <div
                   :key="protocol.id"
+                  @click="gotoProject('xy', item.prjId)"
                   class="assessCenter2"
                   v-for="protocol in item.bcxyList"
-                  @click="gotoProject('xy', item.prjId)"
                 >
                   <div class="assessBox">
                     <span class="projectCenterFont">协议编号：</span>
@@ -190,15 +207,15 @@
                     <span class="projectCenterFont" style="width: 40%"
                       >被征收房屋地址：</span
                     >
-                    <span class="projectCenterFont protocolTitle">{{
+                    <span class="projectCenterFont protocolTitle">
-                      protocol.houseAddress
+                      {{ protocol.houseAddress }}
-                    }}</span>
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">补偿方式：</span>
-                    <span class="projectCenterFont">{{
+                    <span class="projectCenterFont">
-                      protocol.switchProductionWay
+                      {{ protocol.switchProductionWay }}
-                    }}</span>
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">合计补偿资金：</span>
@@ -234,9 +251,9 @@
           <van-list>
             <div
               :key="item.id"
+              @click="pageJump(item.id)"
               class="protocolList"
               v-for="(item, i) in data.policiesRegulationsLists.list"
-              @click="pageJump(item.id)"
             >
               <!-- 非最后一行 -->
               <div
@@ -299,7 +316,7 @@ export default {
           totalCount: 0
         }
       },
-      ticket: "8a1189377bdad67c017bf66039d76376-ticket"
+      ticket: "8a11885a7bda783f017bf73e5e095219-ticket"
     };
   },
   async created() {
@@ -328,7 +345,7 @@ export default {
             this.setZwUserAplus(this.data.idCard, this.data.userName);
           } else {
             var errorCodes = [6001, 6501];
-            // 跳转到政务系统
+            // 跳转到政务系统;
             if (errorCodes.indexOf(data.data.bizCode) > -1) {
               window.location.replace(
                 "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs"
@@ -362,7 +379,7 @@ export default {
     pageJump(id) {
       this.$router.push({
         name: "policyInfo",
-        params: { ticket: this.ticket, id: id },
+        params: { ticket: this.ticket, id: id }
       });
     },
     setZwUserAplus(Userid, userName) {
@@ -388,12 +405,12 @@ export default {
       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);

FrontCode2/sunshine_levy/src/views/pdf/agreementInfo.vue

@@ -0,0 +1,137 @@
+<template>
+  <div>
+    <div ref="content" class="content">
+      <!-- <pdf :src="url" class="PDF"></pdf> -->
+    </div>
+    <div class="bottom">
+      <a href="" download="">
+        <el-button type="primary">保存到相册</el-button>
+      </a>
+    </div>
+    <iframe
+      src="https://zsxt.nbzs.org.cn/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/80616f98-da17-49bc-92d0-b87199963787.pdf"
+      frameborder="0"
+    ></iframe>
+    <!-- <el-button type="primary" @click="this.savePdf()">测试2</el-button>
+    <el-button type="primary" @click="this.handlePrint()">测试3</el-button>
+    <el-button type="primary" @click="testdownload4()">测试4</el-button>
+    <div id="nav">222</div> -->
+  </div>
+</template>
+
+<script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.js"></script>
+<script>
+import pdf from "vue-pdf";
+import $ from "jquery";
+import html2canvas from "html2canvas";
+// import axios from "axios";
+import request from "@/common/util";
+import { mgop } from "@aligov/jssdk-mgop";
+export default {
+  components: {
+    pdf
+  },
+  data() {
+    return {
+      url: ""
+    };
+  },
+  created() {
+    this.onInit();
+  },
+  mounted() {
+    // 截图
+    // html2canvas(this.$refs.PDF).then(canvas => {
+    //   canvas.id = "mycanvas";
+    //   const base64 = canvas.toDataURL("image/png");
+    //   jquery("a").prop("href", base64);
+    // });
+  },
+  methods: {
+    onInit() {
+      this.onLoadData();
+      request({
+        url: "http://10.19.94.9:7099/api/agreement/info",
+        method: "post",
+        data: {
+          ticket: window.sessionStorage.getItem("ticket"),
+          id: "C655515B-FD91-48F2-BD79-EAABAFB7077C"
+        },
+        headers: { "Content-Type": "application/json; charset=UTF-8" },
+        responseType: "arraybuffer" //一定要设置响应类型，否则页面会是空白pdf
+      }).then(result => {
+        console.log("请求成功了", result);
+        const binaryData = [];
+        binaryData.push(result.data);
+        //获取blob链接
+        this.url = window.URL.createObjectURL(
+          new Blob(binaryData, { type: "application/pdf" })
+        );
+        $("a").prop("href", this.url);
+        // if (pdfUrl) {
+        //   this.handlePrint(pdfUrl);
+        // }
+      });
+    },
+    handlePrint() {
+      if (document.getElementById("print-iframe")) {
+        document.body.removeChild(document.getElementById("print-iframe"));
+      }
+      //判断iframe是否存在，不存在则创建iframe
+      let iframe = document.getElementById("print-iframe");
+      if (!iframe) {
+        iframe = document.createElement("IFRAME");
+        let doc = null;
+        iframe.setAttribute("src", this.url);
+        iframe.setAttribute("id", "print-iframe");
+        document.body.appendChild(iframe);
+        doc = iframe.contentWindow.document;
+        doc.close();
+        iframe.contentWindow.focus();
+      }
+      iframe.contentWindow.print();
+    },
+    savePdf() {
+      ZWJSBridge.onReady(() => {
+        console.log("初始化完成后，执行bridge方法-savePdf");
+        ZWJSBridge.saveImage({
+          url: this.url
+        })
+          .then(result => {
+            console.log("saveImage()成功:" + JSON.stringify(result));
+          })
+          .catch(error => {
+            console.log("saveImage()失败:" + JSON.stringify(result));
+            console.log(error);
+          });
+      });
+    },
+    testdownload4() {
+      ZWJSBridge.onReady(() => {
+        console.log("初始化完成后，执行bridge方法-testdownload4");
+        ZWJSBridge.openLink({
+          url: this.url
+        })
+          .then(result => {
+            console.log("testdownload4():" + result);
+          })
+          .catch(error => {
+            console.log(error);
+          });
+      });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.content {
+  text-align: center;
+  line-height: 200px;
+  font-size: 30px;
+  margin-bottom: 20px;
+}
+.bottom {
+  text-align: center;
+  margin-bottom: 20px;
+}
+</style>

FrontCode2/sunshine_levy/src/views/pdf/pdf.vue

@@ -50,7 +50,7 @@ export default {
           id: "C655515B-FD91-48F2-BD79-EAABAFB7077C",
         },
         appKey: "es4b8zmz+2001833218+dehllx",
-        onSuccess: (result) => {
+        onSuccess: result => {
           console.log("pdf.vue页面请求pdf文件:", result);
           if (result.data && result.data.success == true) {
             console.log("result.data.data:", result.data.data);
@@ -60,9 +60,9 @@ export default {
             this.isloading = false;
           }
         },
-        onFail: (err) => {
+        onFail: err => {
           console.log("用户无数据，不展示");
-        },
+        }
       });
     },
     saveImages() {
@@ -71,10 +71,10 @@ export default {
         ZWJSBridge.saveImage({
           url: this.apidata.pdf,
         })
-          .then((result) => {
+          .then(result => {
             console.log("saveImage()成功:" + JSON.stringify(result));
           })
-          .catch((error) => {
+          .catch(error => {
             console.log("saveImage()失败:" + JSON.stringify(result));
             console.log(error);
           });
@@ -89,12 +89,12 @@ export default {
           .then((result) => {
             console.log("测试新开窗口():" + result);
           })
-          .catch((error) => {
+          .catch(error => {
             console.log(error);
           });
       });
-    },
+    }
-  },
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -103,6 +103,7 @@ export default {
   line-height: 200px;
   font-size: 30px;
   margin-bottom: 20px;
+  height: 200px;
 }
 .bottom {
   text-align: center;

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

@@ -93,6 +93,9 @@ export default {
     // 获取数据
     onInit() {
       this.type = this.$route.params.type;
+      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",
@@ -115,7 +118,8 @@ export default {
     },
     // 页面跳转
     gotoDetail(id) {
-      if (this.type == "pg") {
+      console.log("跳转了");
+      if (window.sessionStorage.getItem("type") == "pg") {
         // 评估结果页面
         this.$router.push({
           name: "evaluteResult",
@@ -124,7 +128,7 @@ export default {
             ticket: this.$route.params.ticket
           }
         });
-      } else if (this.type == "xy") {
+      } else if (window.sessionStorage.getItem("type") == "xy") {
         // 协议结果页面
         this.$router.push({
           name: "reportAgreement",

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

@@ -147,19 +147,25 @@ export default {
         margin: 14px 0;
         display: flex;
         align-items: center;
+        height: 20px;
         b {
           font-size: 14px;
         }
         img {
           margin-right: 6px;
+          height: 100%;
         }
       }
       .flex {
         display: flex;
         align-items: center;
         justify-content: center;
+        > div {
+          height: 100%;
+        }
         img {
           margin-right: 10px;
+          height: 100%;
         }
       }
       .line {