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

Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs

@@ -57,6 +57,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends
         /// 区域
         /// </summary>
         public string Area { get; set; }
+        public string Name { get; set; }
         [Newtonsoft.Json.JsonIgnore]
         public string AreaID { get; set; }
         /// <summary>

Ewide.NbzsZheliban/Service/DataService.cs

@@ -113,7 +113,7 @@ namespace Ewide.NbzsZheliban.Service
             //调查表集合
             var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
             //项目列表
-            var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
+            var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState,NAME from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
             //分户评估
             var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
             var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select   d.id,e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue,e.id dcbId,d.CreateTime,d.CreateUserName from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue,e.id dcbId,d.CreateTime,d.CreateUserName from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
@@ -198,7 +198,6 @@ namespace Ewide.NbzsZheliban.Service
             }).FirstAsync();
             return entity;
         }
-
         /// <summary>
         /// 协议详细
         /// </summary>
@@ -206,7 +205,7 @@ namespace Ewide.NbzsZheliban.Service
         /// <returns></returns>
         [HttpPost("/agreement/info")]
         [Microsoft.AspNetCore.Authorization.AllowAnonymous]
-        public IActionResult AgreementInfo([FromBody] JObject args)
+        public async Task<dynamic> AgreementInfo([FromBody] JObject args)
         {
             var ticket = args.GetJsonValue("ticket", isThrowExp: true);
             var id = args.GetJsonGuidValue("id", isThrowExp: true);
@@ -231,9 +230,44 @@ namespace Ewide.NbzsZheliban.Service
             }
             if (string.IsNullOrEmpty(XyFile))
                 throw Oops.Oh("未上传附件");
-            var filePath = App.Configuration["nbzs_file_path"] + XyFile;
+            var filePath = App.Configuration["nbzs_domain"] + XyFile;
-            return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name };
+            return filePath;
         }
+        ///// <summary>
+        ///// 协议详细
+        ///// </summary>
+        ///// <param name="args"></param>
+        ///// <returns></returns>
+        //[HttpPost("/agreement/info")]
+        //[Microsoft.AspNetCore.Authorization.AllowAnonymous]
+        //public IActionResult AgreementInfo([FromBody] JObject args)
+        //{
+        //    var ticket = args.GetJsonValue("ticket", isThrowExp: true);
+        //    var id = args.GetJsonGuidValue("id", isThrowExp: true);
+        //    JObject userInfoObj = GetInfoByTicket(ticket);
+        //    var XyFile = "";
+        //    //住宅
+        //    var entity_zz = db.Queryable<Entity.ResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
+        //    if (entity_zz != null)
+        //    {
+        //        XyFile = entity_zz.XyFile;
+        //    }
+        //    //非住宅 
+        //    else
+        //    {
+        //        var entity_fzz = db.Queryable<Entity.NonResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
+        //        if (entity_fzz != null)
+        //        {
+        //            XyFile = entity_fzz.XyFile;
+        //        }
+        //        else
+        //            throw Oops.Oh("ID错误");
+        //    }
+        //    if (string.IsNullOrEmpty(XyFile))
+        //        throw Oops.Oh("未上传附件");
+        //    var filePath = App.Configuration["nbzs_file_path"] + XyFile;
+        //    return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name };
+        //}
         /// <summary>
         /// 分布评估详细
         /// </summary>

FrontCode2/sunshine_levy/src/common/util/tools.js

@@ -1,4 +1,9 @@
 // 设置ticket
 export function SetTicket(data) {
   window.sessionStorage.setItem("ticket", data);
+}
+
+// 设置项目id
+export function SetProjectId(data) {
+  window.sessionStorage.setItem("projectId", data);
 }

FrontCode2/sunshine_levy/src/views/index.vue

@@ -53,7 +53,9 @@
       <van-list>
         <div :key="item.prjId" v-for="item in data.prjList">
           <div class="centerMagin">
+            <!-- 图标所在行 -->
             <div class="project">
+              <!-- window图标 -->
               <div>
                 <van-image
                   :src="require('@/assets/img/project.png')"
@@ -61,6 +63,7 @@
                 />
                 <span class="projectTitle">{{ item.name }}</span>
               </div>
+              <!-- 补偿协议图标 -->
               <div class="projectRight">
                 <van-image
                   :src="require('@/assets/img/menu_yhxy.png')"
@@ -70,8 +73,9 @@
               </div>
             </div>
           </div>
+          <!-- 所有内容 -->
           <div class="projectCenter centerMagin">
-            <!-- 曙光一村内容 -->
+            <!-- 项目内容 -->
             <div class="projectCenterBox">
               <div class="projectCenterInfo">
                 <div class="projectCenterInfo">
@@ -126,15 +130,14 @@
                   />
                   <span class="assessTitle">分户评估结果</span>
                 </div>
-                <!-- <div>
-                  <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
-                </div>-->
               </div>
+              <!-- 分户评估遍历内容 -->
               <van-list>
                 <div
                   :key="assess.id"
                   class="assessCenter1"
                   v-for="assess in item.fhpgList"
+                  @click="gotoProject('pg', item.prjId)"
                 >
                   <div class="assessBox">
                     <span class="projectCenterFont">评估报告编号：</span>
@@ -171,11 +174,13 @@
                   <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
                 </div>-->
               </div>
+              <!-- 补偿协议遍历内容 -->
               <van-list>
                 <div
                   :key="protocol.id"
                   class="assessCenter2"
                   v-for="protocol in item.bcxyList"
+                  @click="gotoProject('xy', item.prjId)"
                 >
                   <div class="assessBox">
                     <span class="projectCenterFont">协议编号：</span>
@@ -225,6 +230,7 @@
       </div>
       <div class="centerMagin" style="padding-bottom: 20px">
         <div class="protocolBox">
+          <!-- 遍历内容 -->
           <van-list>
             <div
               :key="item.id"
@@ -281,6 +287,7 @@
 import "./home.css";
 import { apis } from "@/common/apis";
 import { mgop } from "@aligov/jssdk-mgop";
+import { SetTicket } from "@/common/util//tools";
 export default {
   name: "home",
   data() {
@@ -289,15 +296,17 @@ export default {
         idCard: "加载中...",
         userName: "加载中...",
         policiesRegulationsLists: {
-          totalCount: 0,
+          totalCount: 0
-        },
+        }
       },
+      ticket: "8a1189377bdad67c017bf66039d76376-ticket"
     };
   },
   async created() {
     this.onInit();
     console.log("this", this);
     this.setLocationAplus();
+    SetTicket(this.$route.query.ticket || this.ticket);
   },
   methods: {
     // 获取数据
@@ -308,11 +317,10 @@ export default {
         dataType: "JSON",
         type: "POST",
         data: {
-          ticket: this.$route.query.ticket,
+          ticket: this.$route.query.ticket || this.ticket
-          //ticket: "8a118a427bda7bed017bed084ec10622-ticket"
         },
         appKey: "es4b8zmz+2001833218+dehllx",
-        onSuccess: (data) => {
+        onSuccess: data => {
           console.log("首页数据", data);
           if (data.data && data.data.success == true) {
             this.data = data.data.data;
@@ -328,16 +336,20 @@ export default {
             } else console.log("用户无数据，不展示");
           }
         },
-        onFail: (err) => {
+        onFail: err => {
           console.log("用户无数据，不展示");
-        },
+        }
       });
     },
     // 跳转项目详情
-    gotoProject(type) {
+    gotoProject(type, id) {
       this.$router.push({
         name: "projectSelect",
-        params: { type: type, ticket: this.$route.query.ticket },
+        params: {
+          type: type,
+          ticket: this.$route.query.ticket || this.ticket,
+          prjId: id || this.data.prjList[0].prjId
+        }
       });
     },
     // 加载项目数统计信息
@@ -357,19 +369,19 @@ export default {
       // 设置用户信息埋点
       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() {
@@ -389,7 +401,7 @@ export default {
                   action: "aplus.sendPV",
                   arguments: [
                     {
-                      is_auto: false,
+                      is_auto: false
                     },
                     {
                       isMini: true,
@@ -397,20 +409,20 @@ 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);
           });
       });
-    },
+    }
-  },
+  }
 };
 </script>

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

@@ -1,22 +1,27 @@
 <template>
   <div>
-    <pdf :src="url"></pdf>
+    <div ref="content" class="content">
-    <div ref="content" class="content">被保存的内容</div>
+      <pdf :src="url" class="PDF"></pdf>
+    </div>
     <div class="bottom">
       <a href="" download="">
         <el-button type="primary">保存到相册</el-button>
       </a>
     </div>
+    <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>
 </template>
 
 <script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.js"></script>
 <script>
 import pdf from "vue-pdf";
-import jquery from "jquery";
+import $ from "jquery";
 import html2canvas from "html2canvas";
-import axios from "axios";
+// import axios from "axios";
 import request from "@/common/util";
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
   components: {
     pdf,
@@ -32,7 +37,7 @@ export default {
   },
   mounted() {
     // 截图
-    html2canvas(this.$refs.content).then((canvas) => {
+    html2canvas(this.$refs.PDF).then((canvas) => {
       canvas.id = "mycanvas";
       const base64 = canvas.toDataURL("image/png");
       jquery("a").prop("href", base64);
@@ -42,10 +47,10 @@ export default {
     onInit() {
       this.onLoadData();
       request({
-        url: "http://localhost:5566/agreement/info",
+        url: "http://10.19.94.9:7099/api/agreement/info",
         method: "post",
         data: {
-          ticket: "8a1188557bda7894017bed584f803119-ticket",
+          ticket: window.sessionStorage.getItem("ticket"),
           id: "C655515B-FD91-48F2-BD79-EAABAFB7077C",
         },
         headers: { "Content-Type": "application/json; charset=UTF-8" },
@@ -57,36 +62,43 @@ export default {
         this.url = window.URL.createObjectURL(
           new Blob(binaryData, { type: "application/pdf" })
         );
+        $("a").prop("href", this.url);
         // if (pdfUrl) {
         //   this.handlePrint(pdfUrl);
         // }
       });
-      // axios({
+      mgop({
-      //   method: "post",
+        api: "mgop.kykj.houseexpropriat.getagreementinfo",
-      //   url: "http://10.19.94.9:7099/api/agreement/info",
+        host: "https://mapi.zjzwfw.gov.cn/",
-      //   responseType: "blob",
+        dataType: "JSON",
-      //   data: {
+        type: "POST",
-      //     ticket: "8a1188557bda7894017bed584f803119-ticket",
+        data: {
-      //     id: "C655515B-FD91-48F2-BD79-EAABAFB7077C",
+          ticket: "8a1189377bdad67c017bf66039d76376-ticket",
-      //   },
+          id: "C655515B-FD91-48F2-BD79-EAABAFB7077C",
-      // }).then((res) => {
+        },
-      //   debugger;
+        appKey: "es4b8zmz+2001833218+dehllx",
-      //   console.log(res);
+        onSuccess: (result) => {
-      //   if (!res) {
+          console.log("pdf.vue页面请求pdf文件:", result);
-      //     return;
+          if (result.data && result.data.success == true) {
-      //   }
+            console.log("result.data.data:", result.data.data);
-      //   let blob = new Blob([res.data], {
+            this.url = result.data.data;
-      //     type: "application/octet-stream",
+            // const binaryData = [];
-      //   });
+            // binaryData.push(result.data);
-      //   let url = window.URL.createObjectURL(blob);
+            // //获取blob链接
-      //   let link = document.createElement("a");
+            // this.url = window.URL.createObjectURL(
-      //   link.style.display = "none";
+            //   new Blob(binaryData, { type: "application/pdf" })
-      //   link.href = url;
+            // );
-      //   document.body.appendChild(link);
+            // if (pdfUrl) {
-      //   link.click();
+            //   this.handlePrint(pdfUrl);
-      // });
+            // }
+          }
+        },
+        onFail: (err) => {
+          console.log("用户无数据，不展示");
+        },
+      });
     },
-    handlePrint(pdf) {
+    handlePrint() {
       if (document.getElementById("print-iframe")) {
         document.body.removeChild(document.getElementById("print-iframe"));
       }
@@ -95,7 +107,7 @@ export default {
       if (!iframe) {
         iframe = document.createElement("IFRAME");
         let doc = null;
-        iframe.setAttribute("src", pdf);
+        iframe.setAttribute("src", this.url);
         iframe.setAttribute("id", "print-iframe");
         document.body.appendChild(iframe);
         doc = iframe.contentWindow.document;
@@ -108,15 +120,44 @@ export default {
       // console.log(this.$route.params);
       // this.url = this.$route.params.url;
     },
+    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;
-  height: 200px;
   line-height: 200px;
   font-size: 30px;
+  margin-bottom: 20px;
 }
 .bottom {
   text-align: center;

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

@@ -32,25 +32,26 @@
       <van-list>
         <div
           :key="item.id"
-          @click="gotoDetail(item.id)"
           class="proListBox shadow"
           v-for="item in info.prjList"
         >
-          <div class="proAreaBox">
+          <div @click="gotoDetail(item.prjId)">
-            <div class="proArea">{{ item.area }}</div>
+            <div class="proAreaBox">
-            <div class="proCenterFont" v-if="item.state_cd == 1">
+              <div class="proArea">{{ item.area }}</div>
-              · {{ item.currentState }}
+              <div class="proCenterFont" v-if="item.state_cd == 1">
+                · {{ item.currentState }}
+              </div>
+              <div class="proCenterFont" style="color:#179D5C" v-else>
+                · {{ item.currentState }}
+              </div>
             </div>
-            <div class="proCenterFont" style="color:#179D5C" v-else>
+            <div class="proAreaBox">
-              · {{ item.currentState }}
+              <div class="proTitleBox">{{ item.name }}</div>
+            </div>
+            <van-divider style="margin:8px 0;" />
+            <div class="proDateBox">
+              <div>{{ item.prjId }}</div>
             </div>
-          </div>
-          <div class="proAreaBox">
-            <div class="proTitleBox">{{ item.zsbm }}</div>
-          </div>
-          <van-divider style="margin:8px 0;" />
-          <div class="proDateBox">
-            <div>{{ item.year }}</div>
           </div>
         </div>
       </van-list>
@@ -86,21 +87,23 @@ export default {
   },
   created() {
     this.onInit();
-    this.onLoadData();
   },
   methods: {
+    // 获取数据
     onInit() {
+      this.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
+          ticket:
+            this.$route.params.ticket || window.sessionStorage.getItem("ticket")
         },
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
-          console.log("首页数据", data);
           const { data: res } = data;
           this.info = res.data;
         },
@@ -109,16 +112,17 @@ export default {
         }
       });
     },
-    onLoadData() {
+    // 页面跳转
-      this.type = this.$route.params.type;
-      this.ticket = this.$route.params.ticket;
-    },
     gotoDetail(id) {
       if (this.type == "pg") {
         // 评估结果页面
         this.$router.push({
           name: "evaluteResult",
-          params: { projectid: id, type: this.type, ticket: this.ticket }
+          params: {
+            prjId: id,
+            type: this.type,
+            ticket: this.$route.params.ticket
+          }
         });
       } else if (this.type == "xy") {
         // 协议结果页面

FrontCode2/sunshine_levy/src/views/project/project.css

@@ -4,11 +4,11 @@
   display: flex;
   justify-content: space-around;
 
-  width: 95%;
+  width: 94%;
   height: 220px;
   margin: 10px;
 
-  background: url(../../assets/img/zspg.jpg);
+  background: url(../../assets/img/zspg.png);
   background-repeat: no-repeat;
   background-size: 100% 90px;
 }
@@ -18,16 +18,18 @@
   display: flex;
   justify-content: space-around;
 
-  width: 95%;
+  width: 94%;
   height: 220px;
   margin: 10px;
 
-  background: url(../../assets/img/zsxy.jpg);
+  background: url(../../assets/img/zsxy.png);
   background-repeat: no-repeat;
   background-size: 100% 90px;
 }
 .proCenterBox {
-  width: 94%;
+  overflow: hidden;
+
+  width: 95%;
   margin-top: 78px;
 
   border-radius: 6px;

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

@@ -3,13 +3,11 @@
     <div class="image">
       <img alt src="@/assets/img/agreement.png" />
     </div>
-    <div class="text">
+    <div class="text">为您查询到{{ prjListLength }}条结果</div>
-      为您查询到{{ this.info.prjList[0].bcxyList.length }}条结果
-    </div>
     <div
       :key="index"
       @click="showPdf(item.url)"
-      v-for="(item, index) in info.prjList[0].bcxyList"
+      v-for="(item, index) in prjList.bcxyList"
     >
       <el-card body-style="padding:10px 10px 0">
         <div>
@@ -30,7 +28,7 @@
         <div>
           <img alt src="@/assets/img/money.png" />
           评估总金额：
-          <b style="color: red">{{ info.prjList[0].fhpgList[0].countValue }}</b>
+          <b style="color: red">{{ item.countValue }}</b>
         </div>
         <div>
           <img alt src="@/assets/img/money.png" />
@@ -43,7 +41,7 @@
         <div class="flex">
           <div class="flex backgroundColor">
             <img alt src="@/assets/img/shijian.png" />
-            <span>签订日期：{{ item.date }}</span>
+            <span>签订日期：{{ item.signTime }}</span>
           </div>
         </div>
       </el-card>
@@ -52,6 +50,7 @@
 </template>
 <script>
 import { mgop } from "@aligov/jssdk-mgop";
+import { SetProjectId } from "@/common/util/tools";
 export default {
   data() {
     return {
@@ -70,37 +69,49 @@ export default {
             fhpgList: [{ countValue: "无数据", assessmentNo: "无数据" }]
           }
         ]
-      }
+      },
+      prjList: [],
+      prjListLength: ""
     };
   },
   created() {
     this.onInit();
-    mgop({
-      api: "mgop.kykj.houseexpropriat.getprjlist",
-      host: "https://mapi.zjzwfw.gov.cn/",
-      dataType: "JSON",
-      type: "POST",
-      data: {
-        ticket: this.$route.params.ticket
-      },
-      appKey: "es4b8zmz+2001833218+dehllx",
-      onSuccess: data => {
-        const { data: res } = data.data;
-        console.log("res", res);
-        this.info = res;
-      },
-      onFail: err => {
-        console.log("用户无数据，不展示");
-      }
-    });
   },
   methods: {
     onInit() {
-      this.onLoadData();
-    },
-    onLoadData() {
-      console.log(this.$route.params);
       this.type = this.$route.params.type;
+      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;
+          console.log("res", res);
+          this.info = res;
+          const prjList = res.prjList.find((item, index) => {
+            return (
+              item.prjId ==
+              (this.$route.params.prjId ||
+                window.sessionStorage.getItem("projectId"))
+            );
+          });
+          console.log("协议", prjList);
+          this.prjList = prjList;
+          this.prjListLength = prjList.bcxyList.length;
+        },
+        onFail: err => {
+          console.log("用户无数据，不展示");
+        }
+      });
     },
     showPdf(url) {
       url = "";

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

@@ -1,152 +0,0 @@
-<template>
-  <div class="container">
-    <div class="image">
-      <img alt src="@/assets/img/evalute.png" />
-    </div>
-    <div class="text">为您查询到{{ this.result }}条结果</div>
-    <div :key="index" v-for="(item, index) in info" @click="pageJump()">
-      <el-card body-style="padding:10px">
-        <div>
-          <img alt src="@/assets/img/bianhao.png" />
-          评估报告编号：
-          <b>{{ item.number }}</b>
-        </div>
-        <div>
-          <img alt src="@/assets/img/name.png" />
-          被征收人姓名：
-          <b>{{ item.name }}</b>
-        </div>
-        <div>
-          <img alt src="@/assets/img/address.png" />
-          被征收人房屋地址：
-          <b>{{ item.address }}</b>
-        </div>
-        <div>
-          <img alt src="@/assets/img/money.png" />
-          评估总金额：
-          <b style="color: red">{{ item.money }}</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.person }}</span>
-          </div>
-          <div class="backgroundColor">
-            <img alt src="@/assets/img/shijian.png" />
-            <span> 评估时间：{{ item.time }}</span>
-          </div>
-        </div>
-      </el-card>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      result: "2",
-      info: [
-        {
-          number: "044",
-          name: "胡守钧",
-          address: "宁波市江北区四洲街16号404",
-          money: "180234元",
-          person: "王勇",
-          time: "2021-9-1"
-        },
-        {
-          number: "044",
-          name: "胡守钧",
-          address: "宁波市江北区四洲街16号404",
-          money: "180234元",
-          person: "王勇",
-          time: "2021-9-1"
-        }
-      ]
-    };
-  },
-  created() {
-    this.onInit();
-  },
-  methods: {
-    onInit() {
-      this.onLoadData();
-    },
-    onLoadData() {
-      console.log(this.$route.params);
-      this.type = this.$route.params.type;
-    },
-    pageJump(type) {
-      this.$router.push({
-        name: "evaluteResult",
-        params: { type: type, ticket: this.$route.query.ticket }
-      });
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.container {
-  font-size: 12px;
-  .image {
-    margin-top: 20px;
-    text-align: center;
-    img {
-      width: 90%;
-    }
-  }
-  .text {
-    font-weight: bolder;
-    margin: 10px 0;
-    text-align: center;
-    color: #2d6df2;
-  }
-
-  .el-card {
-    margin: 0 10px 10px;
-    .el-card__body {
-      > div {
-        margin: 14px 0;
-        display: flex;
-        align-items: center;
-        img {
-          margin-right: 6px;
-        }
-        b {
-          font-size: 14px;
-        }
-      }
-      .line {
-        opacity: 1;
-        img {
-          width: 100%;
-        }
-        img {
-          height: 2px;
-        }
-      }
-      .content {
-        display: flex;
-        justify-content: space-between;
-        > div {
-          display: flex;
-          align-items: center;
-        }
-        .backgroundColor {
-          background-color: #e3ebfd;
-          img {
-            margin-right: 10px;
-          }
-          span {
-            padding-right: 10px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>

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

@@ -3,12 +3,10 @@
     <div class="image">
       <img alt src="@/assets/img/evalute.png" />
     </div>
-    <div class="text">
+    <div class="text">为您查询到{{ this.prjListLength }}条结果</div>
-      为您查询到{{ this.info.prjList[0].fhpgList.length }}条结果
-    </div>
     <div
       :key="index"
-      v-for="(item, index) in info.prjList[0].fhpgList"
+      v-for="(item, index) in this.prjList.fhpgList"
       @click="pageJump()"
     >
       <el-card body-style="padding:10px">
@@ -38,11 +36,11 @@
         <div class="content">
           <div class=" backgroundColor">
             <img alt src="@/assets/img/renyuan.png" />
-            <span> 评估人员：{{ item.person }}</span>
+            <span> 评估人员：{{ item.createUserName }}</span>
           </div>
           <div class="backgroundColor">
             <img alt src="@/assets/img/shijian.png" />
-            <span> 评估时间：{{ item.time }}</span>
+            <span> 评估时间：{{ item.createTime }}</span>
           </div>
         </div>
       </el-card>
@@ -51,6 +49,7 @@
 </template>
 <script>
 import { mgop } from "@aligov/jssdk-mgop";
+import { SetProjectId } from "@/common/util/tools";
 export default {
   data() {
     return {
@@ -62,49 +61,59 @@ export default {
               {
                 assessmentNo: "无数据",
                 houseAddress: "无数据",
-                countValue: "无数据",
+                countValue: "无数据"
-                person: "无数据",
-                time: "无数据"
               }
             ]
           }
         ]
-      }
+      },
+      prjList: [],
+      prjListLength: ""
     };
   },
   created() {
     this.onInit();
   },
   methods: {
+    // 获取数据
     onInit() {
-      this.onLoadData();
+      this.type = this.$route.params.type;
+      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
+          ticket:
+            this.$route.params.ticket || window.sessionStorage.getItem("ticket")
         },
         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 (
+              item.prjId ==
+              (this.$route.params.prjId ||
+                window.sessionStorage.getItem("projectId"))
+            );
+          });
+          this.prjList = prjList;
+          this.prjListLength = prjList.fhpgList.length;
         },
         onFail: err => {
           console.log("用户无数据，不展示");
         }
       });
     },
-    onLoadData() {
+    // 跳转评估结果pdf
-      console.log(this.$route.params);
+    pageJump() {
-      this.type = this.$route.params.type;
-    },
-    pageJump(type) {
       this.$router.push({
-        name: "evaluteResult",
+        // name: "evaluteResult"
-        params: { type: type, ticket: this.$route.query.ticket }
+        path: "/evaluteResult"
       });
     }
   }
@@ -161,7 +170,7 @@ export default {
         .backgroundColor {
           background-color: #e3ebfd;
           img {
-            margin-right: 10px;
+            margin-right: 4px;
           }
           span {
             padding-right: 10px;