From 6c21c8b36e3f76af2449dd6293a4a1812cafd301 Mon Sep 17 00:00:00 2001
From: lisl <1223762861@qq.com>
Date: Mon, 27 Sep 2021 15:46:11 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=97=A0=E5=86=85=E5=AE=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sunshine_levy/src/elementui/index.js      |  5 ++-
 FrontCode2/sunshine_levy/src/views/home.css   | 20 +++++++--
 FrontCode2/sunshine_levy/src/views/index.vue  | 13 ++++--
 .../src/views/pdf/evaluateResultPdf.vue       | 33 ++++++++++----
 .../sunshine_levy/src/views/pdf/pdf.vue       |  5 ++-
 .../sunshine_levy/src/views/project/index.vue | 31 ++++++++++---
 .../src/views/report/agreement.vue            | 41 +++++++++++++-----
 .../src/views/report/evaluatePage.vue         | 15 ++++---
 .../src/views/report/evalute.vue              | 43 ++++++++++++++-----
 framework/Api/Furion                          |  1 -
 10 files changed, 156 insertions(+), 51 deletions(-)
 delete mode 160000 framework/Api/Furion

diff --git a/FrontCode2/sunshine_levy/src/elementui/index.js b/FrontCode2/sunshine_levy/src/elementui/index.js
index bd915c3..55e0134 100644
--- a/FrontCode2/sunshine_levy/src/elementui/index.js
+++ b/FrontCode2/sunshine_levy/src/elementui/index.js
@@ -1,8 +1,9 @@
 import Vue from "vue";
 
-import { Form, FormItem, Button, Card } from "element-ui";
+import { Form, FormItem, Button, Card, Loading } from "element-ui";
 
 Vue.use(Form);
 Vue.use(FormItem);
 Vue.use(Button);
-Vue.use(Card);
\ No newline at end of file
+Vue.use(Card);
+Vue.use(Loading);
\ No newline at end of file
diff --git a/FrontCode2/sunshine_levy/src/views/home.css b/FrontCode2/sunshine_levy/src/views/home.css
index d908f48..b6590ff 100644
--- a/FrontCode2/sunshine_levy/src/views/home.css
+++ b/FrontCode2/sunshine_levy/src/views/home.css
@@ -107,6 +107,14 @@
   background-size: 100% 41px;
 }
 
+.project>div:nth-child(1) {
+  display: flex;
+  align-items: center;
+  width: 50%;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
 .projectIcon {
   display: flex;
   align-items: center;
@@ -192,8 +200,8 @@
   font-family: PingFangSC-Regular, PingFang SC;
   font-size: 14px;
   font-weight: 400;
-  line-height: 12px;
-  height: 12px;
+  line-height: 20px;
+  /* height: 12px; */
   color: #2c2b2b;
 }
 
@@ -242,13 +250,17 @@
   padding-left: 12px;
 }
 
+.assessBox>span:nth-child(1) {
+  white-space: nowrap;
+}
+
 .assessCenter1 {
-  margin: 15px;
+  margin: 15px 10px;
   border-left: 2px solid #24bca3;
 }
 
 .assessCenter2 {
-  margin: 15px;
+  margin: 15px 10px;
   border-left: 2px solid #ff5959;
 }
 
diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue
index d2a57e1..202c5e0 100644
--- a/FrontCode2/sunshine_levy/src/views/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/index.vue
@@ -1,5 +1,9 @@
 <template>
-  <div>
+  <div
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+  >
     <div class="page">
       <div class="topBox">
         <div class="titleBox">
@@ -71,7 +75,7 @@
             <!-- 图标所在行 -->
             <div class="project">
               <!-- window图标 -->
-              <div style="display: flex;align-items: center;">
+              <div>
                 <div class="projectIcon">
                   <van-image
                     :src="require('@/assets/img/project.png')"
@@ -302,6 +306,7 @@ export default {
   name: "home",
   data() {
     return {
+      loading: true,
       data: {
         idCard: "加载中...",
         userName: "加载中...",
@@ -339,7 +344,7 @@ export default {
           }
         ]
       },
-      ticket: "8a11884d7bda7a4c017c20a63f174601-ticket"
+      ticket: "8a1189367c22b456017c25bb119c2039-ticket"
     };
   },
   created() {
@@ -362,8 +367,8 @@ 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.loading = false;
             this.data = data.data.data;
             // 埋点
             this.setZwUserAplus(this.data.idCard, this.data.userName);
diff --git a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
index d6c7c7e..4286bf7 100644
--- a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
+++ b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
@@ -25,6 +25,7 @@
 <script>
 // import pdf from "vue-pdf";
 import $ from "jquery";
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
   components: {},
   data() {
@@ -53,14 +54,30 @@ export default {
   },
   methods: {
     onInit() {
-      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;
-      }
+      mgop({
+        api: "mgop.kykj.houseexpropriat.getHouseEstimateInfoJzlr",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
+        data: {
+          ticket: window.sessionStorage.getItem("ticket"),
+          id: window.sessionStorage.getItem("fhpgId"),
+          type: window.sessionStorage.getItem("fhpgType")
+        },
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          const result = data;
+          if (result.data && result.data.success == true) {
+            this.apidata = result.data.data;
+            this.pic_width = "100%";
+            this.pic_height = "100%";
+            this.isloading = false;
+          }
+        },
+        onFail: err => {
+          console.log("请求失败", err);
+        }
+      });
     },
     saveImages() {
       ZWJSBridge.onReady(() => {
diff --git a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue
index c4dceca..286518b 100644
--- a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue
+++ b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue
@@ -54,6 +54,9 @@ export default {
   },
   methods: {
     onInit() {
+      if (this.$route.params.id) {
+        window.sessionStorage.setItem("bcxyId", this.$route.params.id);
+      }
       mgop({
         api: "mgop.kykj.houseexpropriat.getagreementinfop",
         host: "https://mapi.zjzwfw.gov.cn/",
@@ -62,7 +65,7 @@ export default {
         data: {
           ticket:
             this.$route.query.ticket || window.sessionStorage.getItem("ticket"),
-          id: this.$route.params.id
+          id: window.sessionStorage.getItem("bcxyId")
         },
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: result => {
diff --git a/FrontCode2/sunshine_levy/src/views/project/index.vue b/FrontCode2/sunshine_levy/src/views/project/index.vue
index c7aad47..8d927e4 100644
--- a/FrontCode2/sunshine_levy/src/views/project/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/project/index.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="container">
+  <div
+    class="container"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+  >
     <div :class="this.type == 'pg' ? 'proTopBoxpg' : 'proTopBoxxy'">
       <div class="proCenterBox">
         <div class="proCenterInfo">
@@ -69,13 +74,13 @@
 <script>
 import "./project.css";
 import $ from "jquery";
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
   data() {
     return {
       loading: true,
       type: "",
       data: new Object(),
-      loading: false,
       finished: true,
       // 初始数据
       info: {
@@ -118,9 +123,25 @@ export default {
       if (this.$route.params.type) {
         window.sessionStorage.setItem("type", this.$route.params.type);
       }
-      this.info = JSON.parse(
-        JSON.stringify(this.$store.state.homeData.data.data)
-      );
+      mgop({
+        api: "mgop.kykj.houseexpropriat.getprjlist",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
+        data: {
+          ticket: window.sessionStorage.getItem("ticket")
+        },
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          if (data.data.success == true) {
+            this.loading = false;
+            this.info = data.data.data;
+          }
+        },
+        onFail: err => {
+          console.log("用户无数据，不展示");
+        }
+      });
     },
     setIdCard(id) {
       return id == "无数据"
diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue
index 4a88c16..3a1f4ea 100644
--- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue
+++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="container">
+  <div
+    class="container"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+  >
     <div class="image">
       <img alt src="@/assets/img/agreement.png" />
     </div>
@@ -55,10 +60,12 @@
 </template>
 <script>
 import { SetProjectId } from "@/common/util/tools";
+import { mgop } from "@aligov/jssdk-mgop";
 import $ from "jquery";
 export default {
   data() {
     return {
+      loading: true,
       info: {
         userName: "无数据",
         prjList: {
@@ -99,16 +106,30 @@ export default {
       if (!window.sessionStorage.getItem("projectId")) {
         SetProjectId(this.$route.params.prjId);
       }
-      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");
+      mgop({
+        api: "mgop.kykj.houseexpropriat.getprjlist",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
+        data: {
+          ticket: window.sessionStorage.getItem("ticket")
+        },
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          if (data.data.success == true) {
+            this.loading = false;
+            this.info = data.data.data;
+            const prjList = data.data.data.prjList.find(item => {
+              return item.prjId == window.sessionStorage.getItem("projectId");
+            });
+            this.info.prjList = prjList;
+            this.prjListLength = prjList.bcxyList.length;
+          }
+        },
+        onFail: err => {
+          console.log("用户无数据，不展示");
         }
-      );
-      this.info.prjList = prjList;
-      this.prjListLength = prjList.bcxyList.length;
+      });
     },
     showPdf(id) {
       this.$router.push({ name: "showPdf", params: { id } });
diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue
index bd66565..9861e91 100644
--- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue
+++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="container">
+  <div
+    class="container"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+  >
     <div class="top">
       <div>
         <div>
@@ -105,8 +110,8 @@ export default {
     // 获取数据
     getData() {
       if (this.$route.params.type) {
-        this.$store.dispatch("SET_TYPE", this.$route.params.type);
-        this.$store.dispatch("SET_FHPGID", this.$route.params.fhpgId);
+        window.sessionStorage.setItem("fhpgId", this.$route.params.fhpgId);
+        window.sessionStorage.setItem("fhpgType", this.$route.params.type);
       }
       mgop({
         api: "mgop.kykj.houseexpropriat.getHouseEstimateInfoJzlr",
@@ -115,8 +120,8 @@ export default {
         type: "POST",
         data: {
           ticket: window.sessionStorage.getItem("ticket"),
-          id: this.$store.state.id,
-          type: this.$store.state.type
+          id: window.sessionStorage.getItem("fhpgId"),
+          type: window.sessionStorage.getItem("fhpgType")
         },
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue
index a6cf92d..3ac4bb8 100644
--- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue
+++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="container">
+  <div
+    class="container"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+  >
     <div class="image">
       <img alt src="@/assets/img/evaluate.png" />
     </div>
@@ -115,9 +120,11 @@
 <script>
 import { SetProjectId } from "@/common/util/tools";
 import $ from "jquery";
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
   data() {
     return {
+      loading: true,
       info: {
         userName: "无数据",
         prjList: {
@@ -154,19 +161,33 @@ export default {
   methods: {
     // 获取数据
     onInit() {
-      if (!window.sessionStorage.getItem("projectId")) {
+      if (this.$route.params.prjId) {
         SetProjectId(this.$route.params.prjId);
       }
-      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");
+      mgop({
+        api: "mgop.kykj.houseexpropriat.getprjlist",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
+        data: {
+          ticket: window.sessionStorage.getItem("ticket")
+        },
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          if (data.data.success == true) {
+            this.loading = false;
+            this.info = data.data.data;
+            const prjList = data.data.data.prjList.find(item => {
+              return item.prjId == window.sessionStorage.getItem("projectId");
+            });
+            this.info.prjList = prjList;
+            this.prjListLength = prjList.fhpgList.length;
+          }
+        },
+        onFail: err => {
+          console.log("用户无数据，不展示");
         }
-      );
-      this.info.prjList = prjList;
-      this.prjListLength = prjList.fhpgList.length;
+      });
     },
     // 跳转评估结果二级页面
     pageJump(id, type) {
diff --git a/framework/Api/Furion b/framework/Api/Furion
deleted file mode 160000
index 670f93a..0000000
--- a/framework/Api/Furion
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 670f93a3722569a8d00e90e8dea80d7daf69b54f