4 Commits ad4ce9ff2e ... acef27904a

Author SHA1 Message Date
  DR/4DAGE acef27904a m 3 years ago
  DR/4DAGE e66858f7ae Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/jiangxiSZ 3 years ago
  DR/4DAGE 2908027372 1 3 years ago
  DR/4DAGE b0b902cbab m 3 years ago

+ 10 - 2
shuzhixiangzheng/config/index.js

@@ -10,7 +10,15 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+      '/api': {  //使用"/api"来代替"http://f.apiplus.c" 
+        target: 'http://101.132.109.234:8099/', //源地址 
+        changeOrigin: true, //改变源 
+        pathRewrite: { 
+          '^/api': 'http://101.132.109.234:8099/' //路径重写 
+          } 
+      } 
+    },
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
@@ -43,7 +51,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
 
     /**
      * Source Maps

BIN
shuzhixiangzheng/jiangxi_shuangzhongzheng.zip


+ 2 - 2
shuzhixiangzheng/src/assets/api/loadData.js

@@ -2,7 +2,7 @@ import axios  from "axios";
 import { SZZ_URL } from "./urls";
 const base_url="http://101.132.109.234:8099/"
 export function httpGet(url,param,sucessFun,errorFun){
-    axios.get(base_url+url,{       // 还可以直接把参数拼接在url后边
+    axios.get("/api"+url,{       // 还可以直接把参数拼接在url后边
         params:param
     }).then(function(res){
         sucessFun(res)
@@ -12,7 +12,7 @@ export function httpGet(url,param,sucessFun,errorFun){
 }
 
 export function jinghuguoji_httpGet(param,sucessFun,errorFun){
-    axios.get(base_url+SZZ_URL,{       // 还可以直接把参数拼接在url后边
+    axios.get("/api"+SZZ_URL,{       // 还可以直接把参数拼接在url后边
         params:param
     }).then(function(res){
         sucessFun(res)

+ 85 - 39
shuzhixiangzheng/src/components/DaZhongPage.vue

@@ -11,7 +11,8 @@
             <img class="img" id="x_img" src="../assets/png/×.png" v-show="form_show" v-on:click="form_showFun"></img>
                  <img class="img" id="form_img" :src="housePng_url" v-show="form_show"> 
                 </img>
-                    <div id="numberDiv" v-show="form_show">{{houseNum}}</div>
+                    <div id="numberDiv" v-show="number_show1">{{houseNum}}</div>
+                    <div id="numberDiv1" v-show="number_show2">{{houseNum}}</div>
                     <el-table
                     :header-cell-style="{background:'#0b61c5',color:'#fff','font-weight': 700}"
                     v-show="form_show"
@@ -157,7 +158,9 @@
           workspace:"",
           telephone:""
         }],
-        houseNum:101
+        houseNum:101,
+      number_show1:false,
+         number_show2:false
       }
     },
     mounted(){
@@ -195,7 +198,6 @@
                         pageNum:0,
                         pageSize:10
                         },(result)=>{
-                            console.log(result.data.data)
                             this.jhgj_tableData=result.data.data.list
                         },()=>{}
                     );
@@ -215,8 +217,6 @@
                         pageNum:0,
                         pageSize:10
                         },(result)=>{
-                            console.log(c)
-                            console.log(result.data.data)
                             this.jhgj_tableData=result.data.data.list
                         },()=>{}
                     );
@@ -233,8 +233,21 @@
         jinghuguojiShowFun(){
             setTimeout(()=>{
                 this.form_show=true;
+                this.number_show1=true;
+                this.number_show2=false;
                 this.housePng_url=housePng;
+                this.houseNum="101"
                 this.houses_firePoint_show=true;
+                jinghuguoji_httpGet({
+                        villageName:"金湖国际",
+                        buildingNumber:"A",
+                        roomNumber:"101",
+                        pageNum:0,
+                        pageSize:10
+                        },(result)=>{
+                            this.jhgj_tableData=result.data.data.list
+                        },()=>{}
+                    );
             },100)
           
             // document.getElementById("houses1").style.display="none"
@@ -243,8 +256,21 @@
         laoxianweisusheShowFun(){
             setTimeout(()=>{
                 this.form_show=true;
+                this.number_show1=false;
+                this.number_show2=true;
                  this.housePng_url=house1Png
                  this.houses1_firePoint_show=true;
+                 this.houseNum="101"
+                 jinghuguoji_httpGet({
+                        villageName:"老县委宿舍",
+                        buildingNumber:"A",
+                        roomNumber:"101",
+                        pageNum:0,
+                        pageSize:10
+                        },(result)=>{
+                            this.jhgj_tableData=result.data.data.list
+                        },()=>{}
+                    );
             },100)
          
         },
@@ -254,6 +280,8 @@
 
         form_showFun(){
             this.form_show=false;
+            this.number_show1=false;
+                this.number_show2=false;
             this.houses1_firePoint_show=false;
             this.houses_firePoint_show=false;
         }
@@ -273,6 +301,16 @@
         font-size: 35px;
         top:18%
     }
+    #numberDiv1{
+        position: absolute;
+        z-index: 113;
+        width: 200px;
+        height: 100px;
+        left: 52%;
+        color: azure;
+        font-size: 35px;
+        top:16%
+    }
 
 
      #table{
@@ -318,7 +356,6 @@
         }
 
         .house_class{
-           
          position: absolute;
          z-index: 114;
          width: 70px;
@@ -585,7 +622,16 @@
         font-size: 35px;
         top:19%
     }
-
+    #numberDiv1{
+        position: absolute;
+        z-index: 113;
+        width: 200px;
+        height: 100px;
+        left: 52%;
+        color: azure;
+        font-size: 35px;
+        top:17%
+    }
 
      #table{
          position: absolute;
@@ -596,135 +642,135 @@
      }
         #house_101{
             left: 26%;
-            top: 90%;
+            top: 87%;
         }
         #house_102{
             left: 42%;
-            top: 90%;
+            top: 87%;
         }
         #house_201{
             left: 26%;
-            top: 85.5%;
+            top: 83.5%;
         }
         #house_202{
             left: 42%;
-            top: 85.5%;
+            top: 83.5%;
         }
         #house_301{
             left: 26%;
-            top: 81%;
+            top: 79%;
         }
         #house_302{
             left: 42%;
-            top: 81%;
+            top: 79%;
         }
         #house_401{
             left: 26%;
-            top: 77.5%;
+            top: 75.5%;
         }
         #house_402{
             left: 42%;
-            top: 77.5%;
+            top: 75.5%;
         }
         #house_501{
             left: 26%;
-            top: 73.5%;
+            top: 71.5%;
         }
         #house_502{
             left: 42%;
-            top: 73.5%;
+            top: 71.5%;
         }
         #house_601{
             left: 26%;
-            top: 70%;
+            top: 68%;
         }
         #house_602{
             left: 42%;
-            top: 70%;
+            top: 68%;
         }
 
 
         /* ------------------------------- */
         #house_701{
             left: 26%;
-            top: 66%;
+            top: 64%;
         } 
         #house_702{
             left: 42%;
-            top: 66%;
+            top: 64%;
         }
 
         #house_801{
             left: 26%;
-            top: 62%;
+            top: 60.5%;
         }
         #house_802{
             left: 42%;
-            top: 62%;
+            top: 60.5%;
         }
         #house_901{
             left: 26%;
-            top: 58%;
+            top: 57%;
         }
         #house_902{
             left: 42%;
-            top: 58%;
+            top: 57%;
         }
         #house_1001{
             left: 26%;
-            top: 54.5%;
+            top: 53.5%;
         }
         #house_1002{
             left: 42%;
-            top: 54.5%;
+            top: 53.5%;
         }
         #house_1101{
             left: 26%;
-            top: 51%;
+            top: 50%;
         }
         #house_1102{
             left: 42%;
-            top: 51%;
+            top: 50%;
         }
         #house_1201{
             left: 26%;
-            top: 47.5%;
+            top: 46.5%;
         }
         #house_1202{
             left: 42%;
-            top: 47.5%;
+            top: 46.5%;
         }
         #house_1301{
             left: 26%;
-            top: 44%;
+            top: 42%;
         }
         #house_1302{
             left: 42%;
-            top: 44%;
+            top: 42%;
         }
         #house_1401{
             left: 26%;
-            top: 40%;
+            top: 38.5%;
         }
         #house_1402{
             left: 42%;
-            top: 40%;
+            top: 38.5%;
         }
         #house_1501{
             left: 26%;
-            top: 36%;
+            top: 35%;
         }
         #house_1502{
             left: 42%;
-            top: 36%;
+            top: 35%;
         }
         #house_1601{
             left: 26%;
-            top: 32%;
+            top: 31%;
         }
         #house_1602{
             left: 42%;
-            top: 32%;
+            top: 31%;
         }
         #house_1701{
             left: 26%;

+ 36 - 0
shuzhixiangzheng/src/components/MainPageChild/EducationPage.vue

@@ -0,0 +1,36 @@
+<template>
+    <div id="educationPage">
+      
+    </div>
+    </template>
+    
+    <script>
+     
+    export default {
+      name: 'EducationPage',
+      components:{
+        
+      },
+      data () {
+        return {
+          msg: '',
+        }
+      },
+      mounted(){
+        
+      },
+      methods:{
+        
+      }
+    }
+    </script>
+    
+ <style scoped>
+     #educationPage{
+        position: absolute;
+        width: 100%;
+        height: 100%;
+     }
+ 
+    </style>
+    

+ 1 - 1
shuzhixiangzheng/src/components/ZheJiPage.vue

@@ -259,7 +259,7 @@ export default {
     left: 29%;
     color: azure;
     font-size: 35px;
-    top: 66%;
+    top: 67%;
   }
   #yjxs_table {
     position: absolute;

+ 0 - 0
shuzhixiangzheng/vue.config.js