config/prod.env.js

@@ -6,5 +6,5 @@ module.exports = {
   NODE_ENV: '"production"',
   //post用当前域名
   // API_ROOT: '"http://' + testUrl + '/iot"'
-  API_ROOT: '"/dev-api"',
+  // API_ROOT: '/',
 }

index.html

@@ -8,8 +8,8 @@
       content="width=device-width, initial-scale=1.0, user-scalable=0"
     />
     <link rel="shortcut icon" href="./static/favicon.ico" type="image/x-icon" />
-    <script async src="https://api.map.baidu.com/api?v=2.0&ak=k5PrSzhP6vMtyNSpzSNMARYVF4Fm7FYL"></script>
-    <script src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=k5PrSzhP6vMtyNSpzSNMARYVF4Fm7FYL"></script>
+    <script async src="https://api.map.baidu.com/api?v=2.0&ak=cClgLBaLgGUdQDilX9dGvieL"></script>
+    <script src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=cClgLBaLgGUdQDilX9dGvieL"></script>
     <script type="text/javascript" src="//api.map.baidu.com/library/TrackAnimation/src/TrackAnimation_min.js"></script>
     <title>智慧仓储管理平台</title>
   </head>

src/App.vue

@@ -4,7 +4,7 @@
   </div>
 </template>
 <script>
-// import autofit from 'autofit.js'
+import autofit from 'autofit.js'
 export default {
   name: 'app',
   created() {
@@ -19,12 +19,12 @@ export default {
     document.getElementsByTagName('head')[0].appendChild(link)
   },
   mounted() {
-    // autofit.init({
-    //   designHeight: 1080, //高度
-    //   designWidth: 1920, //宽度
-    //   renderDom: '#app',
-    //   resize: true,
-    // })
+    autofit.init({
+      designHeight: 1080, //高度
+      designWidth: 1920, //宽度
+      renderDom: '#app',
+      resize: true,
+    })
   },
 
   watch: {

src/api/index.js

@@ -5,9 +5,9 @@ import axios from 'axios'
 axios.defaults.timeout = 30000
 
 // 默认配置
-axios.defaults.baseURL = process.env.API_ROOT
+// axios.defaults.baseURL = process.env.API_ROOT;
 // axios.defaults.baseURL = 'http://192.168.0.56:21627/bigScreen'
-// axios.defaults.baseURL = 'screen'
+axios.defaults.baseURL = 'screen'
 // axios.defaults.baseURL = 'http://localhost:8080/screen'
 
 axios.interceptors.request.use(

src/components/home/countryMap.vue

@@ -312,20 +312,6 @@ export default {
           itemStyle: { normal: { areaColor: '#0A2B7B' } },
         },
       ]
-        for (let i = 0; i < splitList.length; i++) {
-        let geoCoord = geoCoordMap[splitList[i].name]
-        if (geoCoord) {
-          splitList[i].value = geoCoord.concat(splitList[i].value)
-        }
-      }
-
-      mapData.forEach((e) => {
-        splitList.forEach((v) => {
-          if (e.name == v.name) {
-            v.count = e.a
-          }
-        })
-      })
       let imgUrl = require('../../assets/img/myImage/tankuang.png')
       let echartOption = {
         geo: [

src/components/home/leftFour.vue

@@ -135,11 +135,11 @@
                     fontSize: "12",
                     },
                     formatter: function (value) {
-                    // if (value >= 10000) {
-                    //     return (value / 10000).toLocaleString() +'万';
-                    // } else {
+                    if (value >= 10000) {
+                        return (value / 10000).toLocaleString() +'万';
+                    } else {
                         return value.toLocaleString();
-                    // }
+                    }
                     },
                 },
                 data: this.valueList,

src/components/home/new-map.vue

@@ -247,9 +247,4 @@ export default {
   padding: 0;
   font-size: 18px;
 }
-
-/* 隐藏百度地图GL左下角logo */
-.anchorBL {
-  display: none;
-}
 </style>

src/views/newHome/index.vue

@@ -1,12 +1,16 @@
 <template>
-  <div class="screen-container" id="myContainer" >
+  <div class="screen-container">
     <div class="data-v-container" :key="key">
        <div class="title-bg"> 
          <div class="btn-content">
           <el-button
             size="medium"
             type="primary"
-            @click="goBack"
+            @click="
+              () => {
+                $router.go(-1)
+              }
+            "
             >返回</el-button
           >
           <el-button size="medium" type="primary" @click="goBackstage"
@@ -129,7 +133,6 @@
 </template>
 
 <script>
-import autofit from 'autofit.js'
 import CenterFold from '../../components/home/centerFold.vue'
 import CountryMap from '../../components/home/countryMap.vue'
 import LeftOne from '../../components/home/leftOne.vue'
@@ -171,40 +174,35 @@ export default {
       // 地图点击时的查询参数
       queryParams: null,
       dateTimeString: '',
-      autofitInstance: null, // 添加一个变量来存储 autofit 实例
     }
   },
-
+  mounted() {},
   mounted() {
-    this.initAutofit();
-    
     this.getCurrentDateTime()
     setInterval(this.getCurrentDateTime, 1000)
-    this.getMapSelect(this.maType);
+    // let that = this
+    // AMap.plugin('AMap.CitySearch', function () {
+    //   var citySearch = new AMap.CitySearch()
+    //   citySearch.getLocalCity(function (status, result) {
+    //     if (status === 'complete' && result.info === 'OK') {
+    //       AMap.plugin('AMap.Weather', function () {
+    //         var weather = new AMap.Weather();
+    //         weather.getLive('宁夏回族自治区', function (err, data) {
+    //           // console.log(err, data);
+    //           that.weatherData = data
+    //           that.weatherUrl = data.weather == '晴' ? ONE : data.weather == '多云' ? TWO : data.weather == '中雪' ? THREE : ''
+    //         });
+    //       })
+    //     }
+    //   })
+    // })
+    // this.getWeather()
+    this.getMapSelect(this.maType)
     // getMaintenanceWarningApi().then((res) => {
     //   this.transformList = res.data
     // })
-
   },
   methods: {
-    goBack(){
-      autofit.off();
-      this.$router.go(-1);
-    },
-    // handleWheel(event) {
-    //   console.log('111111111', event)
-    //   if (event.ctrlKey) {
-    //     event.preventDefault();
-    //   }
-    // },
-    initAutofit() {
-     autofit.init({
-        designHeight: 1080,
-        designWidth: 1920,
-        renderDom: '#myContainer',
-        resize: true,
-      });
-    },
     openDrawer(query) {
       this.queryParams = query
       console.log(query, 'c参数')