Ver Fonte

图片显示更新

guoqing há 2 anos atrás
pai
commit
158e8be80f

+ 2 - 1
src/utils/config.js

@@ -3,6 +3,7 @@ let APP_SERVER_URL = ""
 if (process.env.NODE_ENV === 'development') {
     // 开发环境
     //APP_SERVER_URL = 'http://192.168.139.110:8084'
+    //APP_SERVER_URL = 'http://192.168.139.74:8080'
     APP_SERVER_URL = 'http://localhost:8084'
 } else {
     // 生产环境
@@ -11,4 +12,4 @@ if (process.env.NODE_ENV === 'development') {
 
 // APP_SERVER_URL = APP_SERVER_URL + "/app"
 
-export default APP_SERVER_URL
+export default APP_SERVER_URL

+ 15 - 2
src/views/placeManage/placePersoninfo.vue

@@ -29,7 +29,12 @@
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="12"> 证件类型: </van-col>
-                <van-col span="6" style="text-align: right"> {{data.data.idType==1?'身份证':'其他'}} </van-col>
+                <van-col span="6" style="text-align: right">
+                   <span v-if="data.data.idType==1">身份证</span>
+                   <span v-if="data.data.idType==2">护照</span>
+                   <span v-if="data.data.idType==3">港澳通行证</span>
+                   <span v-if="data.data.idType==4">其他</span>
+                </van-col>
               </van-row>
             </van-col>
           </van-row>
@@ -201,7 +206,7 @@
           </van-row>
           <van-row>
             <van-col span="10">
-                <img class="personImg" :src="item.value" alt="" />
+                <img style="width: 100px;height: 100px;" :src="item.value" alt="" />
             </van-col>
           </van-row>
         </van-col>
@@ -214,6 +219,7 @@
 <script>
 import { useRouter } from 'vue-router'
 import {onMounted, reactive,ref} from "vue"
+import $base from "@/utils/config"
 export default {
   setup(){
     const data = reactive({
@@ -225,6 +231,13 @@ export default {
     onMounted(()=>{
       var item = JSON.parse(router.currentRoute.value.query.data)
       data.data = item;
+      data.data.workPicture = `${$base}` + data.data.workPicture
+      data.data.userManagenmetDetailsDTOList.forEach(item2 => {
+        if(item2.dataType === '4'){
+          item2.value = `${$base}` + item2.value
+        }
+      });
+
     })
     //返回
     const goback = () => {

+ 73 - 53
src/views/placeManage/placeTabletInfo.vue

@@ -6,44 +6,47 @@
   </div>
   <div class="content">
     <div class="itemInfo">
-    <h3 style="color: #40abf4">牌位信息-{{data.data.brandName}}</h3>
+      <h3 style="color: #40abf4">牌位信息-{{ dataitem.brandName }}</h3>
       <van-row justify="space-between">
-        <van-col span="14">
+        <van-col span="24">
           <van-row class="item">
             <van-col span="24">
               <van-row justify="space-between">
-                <van-col span="8"> 名称: </van-col>
-                <van-col span="8" style="text-align: right">{{data.data.brandName}}</van-col>
+                <van-col span="10"> 名称: </van-col>
+                <van-col span="14" style="text-align: right">{{
+                  dataitem.brandName
+                }}</van-col>
               </van-row>
             </van-col>
           </van-row>
           <van-row class="item">
             <van-col span="24">
               <van-row justify="space-between">
-                <van-col span="8"> 所属场所名称: </van-col>
-                <van-col span="8" style="text-align: right">{{data.siteName.name}}</van-col>
+                <van-col span="10"> 所属场所名称: </van-col>
+                <van-col span="14" style="text-align: right">{{
+                  data.siteName.name
+                }}</van-col>
               </van-row>
             </van-col>
           </van-row>
           <van-row class="item">
             <van-col span="24">
               <van-row justify="space-between">
-                <van-col span="12"> 场所联系人: </van-col>
-                <van-col span="6" style="text-align: right">{{data.data.memorialTabletHolder}}</van-col>
+                <van-col span="10"> 场所联系人: </van-col>
+                <van-col span="14" style="text-align: right">{{
+                  dataitem.memorialTabletHolder
+                }}</van-col>
               </van-row>
             </van-col>
           </van-row>
         </van-col>
-        <van-col span="8">
-          <img class="personImg" :src="data.pic[0]" alt="" />
-        </van-col>
       </van-row>
       <van-row class="item">
         <van-col span="24">
           <van-row justify="space-between">
             <van-col span="10"> 联系方式: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.memorialTabletHolderPhone}}
+              {{ dataitem.memorialTabletHolderPhone }}
             </van-col>
           </van-row>
         </van-col>
@@ -53,7 +56,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 供奉牌位人: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.contactInformation}}
+              {{ dataitem.contactInformation }}
             </van-col>
           </van-row>
         </van-col>
@@ -63,7 +66,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 供奉牌位人电话: </van-col>
             <van-col span="14" style="text-align: right">
-             {{data.data.siteContact}}
+              {{ dataitem.siteContact }}
             </van-col>
           </van-row>
         </van-col>
@@ -73,7 +76,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 身份证号: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.udCard}}
+              {{ dataitem.udCard }}
             </van-col>
           </van-row>
         </van-col>
@@ -83,7 +86,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 籍贯: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.currentResidence}}
+              {{ dataitem.currentResidence }}
             </van-col>
           </van-row>
         </van-col>
@@ -93,7 +96,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 现居地: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.nativePlace}}
+              {{ dataitem.nativePlace }}
             </van-col>
           </van-row>
         </van-col>
@@ -103,7 +106,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 现居地详情: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.currentResidenceDel}}
+              {{ dataitem.currentResidenceDel }}
             </van-col>
           </van-row>
         </van-col>
@@ -113,7 +116,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 与供奉牌位关系: </van-col>
             <van-col span="14" style="text-align: right">
-                {{data.data.relationship}}
+              {{ dataitem.relationship }}
             </van-col>
           </van-row>
         </van-col>
@@ -123,7 +126,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 供奉费用(元/年): </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.sacrificeExpenses}}
+              {{ dataitem.sacrificeExpenses }}
             </van-col>
           </van-row>
         </van-col>
@@ -132,7 +135,16 @@
         <van-col span="24">
           <van-row justify="space-between">
             <van-col span="10">被供奉者信息: </van-col>
-            <van-col span="14" style="text-align: right">
+            <van-col span="14" style="text-align: right">{{ dataitem.information}}</van-col>
+          </van-row>
+        </van-col>
+      </van-row>
+      <van-row class="item">
+        <van-col span="24">
+          <van-row>
+            <van-col span="24">牌位照片: </van-col>
+            <van-col span="8" v-for="(item,index) in data.pic" :key="index">
+              <img class="personImg" :src="item" alt="" />
             </van-col>
           </van-row>
         </van-col>
@@ -142,33 +154,41 @@
 </template>
 
 <script>
-import { useRouter } from 'vue-router'
-import {onMounted, reactive} from "vue"
+import { useRouter } from "vue-router";
+import { onMounted, reactive ,ref} from "vue";
+import $base from "@/utils/config"
 export default {
-  setup(){
+  setup() {
     const data = reactive({
-      //牌位数据
-      data:{},
-      siteName:{},
+      siteName: {},
       pic:[]
-    })
+    });
+    //牌位数据
+    let dataitem = ref({});
     //数据接收
     const router = useRouter();
-    onMounted(()=>{
-      var item = JSON.parse(router.currentRoute.value.query.data)
-      data.data = item
-      data.siteName = data.data.siteName
-      data.pic.push(data.data.pic.split('|'))
-    })
+    onMounted(() => {
+      var item = JSON.parse(router.currentRoute.value.query.data);
+      dataitem.value = item;
+      data.siteName = dataitem.value.siteName; 
+      let pic = []
+      pic=dataitem.value.pic.split("|");
+      dataitem.value.pic = pic
+      dataitem.value.pic.forEach(item1=>{
+        item1 = `${$base}`+item1
+      })
+      data.pic = dataitem.value.pic
+    });
     //返回
     const goback = () => {
       history.back();
     };
-    return{
+    return {
       goback,
-      data
-    }
-  }
+      data,
+      dataitem
+    };
+  },
 };
 </script>
 
@@ -189,7 +209,7 @@ html {
   }
 }
 .banner {
-  background-color: #36A7F3;
+  background-color: #36a7f3;
   padding: 20px 50px 40px 50px;
   color: #fff;
   h2 {
@@ -226,24 +246,24 @@ html {
     margin: 0;
     padding: 0;
   }
-  .itemInfo{
+  .itemInfo {
     height: 100%;
-    .item{
-        padding: 15px 0;
-        border-bottom: 1px solid #f2f2f2;
-        .van-col{
-            .van-row{
-                .van-col{
-                    &:nth-child(2){
-                        color: #7f7f7f;
-                    }
-                }
+    .item {
+      padding: 15px 0;
+      border-bottom: 1px solid #f2f2f2;
+      .van-col {
+        .van-row {
+          .van-col {
+            &:nth-child(2) {
+              color: #7f7f7f;
             }
+          }
         }
+      }
     }
-    .personImg{
-        width: 100%;
-        height: 100%;
+    .personImg {
+      width: 100%;
+      height: 100%;
     }
   }
 }