diff --git a/src/App.vue b/src/App.vue
index c7bc89e..7ba3470 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,16 +9,16 @@
       </div>
       <div class="right">
         <div class="time">
-          <span>11月30日 周一</span>
+          <span>{{this.$moment().format("MM月DD日")}}  {{week}}</span>
           <span style="font-size:24px;margin-top: 3px;">{{this.$moment().format("YYYY-MM-DD")}}</span>
         </div>
         <div class="weather" v-for="(item,index) in weatherArr" :key="index">
           <div class="pic">
-            <img :src="item.pic" alt="">
+            <img :src="item.pic" alt="" style="height:100%;width:100%">
           </div>
           <div class="date">
-            <span>{{item.day}}</span>
-            <span style="font-size:24px;margin-top: 3px;">{{item.temperature}}</span>
+            <span>{{item.date}}</span>
+            <span style="font-size:24px;margin-top: 3px;">{{item.high}}-{{item.low}}</span>
           </div>
         </div>
       </div>
@@ -32,6 +32,7 @@
 <script>
 import MinxinItem from "./mixins"
 import axios from 'axios'
+import {getWather} from "./api/index.js";
 export default {
   name: 'home',
   mixins:[MinxinItem],
@@ -44,20 +45,77 @@ export default {
         {day:'12月01日',temperature:'27℃-19℃',pic:require('./assets/images/union.png')},
         {day:'12月02日',temperature:'27℃-19℃',pic:require('./assets/images/windy.png')}
       ],
+      weekList:['周日','周一','周二','周三','周四','周五','周六'],
+      week:'',
     }
   },
   mounted(){
-    // this.handleWather()
+    this.handleWather()
+    let week = new Date(this.$moment().format("YYYY-MM-DD")).getDay()
+   this.week = this.weekList[week]
   },
   
   methods:{
     //天气
     handleWather(){
-      axios({url:'https://restapi.amap.com/v3/weather/weatherInfo?key=bc2b906032fdd8a63cbd0790d656b1d7&city=320903',methods:''}).then(res=>{
-        this.weatherArr[0] = res.data.lives[0]
-        console.log(res.data,'asdsads');
+      // axios({url:"http://www.jcznedu.com:5000/weather/prediction/?city=盐都&&limit=3",methods:'GET'}).then(res=>{
+      // })
+      getWather({
+        city:'盐都',
+        limit:'3'
+      }).then((res)=>{
+        this.weatherArr = res.data.data.daly;
+        this.weatherArr[0].date = '今天';
+        for (let i = 0; i < this.weatherArr.length; i++) {
+          this.Onweather(this.weatherArr[i].weather,i)
+        }
       })
     },
+    //天气
+    Onweather(name,index){
+      switch (name) {
+					case "多云":
+						return this.weatherArr[index].pic = require('./assets/weather/Cloudy .png');
+					case "阴":
+						return this.weatherArr[index].pic = require('./assets/weather/Cloudy .png')
+					case "暴雨":
+						return this.weatherArr[index].pic = require('./assets/weather/rainstorm.png')
+					case "冰雹":
+						return this.weatherArr[index].pic = require('./assets/weather/hail.png')
+					case "大风":
+						return this.weatherArr[index].pic = require('./assets/weather/gale.png')
+					case "大雪":
+						return this.weatherArr[index].pic = require('./assets/weather/bigsnow.png')
+					case "大雨":
+						return this.weatherArr[index].pic = require('./assets/weather/bigrain.png')
+					case "雷电":
+						return this.weatherArr[index].pic = require('./assets/weather/thunder.png')
+					case "雷阵雨":
+						return this.weatherArr[index].pic = require('./assets/weather/shower.png')
+					case "沙尘暴":
+						return this.weatherArr[index].pic = require('./assets/weather/sand.png')
+					case "晴":
+						return this.weatherArr[index].pic = require('./assets/weather/sun.png')
+					case "雾霾":
+						return this.weatherArr[index].pic = require('./assets/weather/smog.png')
+					case "小雪":
+						return this.weatherArr[index].pic = require('./assets/weather/snow.png')
+					case "小雨":
+						return this.weatherArr[index].pic = require('./assets/weather/rain.png')
+					case "雪":
+						return this.weatherArr[index].pic = require('./assets/weather/rainlitter.png')
+					case "多云":
+						return this.weatherArr[index].pic = require('./assets/weather/night.png')
+					case "雨夹雪":
+						return this.weatherArr[index].pic = require('./assets/weather/rainsnow.png')
+					case "月亮":
+						return this.weatherArr[index].pic = require('./assets/weather/moon.png')
+					case "中雪":
+						return this.weatherArr[index].pic = require('./assets/weather/mieddlesnow.png')
+					case "中雨":
+						return this.weatherArr[index].pic = require('./assets/weather/middlerain.png')
+				}
+    },
     handleChange(index){
       let that = this;
       this.routerActive = index
diff --git a/src/api/index.js b/src/api/index.js
index 8606658..67c865d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,57 +1,63 @@
 import axios from 'axios'
-if (process.env.NODE_ENV === 'development') {
-    axios.defaults.baseURL = '/api'
-} else if (process.env.NODE_ENV === 'production') {
-    axios.defaults.baseURL = '/api'
-}
+// if (process.env.NODE_ENV === 'development') {
+//     axios.defaults.baseURL = '/api'
+// } else if (process.env.NODE_ENV === 'production') {
+//     axios.defaults.baseURL = '/api'
+// }
 //设置请求头参数 common 为设置所有的接口  post为设置post请求的接口
 // axios.defaults.headers.common['Authorization'] = `Bearer ${localStorage.getItem('access_token')}`;
 
 // 电力概况
 export const getCompanyInfo = (params) => {
-    return axios.get('/Handler/Company.ashx', {
+    return axios.get('api/Handler/Company.ashx', {
         params
     })
 };
 // 路线查询  下拉
 export const getLine = (params) => {
-    return axios.get('/Handler/Line.ashx', {
+    return axios.get('api/Handler/Line.ashx', {
         params
     })
 };
 // 查询设备素材
 export const getDevice = (params) => {
-    return axios.get('/Handler/Device.ashx', {
+    return axios.get('api/Handler/Device.ashx', {
         params
     })
 };
 //班组故障查询
 export const getBanzugz = (params) => {
-    return axios.get('/Handler/Banzugz.ashx', {
+    return axios.get('api/Handler/Banzugz.ashx', {
         params
     })
 };
 //查询工单统计
 export const getGdtj = (params) => {
-    return axios.get('/Handler/gdtj.ashx', {
+    return axios.get('api/Handler/gdtj.ashx', {
         params
     })
 };
 //查询单位本周故障
 export const getDwbzgz = (params) => {
-    return axios.get('/Handler/Dwbzgz.ashx', {
+    return axios.get('api/Handler/Dwbzgz.ashx', {
         params
     })
 };
 //查询供电所供电质量情况
 export const getGdsgdzl = (params) => {
-    return axios.get('/Handler/Gdsgdzl.ashx', {
+    return axios.get('api/Handler/Gdsgdzl.ashx', {
         params
     })
 };
 //查询配变停运情况
 export const getPbtyqk = (params) => {
-    return axios.get('/Handler/Pbtyqk.ashx', {
+    return axios.get('api/Handler/Pbtyqk.ashx', {
+        params
+    })
+};
+//查询天气
+export const getWather = (params) => {
+    return axios.get('aps/weather/prediction/', {
         params
     })
 };
\ No newline at end of file
diff --git a/src/assets/weather/Cloudy .png b/src/assets/weather/Cloudy .png
new file mode 100644
index 0000000..9562a1f
Binary files /dev/null and b/src/assets/weather/Cloudy .png differ
diff --git a/src/assets/weather/bigrain.png b/src/assets/weather/bigrain.png
new file mode 100644
index 0000000..b49a4de
Binary files /dev/null and b/src/assets/weather/bigrain.png differ
diff --git a/src/assets/weather/bigsnow.png b/src/assets/weather/bigsnow.png
new file mode 100644
index 0000000..6582d8b
Binary files /dev/null and b/src/assets/weather/bigsnow.png differ
diff --git a/src/assets/weather/gale.png b/src/assets/weather/gale.png
new file mode 100644
index 0000000..6092ae6
Binary files /dev/null and b/src/assets/weather/gale.png differ
diff --git a/src/assets/weather/hail.png b/src/assets/weather/hail.png
new file mode 100644
index 0000000..e34e8f9
Binary files /dev/null and b/src/assets/weather/hail.png differ
diff --git a/src/assets/weather/middlerain.png b/src/assets/weather/middlerain.png
new file mode 100644
index 0000000..6636746
Binary files /dev/null and b/src/assets/weather/middlerain.png differ
diff --git a/src/assets/weather/mieddlesnow.png b/src/assets/weather/mieddlesnow.png
new file mode 100644
index 0000000..4d7cc69
Binary files /dev/null and b/src/assets/weather/mieddlesnow.png differ
diff --git a/src/assets/weather/moon.png b/src/assets/weather/moon.png
new file mode 100644
index 0000000..2c0cd9f
Binary files /dev/null and b/src/assets/weather/moon.png differ
diff --git a/src/assets/weather/night.png b/src/assets/weather/night.png
new file mode 100644
index 0000000..a13837f
Binary files /dev/null and b/src/assets/weather/night.png differ
diff --git a/src/assets/weather/rain.png b/src/assets/weather/rain.png
new file mode 100644
index 0000000..874a09d
Binary files /dev/null and b/src/assets/weather/rain.png differ
diff --git a/src/assets/weather/rainlitter.png b/src/assets/weather/rainlitter.png
new file mode 100644
index 0000000..2de37be
Binary files /dev/null and b/src/assets/weather/rainlitter.png differ
diff --git a/src/assets/weather/rainsnow.png b/src/assets/weather/rainsnow.png
new file mode 100644
index 0000000..194c877
Binary files /dev/null and b/src/assets/weather/rainsnow.png differ
diff --git a/src/assets/weather/rainstorm.png b/src/assets/weather/rainstorm.png
new file mode 100644
index 0000000..6510e52
Binary files /dev/null and b/src/assets/weather/rainstorm.png differ
diff --git a/src/assets/weather/sand.png b/src/assets/weather/sand.png
new file mode 100644
index 0000000..58d05c2
Binary files /dev/null and b/src/assets/weather/sand.png differ
diff --git a/src/assets/weather/shower.png b/src/assets/weather/shower.png
new file mode 100644
index 0000000..9c14047
Binary files /dev/null and b/src/assets/weather/shower.png differ
diff --git a/src/assets/weather/smog.png b/src/assets/weather/smog.png
new file mode 100644
index 0000000..bf18a91
Binary files /dev/null and b/src/assets/weather/smog.png differ
diff --git a/src/assets/weather/snow.png b/src/assets/weather/snow.png
new file mode 100644
index 0000000..f1ee135
Binary files /dev/null and b/src/assets/weather/snow.png differ
diff --git a/src/assets/weather/sun.png b/src/assets/weather/sun.png
new file mode 100644
index 0000000..29978c5
Binary files /dev/null and b/src/assets/weather/sun.png differ
diff --git a/src/assets/weather/thunder.png b/src/assets/weather/thunder.png
new file mode 100644
index 0000000..0e22d42
Binary files /dev/null and b/src/assets/weather/thunder.png differ
diff --git a/src/views/HomePop/ringMainUnit.vue b/src/views/HomePop/ringMainUnit.vue
index 940fda1..2d9b87c 100644
--- a/src/views/HomePop/ringMainUnit.vue
+++ b/src/views/HomePop/ringMainUnit.vue
@@ -24,7 +24,7 @@
                             <div class="informationContent">环网柜名称&nbsp;&nbsp;&nbsp;&nbsp;{{ringMainUnit}}</div>
                             <div class="informationContent">环网柜编号&nbsp;&nbsp;&nbsp;&nbsp;{{deviceInformation.deivce_bianhao}}</div>
                             <div class="informationContent">IP地址&nbsp;&nbsp;&nbsp;&nbsp;{{deviceInformation.deivce_ip}}</div>
-                            <div class="informationContent">总间隔&nbsp;&nbsp;&nbsp;&nbsp;XXXXXXXX</div>
+                            <div class="informationContent">总间隔&nbsp;&nbsp;&nbsp;&nbsp;{{deviceInformation.zjg}}</div>
                     </div>
                 </div>
             </div>
diff --git a/src/views/index.vue b/src/views/index.vue
index 482b78d..9f7e7d4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1819,8 +1819,9 @@ export default {
        .topContent{
             width: 30%;
             display: flex;
-            justify-content: space-around;
-            align-items: center
+            justify-content: flex-start;
+            align-items: center;
+            white-space: nowrap;
        }
      }
    }
diff --git a/src/views/thirtyFiveKV.vue b/src/views/thirtyFiveKV.vue
index b8b9486..e796d4f 100644
--- a/src/views/thirtyFiveKV.vue
+++ b/src/views/thirtyFiveKV.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="thirtyFiveKV">
-      momomo
+      thirtyFiveKV
   </div>
 </template>
 
diff --git a/src/views/twentyKV.vue b/src/views/twentyKV.vue
index c03b0e8..b1a373b 100644
--- a/src/views/twentyKV.vue
+++ b/src/views/twentyKV.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="twentyKV">
-      momomo
+      twentyKV
   </div>
 </template>
 
diff --git a/vue.config.js b/vue.config.js
index 6be8979..c41fa31 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,13 +15,22 @@ module.exports = {
         // port: 8989, // 开发服务器运行端口号
         proxy: {
             '/api': { //代理的名字
-                target:' http://111.229.30.246:3111/',
+                target:'http://111.229.30.246:3111/',
                 // target: 'http://172.16.1.254:3111/', 
                 ws: true,
                 changeOrigin: true,
                 pathRewrite:{
                     '^/api':'',
                 }
+            },
+            '/aps': { //代理的名字
+                target:'http://www.jcznedu.com:5000/',
+                // target: 'http://172.16.1.254:3111/', 
+                ws: true,
+                changeOrigin: true,
+                pathRewrite:{
+                    '^/aps':'',
+                }
             }
         }
     }