大屏

bigScreen3/.env.production

@@ -7,12 +7,5 @@ VITE_APP_ENV = 'production'
 # 若依管理系统/生产环境
 # VITE_APP_BASE_API = 'http://1.194.161.64:8120/'
 # VITE_APP_BASE_WS = 'ws://172.16.211.153:9000/ws'
-VITE_APP_BASE_API = 'http://176.16.109.194:8120/'
-VITE_APP_BASE_WS = 'ws://176.16.109.29:9000/ws'
+VITE_APP_BASE_API = 'http://39.164.159.226:9090/'  
 
-VITE_APP_PHONE_TYPE = 'PHONE'
-VITE_APP_CALL_TYPE = 'VIOCE'
-VITE_APP_SIP_URL = 'ws://192.168.1.19:5066'
-VITE_APP_SIP_IP = '192.168.1.19'
-VITE_APP_SIP_PASSWORD = '1234'
-VITE_APP_SIP_CONTACT_URL = "@192.168.1.19;transport=ws"

bigScreen3/.env.staging

@@ -9,15 +9,3 @@ VITE_APP_ENV = 'staging'
 
 VITE_APP_BASE_API = 'http://222.139.29.127:8120/'
 # VITE_APP_BASE_API = 'http://39.164.159.226:8120/'
-
-# VITE_APP_BASE_WS = 'ws://192.168.1.19:9000/ws'
-VITE_APP_BASE_WS = 'ws://222.139.29.127:9000/ws'
-
-VITE_APP_PHONE_TYPE = 'PHONE'
-VITE_APP_CALL_TYPE = 'VIOCE'
-VITE_APP_SIP_URL = 'ws://192.168.1.19:5066'
-VITE_APP_SIP_IP = '192.168.1.19'
-VITE_APP_SIP_PASSWORD = '1234'
-VITE_APP_SIP_CONTACT_URL = "@192.168.1.19;transport=ws"
-# 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip

bigScreen3/src/api/index.js

@@ -34,7 +34,7 @@ export function createPageData(url, data) {
   return request({
     url,
     method: 'post',
-    data
+    data: {data}
   })
 }
 // 修改

bigScreen3/src/router/index.js

@@ -1,7 +1,5 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import Dashboard from '@/views/dashboard/Dashboard.vue';
-import ChildMap from '@/views/childMap/childMap.vue';
-import orderList from '@/views/orderList/orderList.vue';
 
 import ceshi from '@/views/ceshi.vue';
 
@@ -18,16 +16,6 @@ const routes = [
     component: Dashboard,
   },
   {
-    path: '/childMap',
-    name: 'ChildMap',
-    component: ChildMap,
-  },
-  {
-    path: '/orderList',
-    name: 'OrderList',
-    component: orderList,
-  },
-  {
     path: '/ceshi',
     name: 'Ceshi',
     component: ceshi,

bigScreen3/src/utils/request.js

@@ -32,15 +32,17 @@ const service = axios.create({
 })
 
 // request拦截器
-service.interceptors.request.use(
-  (config) => {
-    // 是否需要设置 token
-    const isToken = (config.headers || {}).isToken === false
-    // 是否需要防止数据重复提交
-    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-    if (getToken() && !isToken) {
-      config.headers['token'] =  getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-    }
+  service.interceptors.request.use(
+    (config) => {
+      // 是否需要设置 token
+      const isToken = (config.headers || {}).isToken === false
+      // 是否需要防止数据重复提交
+      const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+      if (getToken() && !isToken) {
+        config.headers['token'] =  getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      }
+      // 添加fsource头部
+      config.headers['fsource'] = 2
     // 添加缓存控制头，避免304 Not Modified问题
     // config.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
     // config.headers['Pragma'] = 'no-cache'
@@ -103,9 +105,22 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   (res) => {
     // 未设置状态码则默认成功状态
-    const code = res.data.code || 200
+    console.log('res', res)
+    const code = res.data.status || 200
     // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    const msg = errorCode[code] || res.data.message || errorCode['default']
+    
+    // 处理状态码600且消息为"当前请求中无token，请先登录"的情况
+    if (code === 600 && msg === '当前请求中无token，请先登录') {
+      ElMessage.error(msg)
+      // 清除token和用户信息
+      localStorage.removeItem('token')
+      sessionStorage.removeItem('token')
+      // 跳转到登录页面
+      router.push('/login')
+      return Promise.reject(new Error(msg))
+    }
+    
     // 二进制数据则直接返回
     if (
       res.request.responseType === 'blob' ||

bigScreen3/src/views/childMap/childMap.vue

@@ -1,420 +0,0 @@
-<template>
-    <div class="dashboard">
-        <!-- 标题区域 -->
-        <header class="dashboard-header">
-            <!-- <h1>智慧城市数据大屏</h1> -->
-            <div class="child_title_text" style="font-size: 1.8vw; margin-top: 1vh;">12356心理援助热线大数据信息平台</div>
-            <!-- <div class="time">{{ currentTime }}</div> -->
-        </header>
-
-        <!-- 数据展示区域 -->
-        <div class="child-content">
-            <div class="child-title">
-                <div class="child_title_text">{{areaName}}各地区数据分析</div>
-                
-            </div>
-            <div class="child-warp">
-                <div class="left-section">
-                    <div class="left-title">
-                        <div class="tit_left">
-                            <span style="cursor: pointer;" @click="goToPage('/')">郑州市</span> /
-                            <span style="cursor: pointer;" @click="goToPage('/childMap')">{{ areaName }}</span>
-                        </div>
-                        <div class="tit_right">2024-03-25</div>
-                    </div>
-                    <div class="left-item1">
-                        <div class="center_item2_tit">
-                            <el-button class="btn_tit">工单类型</el-button>
-                        </div>
-                        <div class="item2_con">
-                            <div class="item2_con_tit">
-                                <div style="width: 50%;">工单类别</div>
-                                <div style="width: 25%;">数量</div>
-                                <div style="width: 25%;">百分比</div>
-                            </div>
-                            <div class="scroll-container item2_con_con" ref="scrollContainerRef"
-                                @mouseenter="pauseScroll" @mouseleave="resumeScroll">
-                                <div class="con_list" v-for="item in orderTypeData" :key="item.id">
-                                    <div style="width: 50%; color: #50AEF8;">{{ item.name }}</div>
-                                    <div style="width: 25%;">{{ item.number }}</div>
-                                    <div style="width: 25%;">{{ item.rate }}</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="left_item2">
-
-                        <div class="item_left">
-                            <div class="center_item2_tit">
-                                <el-button class="btn_tit">关键词</el-button>
-                            </div>
-                            <VueWordCloud style="width: 86%; height: 23vh; margin: 5% 7%;" :words="keyWordData"
-                                :color="getColorByWeight" />
-                        </div>
-                        <div class="item_right">
-                            <div class="item_right_tit"></div>
-                            <div class="item_right_con">
-
-                                <div class="item2_con_con">
-                                    <div class="con_list" v-for="(item, index) in wordData" :key="item.id">
-                                        <div style="width: 15%; color: #ffffff;">
-                                            
-                                            <div class="sort_bj" v-if="index<3">{{ index + 1 }}</div>
-                                            <div class="sort_default"  v-else>{{ index + 1 }}</div>
-                                        </div>
-                                        <div style="width: 60%;">{{item.name}}</div>
-                                        <div style="width: 25%;">{{item.number}}</div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="right-section">
-                    <ChildMapChart ></ChildMapChart>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import { useDataStore } from '@/stores/data'
-import { getPageListData } from '@/api/index.js'
-import VueWordCloud from 'vuewordcloud';
-import ChildMapChart from '@/views/childMap/cpns/child-map-chart.vue'
-import { useRouter, useRoute } from 'vue-router';
-
-
-
-const router = useRouter()
-const route = useRoute();
-const areaName = ref(route.query.area || '');
-const areaId = ref(route.query.areaId || '');
-const dataStore = useDataStore()
-const currentTime = ref('')
-
-// 实时时钟
-let timer = null
-const updateTime = () => {
-    currentTime.value = new Date().toLocaleString()
-}
-
-// 初始化数据
-onMounted(() => {
-    init()
-    timer = setInterval(updateTime, 1000)
-    dataStore.fetchRealTimeData()
-})
-function init() {
-    getOrderType()
-    getWordData()
-}
-// 工单类型
-const orderTypeData = ref({})
-function getOrderType() {
-    const params = {
-        area: areaId.value,
-    }
-    getPageListData('/DataAnalysis/selectBusinessType/0', params).then((res) => {
-        if (res.state === 'success') {
-            orderTypeData.value = res.data.slice(0, 5)
-        }
-    })
-}
-
-//关键词
-const wordData = ref([]);
-const keyWordData = ref([])
-function getWordData() {
-    const params = {
-        area: areaId.value,
-    }
-    getPageListData('/DataAnalysis/selectAreaKeywordCount/0', params).then((res) => {
-        if (res.state === 'success') {
-            wordData.value = res.data
-            keyWordData.value = []
-            res.data.map(item => {
-                const obj ={}
-                obj.text = item.name
-                obj.weight = item.number
-                keyWordData.value.push(obj)
-            })
-        }
-    })
-}
-const corlorData = ref(['#FF3333','#FF6600','#FFCC00','#99CC33','#33CCFF','#0066CC','#9933CC','#336633','#663300','#1A1A1A'])
-const getColorByWeight = (word, index) => {
-    return corlorData.value[index];
-};
-
-// 跳转链接
-function goToPage(params) {
-    router.push({
-        path: params,
-        // query: {
-        //     callNumber:telWSData.Number,
-        //     callid: telWSData.CallID,
-        // }
-    });
-}
-</script>
-
-<style lang="scss" scoped>
-.child_title_text{
-    font-weight: bold;
-    font-size: 1.3vw;
-    background: linear-gradient(to bottom, #07B9FF, #F3FDFF);
-    /* 将背景裁剪到文字区域，-webkit- 前缀用于兼容 Safari 等浏览器 */
-    -webkit-background-clip: text;
-    background-clip: text;
-    /* 使文字颜色透明，显示出渐变背景，-webkit- 前缀用于兼容 Safari 等浏览器 */
-    -webkit-text-fill-color: transparent;
-    text-fill-color: transparent;
-}
-.dashboard {
-    height: 100vh;
-    display: grid;
-    grid-template-rows: 8.5vh 1fr;
-    padding: 1vh;
-    gap: 1vh;
-    background: url('@/assets/bj.png') no-repeat;
-    background-size: 100% 100%;
-
-    .dashboard-header {
-        /* width: 89%; */
-        background: url('@/assets/title_bg_child.png') no-repeat;
-        background-size: 100% 100%;
-
-        .title_text {
-            background: url('@/assets/title_text_bg.png') no-repeat;
-            background-size: 100% 100%;
-            width: 33%;
-            height: 4vh;
-            margin: 0 auto;
-            margin-top: 2vh;
-        }
-
-        .time {
-            text-align: left;
-            font-size: 0.8vw;
-            color: #ffffff;
-            margin-left: 4%;
-            margin-top: -2.5vh;
-        }
-    }
-
-    .child-content {
-        .child-title {
-            background: url('@/assets/child_title_bg.png') no-repeat;
-            background-size: 100% 100%;
-            height: 5vh;
-            line-height: 5vh;
-
-            .title_text {
-                background: url('@/assets/title_text_bg.png') no-repeat;
-                background-size: 100% 100%;
-                width: 33%;
-                height: 4vh;
-                margin: 0 auto;
-                margin-top: 2vh;
-            }
-        }
-
-        .child-warp {
-            background: url('@/assets/child_border_bj.png') no-repeat;
-            background-size: 100% 100%;
-            display: flex;
-            width: 96%;
-            margin: 0 auto;
-
-            .left-section {
-                text-align: left;
-                width: 30%;
-                margin: 0 auto;
-
-                .left-title {
-                    font-size: 1vw;
-                    color: #ffffff;
-                    line-height: 5vh;
-                    display: flex;
-                    width: 96%;
-                    margin: 0 auto;
-
-                    .tit_left {
-                        width: 50%;
-                    }
-
-                    .tit_right {
-                        width: 50%;
-                        text-align: right;
-                    }
-                }
-
-                .center_item2_tit {
-                    font-size: 0.9vw;
-                    color: #FEFFFF;
-                    text-align: left;
-                    margin-left: 1%;
-                    line-height: 5vh;
-                    height: 5vh;
-
-                    // 
-                    .btn_tit {
-                        background: url('@/assets/childBtn_bj.png') no-repeat;
-                        color: #ffffff;
-                        background-size: cover;
-                        border: none;
-                        width: 120px;
-                    }
-                }
-
-
-                .left-item1 {
-                    background: url('@/assets/orderTypeBoder.png') no-repeat;
-                    background-size: 100% 100%;
-                    width: 98%;
-                    margin: 0 auto;
-                    height: 40vh;
-                    padding: 1%;
-
-
-                    .item2_con {
-                        .item2_con_tit {
-                            background: url('@/assets/order_type_tit_bg.png') no-repeat;
-                            background-size: 100% 100%;
-                            font-size: 0.8vw;
-                            line-height: 3.6vh;
-                            height: 3.6vh;
-                            overflow: hidden;
-                            /* display: flex; */
-                            width: 100%;
-
-                            div {
-                                float: left;
-                                background: #102648;
-                                background: url('@/assets/con_list_div.png') no-repeat;
-                                background-size: 100% 100%;
-                                line-height: 3vh;
-                                height: 3vh;
-                                text-align: center;
-                                /* white-space: nowrap;  
-                                overflow: hidden;
-                                text-overflow: ellipsis; */
-                            }
-                        }
-
-                        .item2_con_con {
-                            font-size: 0.7vw;
-
-                            .con_list {
-                                width: 100%;
-                                overflow: hidden;
-                                /* display: flex; */
-                                border-bottom: 1px solid #4B5D7D;
-
-                                div {
-                                    float: left;
-                                    line-height: 6vh;
-                                    height: 6vh;
-                                    text-align: center;
-                                    // white-space: nowrap;
-                                    // overflow: hidden;
-                                    // text-overflow: ellipsis;
-                                }
-                            }
-
-                            .con_list:last-child {
-                                border-bottom: none;
-                            }
-                        }
-
-                    }
-                }
-
-                .left_item2 {
-                    background: url('@/assets/keys_border.png') no-repeat;
-                    background-size: 100% 100%;
-                    width: 98%;
-                    margin: 0 auto;
-                    height: 35vh;
-                    padding: 1%;
-                    display: flex;
-
-                    .item_left {
-                        width: 70%;
-                    }
-
-                    .item_right {
-                        width: 28%;
-                        margin-top: 1vh;
-                        height: 32vh;
-                        background: url('@/assets/key_bj.png') no-repeat;
-                        background-size: 100% 100%;
-
-                        .item_right_tit {
-                            background: url('@/assets/keys_top10.png') no-repeat;
-                            background-size: 100% 100%;
-                            width: 65%;
-                            margin-left: 5%;
-                            margin-top: 0.6vh;
-                            height: 2vh;
-                        }
-
-                        .item_right_con {
-                            .item2_con_con {
-                                font-size: 0.7vw;
-
-                                .con_list {
-                                    width: 90%;
-                                    margin: 0 auto;
-                                    overflow: hidden;
-                                    /* display: flex; */
-                                    // border-bottom: 1px solid #4B5D7D;
-
-                                    div {
-                                        float: left;
-                                        line-height: 3vh;
-                                        height: 2.9vh;
-                                        text-align: center;
-                                        // white-space: nowrap;
-                                        // overflow: hidden;
-                                        // text-overflow: ellipsis;
-                                        .sort_bj{
-                                            margin-top: 0.5vh;
-                                            width: 20px;
-                                            height: 20px;
-                                            line-height: 20px;
-                                            text-align: center;
-                                            background: url('@/assets/sort_bj.png') no-repeat;
-                                            background-size: 100% 100%;
-                                        }
-                                        .sort_default{
-                                            width: 20px;
-                                            height: 20px;
-                                            line-height: 3vh;
-                                            text-align: center;
-                                        }
-                                    }
-                                }
-
-                                .con_list:last-child {
-                                    border-bottom: none;
-                                }
-                            }
-
-                        }
-                    }
-                }
-            }
-
-            .right-section {
-                width: 66%;
-                margin: 0 auto;
-            }
-        }
-
-    }
-}
-</style>

bigScreen3/src/views/childMap/cpns/child-map-chart.vue

@@ -1,376 +0,0 @@
-<template>
-  <div style="position: relative;width: 100%; height: 70vh;">
-    <div ref="mapRef" style="width: 100%; height: 70vh;"></div>
-  </div>
-</template>
-
-<script setup>
-import { onMounted, ref,onBeforeUnmount } from 'vue';
-import * as echarts from 'echarts';
-
-import { dengfengmapData } from '@/assets/json/dengfeng.js' // 登封市 1755
-import { erqiqumapData } from '@/assets/json/erqiqu.js' // 二七区 1745 
-import { gaoxinmapData } from '@/assets/json/gaoxinqu.js' // 高新区 1757
-import { gongyishimapData } from '@/assets/json/gongyishi.js' // 巩义市 1751
-import { guanchengqumapData } from '@/assets/json/guanchengqu.js' // 管城回族区 1746 
-import { huijiqumapData } from '@/assets/json/huijiqu.js' // 惠济区 1749 
-import { jinshuiqumapData } from '@/assets/json/jinshuiqu.js' // 金水区 1747 
-import { shangjiequmapData } from '@/assets/json/shangjiequ.js' // 上街区  1748  
-import { xingyangmapData } from '@/assets/json/xingyang.js' // 荥阳市 1752 
-import { xinmishimapData } from '@/assets/json/xinmishi.js' //  新密市 1753     
-import { xinzhengshimapData } from '@/assets/json/xinzhengshi.js' // 新郑市  1754
-import { zhengdongxinqumapData } from '@/assets/json/zhengdongxinqu.js' // 郑东新区 1756
-import { zhongmuxianmapData } from '@/assets/json/zhongmuxian.js' // 中牟县  1750
-import { zhongyuanqumapData } from '@/assets/json/zhongyuanqu.js' // 中原区 1744
-
-import { jingkaiqumapData } from '@/assets/json/jingkaiqu.js' // 经济开发区  410171
-import { hangkonggangqumapData } from '@/assets/json/hangkonggangqu.js' // 航空港区 410173
-
-import { getPageListData } from '@/api/index.js'
-import { useRouter, useRoute } from 'vue-router';
-
-const mapRef = ref(null);
-const callRegionData = ref([])
-const orderCountData = ref([])
-let myChart = null
-const router = useRouter()
-const route = useRoute()
-const parentAreaName = ref(route.query.area)
-const parentAreaId = ref(route.query.areaId)
-const mapData = ref([])
-let timerChildChart = null
-
-onMounted(async () => {
-  
-  myChart = echarts.init(mapRef.value);
-  // 加载区县地图数据，这里假设地图文件名为
-  console.log(getMapData(parentAreaId.value))
-  echarts.registerMap('districtMap', getMapData(parentAreaId.value));
-  getSelectRegionOrderCount(0)
-  timerChildChart = setInterval(()=>{
-    getSelectRegionOrderCount(0)
-  },60*1000)
-  
-});
-onBeforeUnmount(() => {
-    clearInterval(timerChildChart)
-})
-function getMapData(key) {
-  let resultData 
-  console.log(key)
-  switch (key*1) {
-    case 1755: // 登封市 1755
-      resultData = dengfengmapData
-      break;
-    case 1745: // 二七区 1745 
-      resultData = erqiqumapData
-      break;
-    case 1757: // 高新区 1757
-      resultData = gaoxinmapData
-      break;
-    case 1751: // 巩义市 1751
-      resultData = gongyishimapData
-      break;
-    case 1746: // 管城回族区 1746 
-      resultData = guanchengqumapData
-      break;
-      case 1749: // 惠济区 1749 
-      resultData = huijiqumapData
-      break;
-    case 1747: // 金水区 1747 
-      resultData = jinshuiqumapData
-      break;
-    case 1748: // 上街区  1748
-      resultData = shangjiequmapData
-      break;
-    case 1752: // 荥阳市 1752
-      resultData = xingyangmapData
-      break;
-    case 1753: //  新密市 1753
-      resultData = xinmishimapData
-      break;
-      case 1754: // 新郑市  1754
-      resultData = xinzhengshimapData
-      break;
-    case 1756: // 郑东新区 1756
-      resultData = zhengdongxinqumapData
-      break;
-    case 1750: // 中牟县  1750
-      resultData = zhongmuxianmapData
-      break;
-    case 1744: // 中原区 1744
-      resultData = zhongyuanqumapData
-      break;
-    case 49346: // 经济开发区  49346
-      resultData = jingkaiqumapData
-      break;
-    case 49347: // 航空港区 49347
-      resultData = hangkonggangqumapData
-      break;
-  }
-  return resultData
-}
-const callRegionType = ref(0)
-function dataTypeHandle(e) {
-  callRegionType.value = e
-  getSelectRegionOrderCount(e)
-}
- // 话务统计
- const maxDataValue = ref(1)
-function getSelectRegionOrderCount(type) {
-  const params ={
-    area: parentAreaId.value,
-  }
-  getPageListData('/DataAnalysis/selectRegionOrderCount/'+type,params ).then((res)=>{
-      if (res.state === 'success') {
-        callRegionData.value = []
-        if (res.data.length>0) {
-          orderCountData.value = res.data
-          maxDataValue.value = getMaxByProperty(res.data, 'number').number
-          res.data.map(item => {
-            const obj ={}
-            obj.value = item.number
-            obj.name = item.name
-            callRegionData.value.push(obj)
-          })
-          setOptionHandle()
-        }
-        
-      }
-  })
-}
-function getMaxByProperty(arr, prop) {
-  if (!Array.isArray(arr) || arr.length === 0) return null;
-  
-  let max = -Infinity;
-  let result = null;
-
-  for (const item of arr) {
-    const value = Number(item[prop]);
-    if (!isNaN(value) && value > max) {
-      max = value;
-      result = item; // 保留完整对象
-    }
-  }
-
-  return result; // 返回最大值对象（或根据需要返回 max）
-}
-
-function setOptionHandle() {
-  // 模拟各区县的数量数据
-  const districtData = [
-    { name: '城关乡', value: 20 },
-    { name: '索河街道', value: 150 },
-    { name: '高村乡', value: 15 },
-    { name: '王村镇', value: 10 },
-    { name: '泗水镇', value: 20 },
-    { name: '广武镇', value: 10 },
-    { name: '刘河镇', value: 150 },
-    { name: '崔庙镇', value: 10 },
-    { name: '贾峪镇', value: 10 },
-    { name: '乔楼镇', value: 20 },
-    { name: '金寨回族乡', value: 15 },
-    { name: '高山镇', value: 10 },
-    { name: '豫龙街道', value: 5 },
-  ];
-  const option = {
-    // tooltip: {
-    //   trigger: 'item'
-    // },
-    tooltip: {
-				trigger: 'item',
-				textStyle: {
-					color: '#fff',
-					fontSize: '16',
-					fontWeight: '600'
-				},
-				position: 'top',
-				backgroundColor: 'rgba(250,250,250,0)',
-				transitionDuration: 0.4,
-				formatter: function(params) {
-					let str=''
-					orderCountData.value.forEach(function(v,n){
-						if(v.name==params.name){
-							str='<div class="wrapp">'+
-                    '<p>'+ v.name+ '</p>'+
-                    '<ul class="mapWrap">'+
-                      '<li><label>工单量：</label>'+v.number +'</li>'+
-                      '<li><label>电话量：</label>'+v.callNumber +'</li>'+
-                      '<li><label>回访量：</label>'+v.visitNumber +'</li>'+
-                      '<li><label>满意度：</label>'+v.mydRate+'</li>'+
-                    '</ul>'+
-                  '</div>'
-						}
-					})
-					return str
-				}
-			},
-    visualMap: {
-      min: 0,
-      max: maxDataValue.value,
-      text: ['高', '低'],
-      realtime: false,
-      calculable: true,
-      inRange: {
-        color: ['#04B8D6', '#3079D5', '#9E2650']
-      },
-      right: '2%', // 距离右侧 10%
-      bottom: '-0%' // 距离底部 10%
-    },
-    series: [
-      {
-        name: '区县数量热力图',
-        type: 'map',
-        map: 'districtMap',
-        top: '15%', // 让地图整体靠下，距离顶部 10%
-        label: {
-          show: true, // 显示文字标签
-          color: '#fff', // 文字颜色
-          fontSize: 12, // 文字大小
-          fontWeight: 'normal', // 文字粗细
-          formatter: '{b}', // 显示区域名称（{b} 是区域名称）
-        },
-        data: callRegionData.value,
-        // data: districtData,
-        // 设置选中（点击）时的样式
-        selectedMode: 'single',
-        itemStyle: {
-            selected: {
-                areaColor: 'red'
-            },
-            emphasis: {
-               // 鼠标悬停时的背景色
-							areaColor: '#052F59',
-              label: {
-                show: true, // 鼠标悬停时显示文字标签
-                color: '#ffffff', // 悬浮时文字颜色（设置为橙色）
-              },
-						},
-        },
-      }
-    ]
-  };
-
-  myChart.setOption(option);
-
-  // 监听地图的点击事件
-  myChart.on('click', function (params) {
-      // params 包含了点击区域的详细信息
-      console.log(params)
-      console.log('点击的地区名称：', params.name);
-      console.log('点击地区对应的值：', params.value);
-      console.log(params.name)
-      let paramsObj = {}
-      orderCountData.value.map(item => {
-        if (item.name === params.name) {
-            paramsObj = item
-        }
-      })
-      router.push({
-          path: '/orderList',
-          query: {
-              pName: parentAreaName.value,
-              pId: parentAreaId.value,
-              area: params.name,
-              areaId: paramsObj.region,
-          }
-      });
-  });
-}
-</script>
-<style>
-.wrapp{
-  background: url('@/assets/map_frame.png') no-repeat;
-	position: absolute;
-	width: 230px;
-	height: 224px;
-	padding: 8px 20px ;
-	z-index: 800000000000000000;
-	background-size: 100% 100%;
-	color: #fff;
-	top: -115px ;
-	left: -100px;
-}
-.mapWrap{
-	width: 145px;
-	height: 97px;
-	position: absolute;
-	top:69px;
-	left: 49px;
-	font-size: 15px;
-  text-align: left;
-}
-.mapWrap li,.mapWrap{
-  list-style: none;
-  
-}
-.wrapp p{
-	position: absolute;
-	top:42px;
-	left: 98px;
-}
-</style>
-
-<style scoped  lang="scss">
-
-/* 可按需添加样式 */
-.btnCen{
-    z-index: 111;
-    text-align: left;
-    margin-top: 1.5vh;
-    position: absolute;
-    top: 0vh;
-    right: 2%;
-    width: 90%;
-    display: flex;
-    .cenItem{
-      width: 33%;
-      display: flex;
-      .cenItemImg {
-        width: 28%;
-        height: 5vh;
-        background: url(/src/assets/con_right.png) no-repeat;
-        background-size: 100% 100%;
-      }
-    }
-    .btnCen1{
-        background: url('@/assets/btnCen1.png') no-repeat; 
-        color: #ffffff;
-        background-size: cover;
-        border: none;
-    }
-    .btnCen2{
-        background: url('@/assets/btnCen2.png') no-repeat; 
-        color: #ffffff;
-        background-size: cover;
-        border: none;
-    }
-}
-.mapSelect{
-  height: 10vh;
-  background: url('@/assets/mapSelect.png') no-repeat;
-  background-size: 100% 100%;
-  width: 20%;
-  position: absolute;
-  right: 2%;
-  bottom: -3vh;
-  .select_bj{
-    width: 100%;
-    height: 2.5vh;
-    line-height: 2.5vh;
-    background: url('@/assets/select_bj.png') no-repeat;
-    background-size: 100% 100%;
-    font-size: 0.6vw;
-    text-align: left;
-    padding-left: 8%;
-  }
-  .select_item{
-      color: #D0DEEE;
-      font-size: 0.5vw;
-      padding-left: 8%;
-      text-align: left;
-      height: 2.5vh;
-      line-height: 2.5vh;
-    }
-}
-</style>

bigScreen3/src/views/dashboard/cpns/SmartOperation.vue

@@ -1263,7 +1263,7 @@ onBeforeUnmount(() => {
   // 设备运维选项卡样式
   .maintenance-tabs {
     position: absolute;
-    top: 12vh;
+    top: 15vh;
     left: 1vh;
     z-index: 100;
     display: flex;

bigScreen3/src/views/dashboard/dashboard.vue

@@ -146,10 +146,10 @@
 
 <script setup>
     import { ref, onMounted, onBeforeUnmount } from 'vue'
-    import { ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus'
+    import { useRouter } from 'vue-router'
+    import { ElDropdown, ElDropdownMenu, ElDropdownItem, ElMessage, ElMessageBox } from 'element-plus'
     import { loadAMap } from '@/utils/amap.js'
 
-    import { useDataStore } from '@/stores/data'
     import { getPageListData, createPageData } from '@/api/index'
     import icon1_1 from '@/assets/icon1.1.png'
     import icon1_2 from '@/assets/icon1.2.png'
@@ -183,7 +183,7 @@
     import weatherQingIcon from '@/assets/weatherimgs/icon_qing.png'    
 
 
-    const dataStore = useDataStore()
+    const router = useRouter()
     
     // 静态数据
     const weatherDesc = ref('多云')
@@ -248,9 +248,59 @@
         }
     }
     // 退出登录
-    const handleLogout = () => {
-        // 退出逻辑
-        console.log('退出登录')
+    const handleLogout = async () => {
+        try {
+            // 显示确认对话框
+            const confirmResult = await ElMessageBox.confirm(
+                '确定要退出登录吗？',
+                '退出登录确认',
+                {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }
+            )
+            
+            // 用户点击确定后执行退出逻辑
+            if (confirmResult === 'confirm') {
+                // 1. 调用后端退出登录API
+                const response = await createPageData('/syslogin/loginOut', {})
+                if (response && response.status === 200) {
+                    // 2. 清除本地存储的用户信息和token
+                    localStorage.removeItem('token')
+                    localStorage.removeItem('userInfo')
+                    sessionStorage.removeItem('token')
+                    sessionStorage.removeItem('userInfo')
+                }
+                
+                // 3. 显示退出成功提示
+                ElMessage.success('退出登录成功')
+                
+                // 4. 跳转到登录页面
+                setTimeout(() => {
+                    router.replace('/login')
+                }, 1000)
+            }
+            
+        } catch (error) {
+            // 如果是用户取消操作，则不执行任何操作
+            if (error === 'cancel') {
+                return
+            }
+            
+            console.error('退出登录失败:', error)
+            ElMessage.error('退出登录失败，请重试')
+            
+            // 即使API调用失败，也要清理本地信息并跳转
+            localStorage.removeItem('token')
+            localStorage.removeItem('userInfo')
+            sessionStorage.removeItem('token')
+            sessionStorage.removeItem('userInfo')
+            
+            setTimeout(() => {
+                router.replace('/login')
+            }, 1000)
+        }
     }
     
     // 处理项目选择
@@ -284,7 +334,6 @@
         timer = setInterval(updateTime, 1000)
         fetchProjectList() // 获取项目列表
         getWeatherByCity() // 获取天气信息
-        // dataStore.fetchRealTimeData()
     })
 
     onBeforeUnmount(() => {
@@ -431,13 +480,13 @@
                 .center_item1{
                     height: 46vh;
                     margin-top: 1vh;
-                    background: url('@/assets/center_bg.png') no-repeat;
+                    // background: url('@/assets/center_bg.png') no-repeat;
                     background-size: 100% 100%;
                 }
                 
                 .center_item2{
                     height: 35vh;
-                    background: url('@/assets/center_item2.png') no-repeat;
+                    // background: url('@/assets/center_item2.png') no-repeat;
                     background-size: 100% 100%;
                     width: 100%;
                     margin: 0 auto;

bigScreen3/src/views/orderList/orderList.vue

@@ -1,442 +0,0 @@
-<template>
-    <div class="dashboard">
-        <!-- 标题区域 -->
-        <header class="dashboard-header">
-            <!-- <h1>智慧城市数据大屏</h1> -->
-            <div class="child_title_text" style="font-size: 1.8vw; margin-top: 1vh;">12356心理援助热线大数据信息平台</div>
-            <!-- <div class="time">{{ currentTime }}</div> -->
-        </header>
-
-        <!-- 数据展示区域 -->
-        <!-- <LineChart :values="values" :xLabels="xLabels" color="#00FF87" auto-resize theme="dark" @chart-click="handleChartClick" /> -->
-        <div class="child-content">
-            <div class="child-title">
-                <div class="child_title_text">郑州市12356热线工单</div>
-            </div>
-            <div class="child-warp">
-                <div class="center_item2_tit">
-                    <span class="btn_tit" @click="goToPage('/')">郑州市</span> /
-                    <span class="btn_tit" @click="goToPage('/childMap')">{{ parentName }}</span>/
-                    <span class="btn_tit">{{ areaName }} 区域工单</span>
-                </div>
-                <div class="center_item2_search">
-                    <el-input class="search_item" v-model="queryParams.workordercode" placeholder="请输入编号" clearable
-                        @blur="getWorkorder" />
-                    <el-input class="search_item" v-model="queryParams.createusername" placeholder="请输入受理人姓名" clearable
-                        @blur="getWorkorder" />
-                    <el-cascader v-model="queryParams.workordercate" :options="orderTypes" placeholder="请选择工单类型"
-                        :props="{ value: 'id', children: 'children', }" @change="getWorkorder" clearable />
-
-                    <el-date-picker class="search_item" v-model="searchTimes" type="datetimerange" range-separator="至"
-                        start-placeholder="开始时间" end-placeholder="结束时间" clearable @change="timeChange" />
-                </div>
-                <div class="item2_con">
-                    <div class="item2_con_tit" style="width: 100%;">
-                        <div style="width: 200px;">工单编号</div>
-                        <div style="width: 180px;">工单类型</div>
-                        <div style="width: calc(100vw - 780px);">工单内容</div>
-                        <div style="width: 100px;">受理人</div>
-                        <div style="width: 150px;">受理时间</div>
-                    </div>
-                    <div class="scroll-container item2_con_con" ref="scrollContainerRef" @mouseenter="pauseScroll"
-                        @mouseleave="resumeScroll">
-                        <div class="con_list" v-for="item in WorkordeData" :key="item.id">
-                            <div style="width: 200px; color: #50AEF8;">{{ item.workordercode }}</div>
-                            <div style="width: 180px;">{{ item.workordercatename }}</div>
-                            <div style="width: calc(100vw - 780px);">{{ item.content }}</div>
-                            <div style="width: 100px;">{{ item.createusername }}</div>
-                            <div style="width: 150px;">{{ item.createtime }}</div>
-                        </div>
-                        <el-empty :image-size="60" v-if="!WorkordeData.length" />
-                    </div>
-                </div>
-                <el-pagination :background="false" class="pageEle" v-show="total > 0" :total="total"
-                    v-model:current-page="queryParams.pageNum" v-model:page-size="queryParams.pageSize"
-                    @change="getWorkorder"
-                    @pagination="getWorkorder" />
-            </div>
-
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import { useDataStore } from '@/stores/data'
-import { getPageListData } from '@/api/index.js'
-import { useRouter, useRoute } from 'vue-router';
-import moment from 'moment'
-
-const router = useRouter()
-// const dataStore = useDataStore()
-const currentTime = ref('')
-
-const route = useRoute()
-const parentName = ref(route.query.pName || '')
-const parentId = ref(route.query.pId || '')
-const areaName = ref(route.query.area || '')
-const areaId = ref(route.query.areaId || '')
-
-
-// 实时时钟
-let timer = null
-const updateTime = () => {
-    currentTime.value = new Date().toLocaleString()
-}
-
-const orderTypes = ref([])
-
-// 初始化数据
-onMounted(() => {
-    init()
-    timer = setInterval(updateTime, 1000)
-    // dataStore.initDictorys()
-
-    orderTypes.value = useDataStore().orderTypes
-    console.log(orderTypes.value, 'orderTypes')
-})
-function init() {
-    getWorkorder()
-}
-// 工单列表
-const queryParams = ref({
-    starttime: '',
-    endtime: '',
-    workordercate: '',
-    createusername: '',
-    workordercode: '',
-    pageNum: 1,
-    pageSize: 10,
-})
-const total = ref(0)
-const WorkordeData = ref({})
-function getWorkorder() {
-    const params = {
-        area: areaId.value,//areaId.value,
-        pageNum: queryParams.value.pageNum,
-        pageSize: queryParams.value.pageSize,
-        listType: 0
-    }
-
-    if (queryParams.value.workordercode) {
-        params.workordercode = queryParams.value.workordercode
-    }
-
-    if (queryParams.value.createusername) {
-        params.createusername = queryParams.value.createusername
-    }
-
-    if (queryParams.value.workordercate) {
-        params.workordercate = queryParams.value.workordercate[queryParams.value.workordercate.length - 1]
-    }
-
-    if (queryParams.value.createtime) {
-        params.createtime = queryParams.value.createtime
-    }
-    if (queryParams.value.endtime) {
-        params.endtime = queryParams.value.endtime
-    }
-
-    getPageListData('/order/workorder', params).then((res) => {
-        if (res.state === 'success') {
-            WorkordeData.value = res.data
-            total.value = res.total
-        }
-    })
-}
-// 跳转链接 
-function goToPage(value) {
-    const params = {}
-    if (value === '/childMap') {
-        params.area = parentName.value
-        params.areaId = parentId.value
-    }
-    router.push({
-        path: value,
-        query: params
-    });
-}
-const searchTimes = ref([])
-const timeChange = (val) => {
-    console.log(val, 'val')
-    if (val?.length === 2) {
-        queryParams.value.createtime = moment(val[0]).format('YYYY-MM-DD HH:mm:ss')
-        queryParams.value.endtime = moment(val[1]).format('YYYY-MM-DD HH:mm:ss')
-    } else {
-        queryParams.value.createtime = ''
-        queryParams.value.endtime = ''
-    }
-
-    getWorkorder();
-}
-</script>
-
-<style lang="scss" scoped>
-/* 使用 :deep() 穿透作用域样式 */
-
-:deep() {
-
-    .el-cascader,
-    .el-date-editor {
-        margin-left: 1%;
-        margin-bottom: 1.5vh;
-    }
-
-    /* 输入框通用样式 */
-    .el-cascader,
-    .el-input,
-    .el-select,
-    .el-date-editor {
-        --el-input-bg-color: transparent;
-        /* 背景透明 */
-        --el-input-text-color: white;
-        /* 文字颜色 */
-        --el-input-border-color: rgba(255, 255, 255, 0.3);
-        /* 边框颜色 */
-        --el-input-hover-border-color: white;
-        /* 悬停边框 */
-        --el-input-focus-border-color: white;
-        /* 聚焦边框 */
-        --el-input-placeholder-color: #aaa;
-        /* 提示文字颜色 */
-    }
-
-    /* 下拉箭头颜色 */
-    .el-select .el-input__suffix,
-    .el-date-editor .el-input__suffix {
-        .el-icon {
-            color: white !important;
-        }
-    }
-
-    /* 下拉菜单样式（需额外处理） */
-    .el-select-dropdown,
-    .el-picker-panel {
-        --el-bg-color: #333;
-        /* 下拉背景 */
-        --el-text-color-regular: white;
-        /* 下拉文字 */
-        border: 1px solid rgba(255, 255, 255, 0.1) !important;
-    }
-}
-
-/* 使用 :deep() 穿透作用域 */
-:deep(.pageEle.el-pagination) {
-    /* 全局文字颜色 */
-    --el-text-color-regular: white;
-
-    /* 分页按钮 */
-    .btn-prev,
-    .btn-next,
-    .number {
-        color: white !important;
-        background: transparent !important;
-        /* 透明背景 */
-
-        &:hover {
-            color: #409eff !important;
-            /* 悬停颜色 */
-        }
-
-        &.active {
-            color: #409eff !important;
-            /* 当前页颜色 */
-            background: transparent !important;
-        }
-
-        &.disabled {
-            color: #666 !important;
-            /* 禁用状态颜色 */
-        }
-    }
-
-    /* 输入框 */
-    .el-pagination__editor {
-        color: white !important;
-        background: transparent !important;
-        border-color: rgba(255, 255, 255, 0.3) !important;
-
-        .el-input__inner {
-            color: white !important;
-        }
-    }
-}
-
-.dashboard {
-    height: 100vh;
-    display: grid;
-    grid-template-rows: 8.5vh 1fr;
-    padding: 1vh;
-    gap: 1vh;
-    background: url('@/assets/bj.png') no-repeat;
-    background-size: 100% 100%;
-
-    .child_title_text {
-        font-weight: bold;
-        font-size: 1.3vw;
-        background: linear-gradient(to bottom, #07B9FF, #F3FDFF);
-        /* 将背景裁剪到文字区域，-webkit- 前缀用于兼容 Safari 等浏览器 */
-        -webkit-background-clip: text;
-        background-clip: text;
-        /* 使文字颜色透明，显示出渐变背景，-webkit- 前缀用于兼容 Safari 等浏览器 */
-        -webkit-text-fill-color: transparent;
-        text-fill-color: transparent;
-    }
-
-    .dashboard-header {
-        /* width: 89%; */
-        background: url('@/assets/title_bg_child.png') no-repeat;
-        background-size: 100% 100%;
-
-        .title_text {
-            background: url('@/assets/title_text_bg.png') no-repeat;
-            background-size: 100% 100%;
-            width: 33%;
-            height: 4vh;
-            margin: 0 auto;
-            margin-top: 2vh;
-        }
-
-        .time {
-            text-align: left;
-            font-size: 0.8vw;
-            color: #ffffff;
-            margin-left: 4%;
-            margin-top: -2.5vh;
-        }
-    }
-
-    .child-content {
-        .child-title {
-            background: url('@/assets/child_title_bg.png') no-repeat;
-            background-size: 100% 100%;
-            height: 5vh;
-            line-height: 5vh;
-            margin-bottom: 2vh;
-
-
-
-            .title_text {
-                background: url('@/assets/title_text_bg.png') no-repeat;
-                background-size: 100% 100%;
-                width: 33%;
-                height: 4vh;
-                margin: 0 auto;
-                margin-top: 2vh;
-            }
-        }
-
-        .child-warp {
-            background: url('@/assets/order_border_b.png') no-repeat;
-            background-size: 100% 100%;
-            width: 96%;
-            margin: 0 auto;
-            height: 78vh;
-
-            .left-title {
-                font-size: 1vw;
-                color: #ffffff;
-                line-height: 5vh;
-                display: flex;
-                width: 96%;
-                margin: 0 auto;
-
-                .tit_left {
-                    width: 50%;
-                }
-
-                .tit_right {
-                    width: 50%;
-                    text-align: right;
-                }
-            }
-
-            .center_item2_tit {
-                font-size: 0.9vw;
-                color: #FEFFFF;
-                text-align: left;
-                margin-left: 1%;
-                line-height: 5vh;
-                height: 5vh;
-
-                // 
-                .btn_tit {
-
-                    cursor: pointer;
-                }
-            }
-
-            .center_item2_search {
-                text-align: left;
-
-                .search_item {
-                    width: 240px;
-                    margin-left: 1%;
-                    margin-bottom: 1.5vh;
-                }
-            }
-
-            .item2_con {
-                .item2_con_tit {
-                    background: url('@/assets/order_type_tit_bg.png') no-repeat;
-                    background-size: 100% 100%;
-                    font-size: 0.8vw;
-                    line-height: 5.5vh;
-                    height: 5.5vh;
-                    overflow: hidden;
-                    /* display: flex; */
-                    width: 100%;
-
-                    div {
-                        float: left;
-                        background: #102648;
-                        background: url('@/assets/con_list_div.png') no-repeat;
-                        background-size: 100% 100%;
-                        line-height: 5.5vh;
-                        height: 5.5vh;
-                        text-align: center;
-                        /* white-space: nowrap;  
-                        overflow: hidden;
-                        text-overflow: ellipsis; */
-                    }
-                }
-
-                .item2_con_con {
-                    font-size: 0.7vw;
-
-                    .con_list {
-                        width: 100%;
-                        overflow: hidden;
-                        /* display: flex; */
-                        border-bottom: 1px solid #4B5D7D;
-
-                        div {
-                            float: left;
-                            line-height: 5.5vh;
-                            height: 5.5vh;
-                            text-align: center;
-                            // white-space: nowrap;
-                            // overflow: hidden;
-                            // text-overflow: ellipsis;
-                        }
-                    }
-
-                    .con_list:last-child {
-                        border-bottom: none;
-                    }
-                }
-
-            }
-
-            .pageEle {
-                margin-top: 1vh;
-                margin-left: 2%;
-                width: 96%;
-                background-color: unset;
-            }
-
-        }
-
-    }
-}
-</style>

web/src/store/modules/user.js

@@ -69,6 +69,7 @@ const user = {
     LogOut({ commit }) {
       return new Promise((resolve, reject) => {
         logout().then(res => {
+          
           logOut(commit)
           resolve()
         }).catch(error => {