diff --git a/src/assets/images/personal/user.png b/src/assets/images/personal/user.png
new file mode 100644
index 0000000..dd4bb1d
--- /dev/null
+++ b/src/assets/images/personal/user.png
Binary files differ

diff --git a/src/assets/images/personal/user.png b/src/assets/images/personal/user.png
new file mode 100644
index 0000000..dd4bb1d
--- /dev/null
+++ b/src/assets/images/personal/user.png
Binary files differ
diff --git a/src/assets/less/style.less b/src/assets/less/style.less
index 241d76e..4375fd3 100644
--- a/src/assets/less/style.less
+++ b/src/assets/less/style.less
@@ -1,14 +1,10 @@
 @import './global.less';
 
 :root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif, SourceHanSansCN-Regular;
-  font-size: 14px;
-  line-height: 24px;
+  font-family: Source Han Sans CN;
   font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+  font-size: 25px;
+  color: #121212;
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;

diff --git a/src/assets/images/personal/user.png b/src/assets/images/personal/user.png
new file mode 100644
index 0000000..dd4bb1d
--- /dev/null
+++ b/src/assets/images/personal/user.png
Binary files differ
diff --git a/src/assets/less/style.less b/src/assets/less/style.less
index 241d76e..4375fd3 100644
--- a/src/assets/less/style.less
+++ b/src/assets/less/style.less
@@ -1,14 +1,10 @@
 @import './global.less';
 
 :root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif, SourceHanSansCN-Regular;
-  font-size: 14px;
-  line-height: 24px;
+  font-family: Source Han Sans CN;
   font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+  font-size: 25px;
+  color: #121212;
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index 89a529b..a4b0656 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -32,15 +32,12 @@
           :key="index"
           @click="$router.push(item.path)"
         >
-          <!-- <van-badge :content="item.num" :show-zero="false"> -->
           <img class="typeImg" :src="getImageUrl(item.picUrl, 'images')" alt="" />
-          <!-- </van-badge> -->
           <div class="typeFont">{{ item.name }}</div>
         </div>
       </div>
-      <!-- 主要工单内容部分 -->
+      <!-- 报警信息 -->
       <div id="listBox">
-        <!-- <van-pull-refresh v-model="AllData.refreshing" @refresh="onRefresh"> -->
         <van-list
           v-model:loading="AllData.loading"
           :finished="AllData.finished"
@@ -69,7 +66,6 @@
             </div>
           </div>
         </van-list>
-        <!-- </van-pull-refresh> -->
         <van-empty description="暂无消息" v-if="AllData.list.length == 0" />
       </div>
     </div>
@@ -78,18 +74,14 @@
 
 <script setup name="home_homePage">
 import axios from 'axios';
-import LogoImg from '@/assets/images/login/logo.png';
 import bj_icon from '@/assets/images/bj_icon.png';
-import { getImageUrl } from '@/utils/common.js';
-import { SeeMessage, queryUserMessageClass } from '@/api/meessageApi.js';
+import { getImageUrl, getCurrentPositon } from '@/utils/common.js';
 import { listMenu } from '@/api/publicApi.js';
 import { getCurrentInstance } from 'vue';
-import { showConfirmDialog } from 'vant';
-import { useRouter } from 'vue-router';
 import { useStore } from '@/pinia/store.js';
+
 const pinias = useStore();
 const { proxy } = getCurrentInstance();
-const router = useRouter();
 
 const AllData = reactive({
   locationName: '',
@@ -128,55 +120,10 @@
   },
 });
 
-// 获取消息统计
-const getMessageCount = () => {
-  let params = {
-    taskUserId: localStorage.getItem('LoginUserID'),
-  };
-  queryUserMessageClass(params).then((res) => {
-    // console.log(res.data.data);
-    if (res && res.data.code == 1) {
-      let datas = res.data.data;
-      AllData.typeListData[0].num = datas.messageNum; //消息通知
-      AllData.typeListData[1].num = datas.taskNum; //任务巡查
-      AllData.typeListData[2].num = datas.orderNum; //测站工单
-      AllData.typeListData[3].num = datas.alarmNum; //监测告警
-    }
-  });
-};
-
-// 获取当前城市
-const getCityName = () => {
-  let CityName = '';
-  // 安卓拿到的数据
-  let res = {
-    aoiName: '黄河大街与大梁路交叉口',
-    city: '开封市',
-    district: '龙亭区',
-    lat: 34.8,
-    lng: 114.32,
-    poiName: '',
-    province: '河南省',
-    street: '黄河大街与大梁路交叉口北160米',
-  };
-  AllData.locationName = res.province + res.city + res.district + res.aoiName;
-  if (res.city) {
-    CityName = res.city.replace(/市/g, '');
-  } else {
-    CityName = '开封';
-  }
-  axios
-    .get(
-      `https://gfapi.mlogcn.com/function/v001/city?location=${CityName}&items=10&area=china&language=CHN&withTz=false&withPoi=false&key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&output_type=json`
-    )
-    .then((res) => {
-      if (res && res.data.areaList) getWeather(res.data.areaList[0].areacode);
-    });
-};
 // 获取天气信息
-const getWeather = (code) => {
+const getWeather = () => {
   axios
-    .get(`https://gfapi.mlogcn.com/weather/v001/now?key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&areacode=${code}`)
+    .get(`https://gfapi.mlogcn.com/weather/v001/now?key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&areacode=101180801`)
     .then((res) => {
       AllData.weatherInfo = res.data.result.realtime;
     })
@@ -233,78 +180,6 @@
   // }
   AllData.loading = false;
 };
-// 列表数据刷新
-const onRefresh = () => {
-  // 清空列表数据
-  AllData.finished = false;
-  // 重新加载数据
-  // 将 loading 设置为 true，表示处于加载状态
-  AllData.loading = true;
-  onLoad();
-};
-// 点击消息处理
-const messageClick = (item) => {
-  if (item.status == 'read') {
-    // 消息已阅读
-    // proxy.showSuccessToast("此消息已阅读");
-    TypeToPath(item.type);
-  } else {
-    showConfirmDialog({
-      // message: `消息已查看,是否对 ${item.title} 进行处理?`,
-      message: item.content,
-      confirmButtonText: '去处理',
-      cancelButtonText: '仅查看',
-    })
-      .then(() => {
-        console.log(1);
-        SeeMessages(item, true);
-      })
-      .catch(() => {
-        console.log(2);
-        SeeMessages(item, false);
-      });
-  }
-};
-// 阅读消息
-const SeeMessages = async (item, bol) => {
-  const res = await SeeMessage(item.id);
-  if (res && res.data.code == 1) {
-    item.status = 'read';
-    if (bol) {
-      // 需要进行跳转
-      TypeToPath(item.type);
-    }
-  }
-};
-// 根据消息类型跳转对应的列表页
-const TypeToPath = (type) => {
-  console.log(type);
-  switch (type) {
-    case 'taskpatrol':
-      console.log('任务巡查');
-      router.push('/PatrolList');
-      break;
-    case 'station':
-      console.log('测站工单');
-      router.push('/measuringStationList');
-
-      break;
-    case 'alarm':
-      console.log('监测告警');
-      router.push('/monitorList');
-
-      break;
-    case 'other':
-      console.log('其他工单');
-
-      break;
-
-    default:
-      console.log('消息通知');
-      router.push('/message');
-      break;
-  }
-};
 
 /**
  * 获取菜单数据
@@ -312,19 +187,20 @@
 const getMenu = () => {
   pinias.showLoading();
   // 渲染全部菜单
-  listMenu().then((res) => {
+  listMenu({ userId: pinias.userNo }).then((res) => {
     if (res && res.code == 200) {
       AllData.typeListData = res.data;
-      console.log(res.data, 'res.data');
     }
     pinias.hideLoading();
   });
 };
 onMounted(() => {
   getMenu();
-  getCityName(); //获取当前城市
-  // onLoad();
-  // getMessageCount();
+  getWeather(); //获取天气
+  // 安卓拿到的数据
+  getCurrentPositon((lng, lat, address) => {
+    AllData.locationName = address;
+  });
 });
 </script>
 
@@ -472,16 +348,12 @@
       .typeList {
         width: 25%;
         text-align: center;
-        margin-top: 10px;
-        padding-top: 35px;
+        margin: 20px 0px;
         .typeImg {
           width: 85px;
           height: 80px;
         }
         .typeFont {
-          font-family: PingFang SC;
-          font-size: 20px;
-          color: #000000;
           line-height: 40px;
           text-align: center;
         }
@@ -490,7 +362,6 @@
     #listBox {
       width: 100%;
       margin-top: 20px;
-      // background: red;
       .ListClass {
         width: 100%;
         background: #ffffff;
@@ -518,8 +389,7 @@
         }
         .ListBottomA {
           width: 100%;
-          // height: calc(100vh - 900px);
-          // background: yellow;
+          height: 500px;
           overflow: auto;
           .ListBottom {
             width: 100%;

diff --git a/src/assets/images/personal/user.png b/src/assets/images/personal/user.png
new file mode 100644
index 0000000..dd4bb1d
--- /dev/null
+++ b/src/assets/images/personal/user.png
Binary files differ
diff --git a/src/assets/less/style.less b/src/assets/less/style.less
index 241d76e..4375fd3 100644
--- a/src/assets/less/style.less
+++ b/src/assets/less/style.less
@@ -1,14 +1,10 @@
 @import './global.less';
 
 :root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif, SourceHanSansCN-Regular;
-  font-size: 14px;
-  line-height: 24px;
+  font-family: Source Han Sans CN;
   font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+  font-size: 25px;
+  color: #121212;
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index 89a529b..a4b0656 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -32,15 +32,12 @@
           :key="index"
           @click="$router.push(item.path)"
         >
-          <!-- <van-badge :content="item.num" :show-zero="false"> -->
           <img class="typeImg" :src="getImageUrl(item.picUrl, 'images')" alt="" />
-          <!-- </van-badge> -->
           <div class="typeFont">{{ item.name }}</div>
         </div>
       </div>
-      <!-- 主要工单内容部分 -->
+      <!-- 报警信息 -->
       <div id="listBox">
-        <!-- <van-pull-refresh v-model="AllData.refreshing" @refresh="onRefresh"> -->
         <van-list
           v-model:loading="AllData.loading"
           :finished="AllData.finished"
@@ -69,7 +66,6 @@
             </div>
           </div>
         </van-list>
-        <!-- </van-pull-refresh> -->
         <van-empty description="暂无消息" v-if="AllData.list.length == 0" />
       </div>
     </div>
@@ -78,18 +74,14 @@
 
 <script setup name="home_homePage">
 import axios from 'axios';
-import LogoImg from '@/assets/images/login/logo.png';
 import bj_icon from '@/assets/images/bj_icon.png';
-import { getImageUrl } from '@/utils/common.js';
-import { SeeMessage, queryUserMessageClass } from '@/api/meessageApi.js';
+import { getImageUrl, getCurrentPositon } from '@/utils/common.js';
 import { listMenu } from '@/api/publicApi.js';
 import { getCurrentInstance } from 'vue';
-import { showConfirmDialog } from 'vant';
-import { useRouter } from 'vue-router';
 import { useStore } from '@/pinia/store.js';
+
 const pinias = useStore();
 const { proxy } = getCurrentInstance();
-const router = useRouter();
 
 const AllData = reactive({
   locationName: '',
@@ -128,55 +120,10 @@
   },
 });
 
-// 获取消息统计
-const getMessageCount = () => {
-  let params = {
-    taskUserId: localStorage.getItem('LoginUserID'),
-  };
-  queryUserMessageClass(params).then((res) => {
-    // console.log(res.data.data);
-    if (res && res.data.code == 1) {
-      let datas = res.data.data;
-      AllData.typeListData[0].num = datas.messageNum; //消息通知
-      AllData.typeListData[1].num = datas.taskNum; //任务巡查
-      AllData.typeListData[2].num = datas.orderNum; //测站工单
-      AllData.typeListData[3].num = datas.alarmNum; //监测告警
-    }
-  });
-};
-
-// 获取当前城市
-const getCityName = () => {
-  let CityName = '';
-  // 安卓拿到的数据
-  let res = {
-    aoiName: '黄河大街与大梁路交叉口',
-    city: '开封市',
-    district: '龙亭区',
-    lat: 34.8,
-    lng: 114.32,
-    poiName: '',
-    province: '河南省',
-    street: '黄河大街与大梁路交叉口北160米',
-  };
-  AllData.locationName = res.province + res.city + res.district + res.aoiName;
-  if (res.city) {
-    CityName = res.city.replace(/市/g, '');
-  } else {
-    CityName = '开封';
-  }
-  axios
-    .get(
-      `https://gfapi.mlogcn.com/function/v001/city?location=${CityName}&items=10&area=china&language=CHN&withTz=false&withPoi=false&key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&output_type=json`
-    )
-    .then((res) => {
-      if (res && res.data.areaList) getWeather(res.data.areaList[0].areacode);
-    });
-};
 // 获取天气信息
-const getWeather = (code) => {
+const getWeather = () => {
   axios
-    .get(`https://gfapi.mlogcn.com/weather/v001/now?key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&areacode=${code}`)
+    .get(`https://gfapi.mlogcn.com/weather/v001/now?key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&areacode=101180801`)
     .then((res) => {
       AllData.weatherInfo = res.data.result.realtime;
     })
@@ -233,78 +180,6 @@
   // }
   AllData.loading = false;
 };
-// 列表数据刷新
-const onRefresh = () => {
-  // 清空列表数据
-  AllData.finished = false;
-  // 重新加载数据
-  // 将 loading 设置为 true，表示处于加载状态
-  AllData.loading = true;
-  onLoad();
-};
-// 点击消息处理
-const messageClick = (item) => {
-  if (item.status == 'read') {
-    // 消息已阅读
-    // proxy.showSuccessToast("此消息已阅读");
-    TypeToPath(item.type);
-  } else {
-    showConfirmDialog({
-      // message: `消息已查看,是否对 ${item.title} 进行处理?`,
-      message: item.content,
-      confirmButtonText: '去处理',
-      cancelButtonText: '仅查看',
-    })
-      .then(() => {
-        console.log(1);
-        SeeMessages(item, true);
-      })
-      .catch(() => {
-        console.log(2);
-        SeeMessages(item, false);
-      });
-  }
-};
-// 阅读消息
-const SeeMessages = async (item, bol) => {
-  const res = await SeeMessage(item.id);
-  if (res && res.data.code == 1) {
-    item.status = 'read';
-    if (bol) {
-      // 需要进行跳转
-      TypeToPath(item.type);
-    }
-  }
-};
-// 根据消息类型跳转对应的列表页
-const TypeToPath = (type) => {
-  console.log(type);
-  switch (type) {
-    case 'taskpatrol':
-      console.log('任务巡查');
-      router.push('/PatrolList');
-      break;
-    case 'station':
-      console.log('测站工单');
-      router.push('/measuringStationList');
-
-      break;
-    case 'alarm':
-      console.log('监测告警');
-      router.push('/monitorList');
-
-      break;
-    case 'other':
-      console.log('其他工单');
-
-      break;
-
-    default:
-      console.log('消息通知');
-      router.push('/message');
-      break;
-  }
-};
 
 /**
  * 获取菜单数据
@@ -312,19 +187,20 @@
 const getMenu = () => {
   pinias.showLoading();
   // 渲染全部菜单
-  listMenu().then((res) => {
+  listMenu({ userId: pinias.userNo }).then((res) => {
     if (res && res.code == 200) {
       AllData.typeListData = res.data;
-      console.log(res.data, 'res.data');
     }
     pinias.hideLoading();
   });
 };
 onMounted(() => {
   getMenu();
-  getCityName(); //获取当前城市
-  // onLoad();
-  // getMessageCount();
+  getWeather(); //获取天气
+  // 安卓拿到的数据
+  getCurrentPositon((lng, lat, address) => {
+    AllData.locationName = address;
+  });
 });
 </script>
 
@@ -472,16 +348,12 @@
       .typeList {
         width: 25%;
         text-align: center;
-        margin-top: 10px;
-        padding-top: 35px;
+        margin: 20px 0px;
         .typeImg {
           width: 85px;
           height: 80px;
         }
         .typeFont {
-          font-family: PingFang SC;
-          font-size: 20px;
-          color: #000000;
           line-height: 40px;
           text-align: center;
         }
@@ -490,7 +362,6 @@
     #listBox {
       width: 100%;
       margin-top: 20px;
-      // background: red;
       .ListClass {
         width: 100%;
         background: #ffffff;
@@ -518,8 +389,7 @@
         }
         .ListBottomA {
           width: 100%;
-          // height: calc(100vh - 900px);
-          // background: yellow;
+          height: 500px;
           overflow: auto;
           .ListBottom {
             width: 100%;
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 78ba070..6dfce22 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -4,18 +4,14 @@
     <div id="HeaderBG">
       <div id="HeaderTop">
         <div id="PhotoBox">
-          <van-image id="PhotoID" round :src="AllData.userPhoto" />
+          <van-image id="PhotoID" round :src="UserDefault" />
         </div>
         <div id="InfoBox">
           <p id="userinfo1">
             <span id="userName">{{ pinias.userName }}</span>
-            <span id="roleName">{{ pinias.userDeptName }}</span>
           </p>
           <p id="userinfo2">{{ pinias.phonenumber }}</p>
         </div>
-        <div id="MessagesBox">
-          <img id="MessageImg" src="@/assets/images/my/tz_btn@.png" alt="" />
-        </div>
       </div>
     </div>
     <div id="CentBox">
@@ -44,12 +40,13 @@
       </van-cell-group>
     </div>
     <div id="BtmBox">
-      <van-button type="danger" block @click="logOut">退出登录</van-button>
+      <van-button type="danger" block @click="logOut" style="background: rgba(251, 106, 74, 1)">退出登录</van-button>
     </div>
   </div>
 </template>
 
 <script setup name="home_my">
+import UserDefault from '@/assets/images/personal/user.png';
 import typeImg1 from '@/assets/images/xxtz.png';
 import ListImg1 from '@/assets/images/my/xgmm_icon.png';
 import ListImg2 from '@/assets/images/my/APPewm_icon.png';
@@ -148,7 +145,7 @@
           width: 100%;
           height: 60px;
           line-height: 60px;
-          margin: 0;
+          margin-top: 15px;
           font-family: PingFang SC;
           font-weight: 500;
           font-size: 24px;

diff --git a/src/assets/images/personal/user.png b/src/assets/images/personal/user.png
new file mode 100644
index 0000000..dd4bb1d
--- /dev/null
+++ b/src/assets/images/personal/user.png
Binary files differ
diff --git a/src/assets/less/style.less b/src/assets/less/style.less
index 241d76e..4375fd3 100644
--- a/src/assets/less/style.less
+++ b/src/assets/less/style.less
@@ -1,14 +1,10 @@
 @import './global.less';
 
 :root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif, SourceHanSansCN-Regular;
-  font-size: 14px;
-  line-height: 24px;
+  font-family: Source Han Sans CN;
   font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+  font-size: 25px;
+  color: #121212;
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index 89a529b..a4b0656 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -32,15 +32,12 @@
           :key="index"
           @click="$router.push(item.path)"
         >
-          <!-- <van-badge :content="item.num" :show-zero="false"> -->
           <img class="typeImg" :src="getImageUrl(item.picUrl, 'images')" alt="" />
-          <!-- </van-badge> -->
           <div class="typeFont">{{ item.name }}</div>
         </div>
       </div>
-      <!-- 主要工单内容部分 -->
+      <!-- 报警信息 -->
       <div id="listBox">
-        <!-- <van-pull-refresh v-model="AllData.refreshing" @refresh="onRefresh"> -->
         <van-list
           v-model:loading="AllData.loading"
           :finished="AllData.finished"
@@ -69,7 +66,6 @@
             </div>
           </div>
         </van-list>
-        <!-- </van-pull-refresh> -->
         <van-empty description="暂无消息" v-if="AllData.list.length == 0" />
       </div>
     </div>
@@ -78,18 +74,14 @@
 
 <script setup name="home_homePage">
 import axios from 'axios';
-import LogoImg from '@/assets/images/login/logo.png';
 import bj_icon from '@/assets/images/bj_icon.png';
-import { getImageUrl } from '@/utils/common.js';
-import { SeeMessage, queryUserMessageClass } from '@/api/meessageApi.js';
+import { getImageUrl, getCurrentPositon } from '@/utils/common.js';
 import { listMenu } from '@/api/publicApi.js';
 import { getCurrentInstance } from 'vue';
-import { showConfirmDialog } from 'vant';
-import { useRouter } from 'vue-router';
 import { useStore } from '@/pinia/store.js';
+
 const pinias = useStore();
 const { proxy } = getCurrentInstance();
-const router = useRouter();
 
 const AllData = reactive({
   locationName: '',
@@ -128,55 +120,10 @@
   },
 });
 
-// 获取消息统计
-const getMessageCount = () => {
-  let params = {
-    taskUserId: localStorage.getItem('LoginUserID'),
-  };
-  queryUserMessageClass(params).then((res) => {
-    // console.log(res.data.data);
-    if (res && res.data.code == 1) {
-      let datas = res.data.data;
-      AllData.typeListData[0].num = datas.messageNum; //消息通知
-      AllData.typeListData[1].num = datas.taskNum; //任务巡查
-      AllData.typeListData[2].num = datas.orderNum; //测站工单
-      AllData.typeListData[3].num = datas.alarmNum; //监测告警
-    }
-  });
-};
-
-// 获取当前城市
-const getCityName = () => {
-  let CityName = '';
-  // 安卓拿到的数据
-  let res = {
-    aoiName: '黄河大街与大梁路交叉口',
-    city: '开封市',
-    district: '龙亭区',
-    lat: 34.8,
-    lng: 114.32,
-    poiName: '',
-    province: '河南省',
-    street: '黄河大街与大梁路交叉口北160米',
-  };
-  AllData.locationName = res.province + res.city + res.district + res.aoiName;
-  if (res.city) {
-    CityName = res.city.replace(/市/g, '');
-  } else {
-    CityName = '开封';
-  }
-  axios
-    .get(
-      `https://gfapi.mlogcn.com/function/v001/city?location=${CityName}&items=10&area=china&language=CHN&withTz=false&withPoi=false&key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&output_type=json`
-    )
-    .then((res) => {
-      if (res && res.data.areaList) getWeather(res.data.areaList[0].areacode);
-    });
-};
 // 获取天气信息
-const getWeather = (code) => {
+const getWeather = () => {
   axios
-    .get(`https://gfapi.mlogcn.com/weather/v001/now?key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&areacode=${code}`)
+    .get(`https://gfapi.mlogcn.com/weather/v001/now?key=F2hH0eoTQS99jaKr3v4AIWFQkJwRjMAU&areacode=101180801`)
     .then((res) => {
       AllData.weatherInfo = res.data.result.realtime;
     })
@@ -233,78 +180,6 @@
   // }
   AllData.loading = false;
 };
-// 列表数据刷新
-const onRefresh = () => {
-  // 清空列表数据
-  AllData.finished = false;
-  // 重新加载数据
-  // 将 loading 设置为 true，表示处于加载状态
-  AllData.loading = true;
-  onLoad();
-};
-// 点击消息处理
-const messageClick = (item) => {
-  if (item.status == 'read') {
-    // 消息已阅读
-    // proxy.showSuccessToast("此消息已阅读");
-    TypeToPath(item.type);
-  } else {
-    showConfirmDialog({
-      // message: `消息已查看,是否对 ${item.title} 进行处理?`,
-      message: item.content,
-      confirmButtonText: '去处理',
-      cancelButtonText: '仅查看',
-    })
-      .then(() => {
-        console.log(1);
-        SeeMessages(item, true);
-      })
-      .catch(() => {
-        console.log(2);
-        SeeMessages(item, false);
-      });
-  }
-};
-// 阅读消息
-const SeeMessages = async (item, bol) => {
-  const res = await SeeMessage(item.id);
-  if (res && res.data.code == 1) {
-    item.status = 'read';
-    if (bol) {
-      // 需要进行跳转
-      TypeToPath(item.type);
-    }
-  }
-};
-// 根据消息类型跳转对应的列表页
-const TypeToPath = (type) => {
-  console.log(type);
-  switch (type) {
-    case 'taskpatrol':
-      console.log('任务巡查');
-      router.push('/PatrolList');
-      break;
-    case 'station':
-      console.log('测站工单');
-      router.push('/measuringStationList');
-
-      break;
-    case 'alarm':
-      console.log('监测告警');
-      router.push('/monitorList');
-
-      break;
-    case 'other':
-      console.log('其他工单');
-
-      break;
-
-    default:
-      console.log('消息通知');
-      router.push('/message');
-      break;
-  }
-};
 
 /**
  * 获取菜单数据
@@ -312,19 +187,20 @@
 const getMenu = () => {
   pinias.showLoading();
   // 渲染全部菜单
-  listMenu().then((res) => {
+  listMenu({ userId: pinias.userNo }).then((res) => {
     if (res && res.code == 200) {
       AllData.typeListData = res.data;
-      console.log(res.data, 'res.data');
     }
     pinias.hideLoading();
   });
 };
 onMounted(() => {
   getMenu();
-  getCityName(); //获取当前城市
-  // onLoad();
-  // getMessageCount();
+  getWeather(); //获取天气
+  // 安卓拿到的数据
+  getCurrentPositon((lng, lat, address) => {
+    AllData.locationName = address;
+  });
 });
 </script>
 
@@ -472,16 +348,12 @@
       .typeList {
         width: 25%;
         text-align: center;
-        margin-top: 10px;
-        padding-top: 35px;
+        margin: 20px 0px;
         .typeImg {
           width: 85px;
           height: 80px;
         }
         .typeFont {
-          font-family: PingFang SC;
-          font-size: 20px;
-          color: #000000;
           line-height: 40px;
           text-align: center;
         }
@@ -490,7 +362,6 @@
     #listBox {
       width: 100%;
       margin-top: 20px;
-      // background: red;
       .ListClass {
         width: 100%;
         background: #ffffff;
@@ -518,8 +389,7 @@
         }
         .ListBottomA {
           width: 100%;
-          // height: calc(100vh - 900px);
-          // background: yellow;
+          height: 500px;
           overflow: auto;
           .ListBottom {
             width: 100%;
diff --git a/src/views/home/home_my.vue b/src/views/home/home_my.vue
index 78ba070..6dfce22 100644
--- a/src/views/home/home_my.vue
+++ b/src/views/home/home_my.vue
@@ -4,18 +4,14 @@
     <div id="HeaderBG">
       <div id="HeaderTop">
         <div id="PhotoBox">
-          <van-image id="PhotoID" round :src="AllData.userPhoto" />
+          <van-image id="PhotoID" round :src="UserDefault" />
         </div>
         <div id="InfoBox">
           <p id="userinfo1">
             <span id="userName">{{ pinias.userName }}</span>
-            <span id="roleName">{{ pinias.userDeptName }}</span>
           </p>
           <p id="userinfo2">{{ pinias.phonenumber }}</p>
         </div>
-        <div id="MessagesBox">
-          <img id="MessageImg" src="@/assets/images/my/tz_btn@.png" alt="" />
-        </div>
       </div>
     </div>
     <div id="CentBox">
@@ -44,12 +40,13 @@
       </van-cell-group>
     </div>
     <div id="BtmBox">
-      <van-button type="danger" block @click="logOut">退出登录</van-button>
+      <van-button type="danger" block @click="logOut" style="background: rgba(251, 106, 74, 1)">退出登录</van-button>
     </div>
   </div>
 </template>
 
 <script setup name="home_my">
+import UserDefault from '@/assets/images/personal/user.png';
 import typeImg1 from '@/assets/images/xxtz.png';
 import ListImg1 from '@/assets/images/my/xgmm_icon.png';
 import ListImg2 from '@/assets/images/my/APPewm_icon.png';
@@ -148,7 +145,7 @@
           width: 100%;
           height: 60px;
           line-height: 60px;
-          margin: 0;
+          margin-top: 15px;
           font-family: PingFang SC;
           font-weight: 500;
           font-size: 24px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 360c27f..2007405 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -43,6 +43,7 @@
           type="primary"
           native-type="submit"
           :loading="allData.loginLoading"
+          class="loginBtn"
           loading-text="登录中..."
         >
           登 录
@@ -202,7 +203,7 @@
     }
     .van-checkbox {
       margin: 20px 30px;
-      font-size: 24px;
+      font-size: 28px;
       .van-checkbox__label {
         color: #fff;
       }
@@ -221,9 +222,9 @@
       }
     }
     .van-button--primary {
-      background: #fff;
-      border-color: #fff;
-      color: #145bf7;
+      background: #1680ff;
+      border-color: #1680ff;
+      color: #fff;
       font-family: PingFang SC;
       font-size: 32px;
       font-style: normal;