彭宇 пре 2 година
родитељ
комит
7cfa549b8f
81 измењених фајлова са 34 додато и 12 уклоњено
  1. BIN
      public/img/airportBlue.png
  2. BIN
      public/img/airportRed.png
  3. BIN
      public/img/background/border14.png
  4. BIN
      public/img/background/border15.png
  5. BIN
      public/img/background/image1.png
  6. BIN
      public/img/background/image11.png
  7. BIN
      public/img/background/image2.png
  8. BIN
      public/img/background/image3.png
  9. BIN
      public/img/background/image4.png
  10. BIN
      public/img/background/image5.png
  11. BIN
      public/img/background/image6.png
  12. BIN
      public/img/background/image7.png
  13. BIN
      public/img/background/image8.png
  14. BIN
      public/img/bar.png
  15. BIN
      public/img/bar3D.png
  16. BIN
      public/img/colorpicker.png
  17. BIN
      public/img/end_trans.png
  18. BIN
      public/img/icon_pause.png
  19. BIN
      public/img/icon_play.png
  20. BIN
      public/img/leaf-green.png
  21. BIN
      public/img/leaf-shadow.png
  22. BIN
      public/img/ling.png
  23. BIN
      public/img/marker-gold.png
  24. BIN
      public/img/marker-icon.png
  25. BIN
      public/img/marker.png
  26. BIN
      public/img/markerbig.png
  27. BIN
      public/img/markerbig_select.png
  28. BIN
      public/img/online-qr.png
  29. BIN
      public/img/pie.png
  30. BIN
      public/img/plottingPanel/BasicCell/1001.png
  31. BIN
      public/img/plottingPanel/BasicCell/1003.png
  32. BIN
      public/img/plottingPanel/BasicCell/1004.png
  33. BIN
      public/img/plottingPanel/BasicCell/1013.png
  34. BIN
      public/img/plottingPanel/BasicCell/1014.png
  35. BIN
      public/img/plottingPanel/BasicCell/1016.png
  36. BIN
      public/img/plottingPanel/BasicCell/1017.png
  37. BIN
      public/img/plottingPanel/BasicCell/1019.png
  38. BIN
      public/img/plottingPanel/BasicCell/1022.png
  39. BIN
      public/img/plottingPanel/BasicCell/1023.png
  40. BIN
      public/img/plottingPanel/BasicCell/1024.png
  41. BIN
      public/img/plottingPanel/BasicCell/1025.png
  42. BIN
      public/img/plottingPanel/BasicCell/1026.png
  43. BIN
      public/img/plottingPanel/BasicCell/1028.png
  44. BIN
      public/img/plottingPanel/BasicCell/1029.png
  45. BIN
      public/img/plottingPanel/BasicCell/24.png
  46. BIN
      public/img/plottingPanel/BasicCell/26.png
  47. BIN
      public/img/plottingPanel/BasicCell/28.png
  48. BIN
      public/img/plottingPanel/BasicCell/29.png
  49. BIN
      public/img/plottingPanel/BasicCell/3000.png
  50. BIN
      public/img/plottingPanel/BasicCell/31.png
  51. BIN
      public/img/plottingPanel/BasicCell/32.png
  52. BIN
      public/img/plottingPanel/BasicCell/320.png
  53. BIN
      public/img/plottingPanel/BasicCell/321.png
  54. BIN
      public/img/plottingPanel/BasicCell/34.png
  55. BIN
      public/img/plottingPanel/BasicCell/350.png
  56. BIN
      public/img/plottingPanel/BasicCell/360.png
  57. BIN
      public/img/plottingPanel/BasicCell/370.png
  58. BIN
      public/img/plottingPanel/BasicCell/3701.png
  59. BIN
      public/img/plottingPanel/BasicCell/380.png
  60. BIN
      public/img/plottingPanel/BasicCell/3801.png
  61. BIN
      public/img/plottingPanel/BasicCell/390.png
  62. BIN
      public/img/plottingPanel/BasicCell/400.png
  63. BIN
      public/img/plottingPanel/BasicCell/410.png
  64. BIN
      public/img/plottingPanel/BasicCell/44.png
  65. BIN
      public/img/plottingPanel/BasicCell/4401.png
  66. BIN
      public/img/plottingPanel/BasicCell/48.png
  67. BIN
      public/img/plottingPanel/BasicCell/590.png
  68. BIN
      public/img/plottingPanel/BasicCell/RouteIcon/1005.png
  69. BIN
      public/img/plottingPanel/BasicCell/RouteIcon/1006.png
  70. BIN
      public/img/plottingPanel/BasicCell/RouteIcon/1007.png
  71. BIN
      public/img/point.png
  72. BIN
      public/img/position.png
  73. BIN
      public/img/ring.png
  74. BIN
      public/img/scatter.png
  75. BIN
      public/img/start_trans.png
  76. BIN
      public/img/taxi.png
  77. BIN
      public/img/thumb.png
  78. BIN
      public/img/tianditu/tianditu-icon.png
  79. BIN
      public/img/tianditu/tianditu.png
  80. BIN
      public/img/walk.png
  81. 34 12
      src/views/forest.vue

BIN
public/img/airportBlue.png


BIN
public/img/airportRed.png


BIN
public/img/background/border14.png


BIN
public/img/background/border15.png


BIN
public/img/background/image1.png


BIN
public/img/background/image11.png


BIN
public/img/background/image2.png


BIN
public/img/background/image3.png


BIN
public/img/background/image4.png


BIN
public/img/background/image5.png


BIN
public/img/background/image6.png


BIN
public/img/background/image7.png


BIN
public/img/background/image8.png


BIN
public/img/bar.png


BIN
public/img/bar3D.png


BIN
public/img/colorpicker.png


BIN
public/img/end_trans.png


BIN
public/img/icon_pause.png


BIN
public/img/icon_play.png


BIN
public/img/leaf-green.png


BIN
public/img/leaf-shadow.png


BIN
public/img/ling.png


BIN
public/img/marker-gold.png


BIN
public/img/marker-icon.png


BIN
public/img/marker.png


BIN
public/img/markerbig.png


BIN
public/img/markerbig_select.png


BIN
public/img/online-qr.png


BIN
public/img/pie.png


BIN
public/img/plottingPanel/BasicCell/1001.png


BIN
public/img/plottingPanel/BasicCell/1003.png


BIN
public/img/plottingPanel/BasicCell/1004.png


BIN
public/img/plottingPanel/BasicCell/1013.png


BIN
public/img/plottingPanel/BasicCell/1014.png


BIN
public/img/plottingPanel/BasicCell/1016.png


BIN
public/img/plottingPanel/BasicCell/1017.png


BIN
public/img/plottingPanel/BasicCell/1019.png


BIN
public/img/plottingPanel/BasicCell/1022.png


BIN
public/img/plottingPanel/BasicCell/1023.png


BIN
public/img/plottingPanel/BasicCell/1024.png


BIN
public/img/plottingPanel/BasicCell/1025.png


BIN
public/img/plottingPanel/BasicCell/1026.png


BIN
public/img/plottingPanel/BasicCell/1028.png


BIN
public/img/plottingPanel/BasicCell/1029.png


BIN
public/img/plottingPanel/BasicCell/24.png


BIN
public/img/plottingPanel/BasicCell/26.png


BIN
public/img/plottingPanel/BasicCell/28.png


BIN
public/img/plottingPanel/BasicCell/29.png


BIN
public/img/plottingPanel/BasicCell/3000.png


BIN
public/img/plottingPanel/BasicCell/31.png


BIN
public/img/plottingPanel/BasicCell/32.png


BIN
public/img/plottingPanel/BasicCell/320.png


BIN
public/img/plottingPanel/BasicCell/321.png


BIN
public/img/plottingPanel/BasicCell/34.png


BIN
public/img/plottingPanel/BasicCell/350.png


BIN
public/img/plottingPanel/BasicCell/360.png


BIN
public/img/plottingPanel/BasicCell/370.png


BIN
public/img/plottingPanel/BasicCell/3701.png


BIN
public/img/plottingPanel/BasicCell/380.png


BIN
public/img/plottingPanel/BasicCell/3801.png


BIN
public/img/plottingPanel/BasicCell/390.png


BIN
public/img/plottingPanel/BasicCell/400.png


BIN
public/img/plottingPanel/BasicCell/410.png


BIN
public/img/plottingPanel/BasicCell/44.png


BIN
public/img/plottingPanel/BasicCell/4401.png


BIN
public/img/plottingPanel/BasicCell/48.png


BIN
public/img/plottingPanel/BasicCell/590.png


BIN
public/img/plottingPanel/BasicCell/RouteIcon/1005.png


BIN
public/img/plottingPanel/BasicCell/RouteIcon/1006.png


BIN
public/img/plottingPanel/BasicCell/RouteIcon/1007.png


BIN
public/img/point.png


BIN
public/img/position.png


BIN
public/img/ring.png


BIN
public/img/scatter.png


BIN
public/img/start_trans.png


BIN
public/img/taxi.png


BIN
public/img/thumb.png


BIN
public/img/tianditu/tianditu-icon.png


BIN
public/img/tianditu/tianditu.png


BIN
public/img/walk.png


+ 34 - 12
src/views/forest.vue

@@ -18,7 +18,7 @@
             <div class="i-list-con h-14">
               <div class="d-l-con">
                 <div class="d-l-l-text w-100p">
-                  <h4 class="line-h-1 w-100p" @click="showEventDialog">{{ forestInfo }}</h4>
+                  <h4 class="line-h-1 w-100p">{{ forestInfo }}</h4>
                 </div>
               </div>
             </div>
@@ -114,7 +114,7 @@
             <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="i-list-con small-bottom-margin h-13">
-                <el-row :gutter="20">
+                <el-row :gutter="20" v-if="todatWeather">
                   <el-col :span="9">
                     <div class="weather-img">
                       <img src="../assets/images/integrated/weather/yin.png">
@@ -134,6 +134,13 @@
                     </div>
                   </el-col>
                 </el-row>
+                <el-row :gutter="20" v-if="!todatWeather">
+                  <el-col :span="24">
+                    <div class="weather-img">
+                      暂无天气信息!
+                    </div>
+                  </el-col>
+                </el-row>
                 <div class="firestate">
                   <div class="state-block1"></div>
                   <div class="state-block2"></div>
@@ -377,6 +384,7 @@ export default {
       //左侧部门事件数量
       forestFarm: [],
       //右侧天气
+      todatWeather:false,
       weatherinformationDirection: '',
       weatherinformationHigh: '',
       weatherinformationLevel: '',
@@ -711,8 +719,13 @@ export default {
     getBaseInfo() {
       //左侧获取部门信息
       getBaseInfo().then(res => {
-        this.forestInfo = res.data.baseinfo //基本情况
-        // this.cameraList = res.data.cameraList
+        if(res.code==200){
+          if(res.msg=="未找到部门信息"){
+            this.forestInfo='未找到部门信息!'
+          }else{
+            this.forestInfo = res.data.baseinfo //基本情况
+          }
+        }
       })
     },
     getTodayEvents(day) {
@@ -745,14 +758,23 @@ export default {
       let that = this
       //右侧获取天气信息
       getWeather({ day: day }).then(res => {
-        this.weatherinformationDirection = res.data.weatherinformationDirection
-        this.weatherinformationHigh = res.data.weatherinformationHigh
-        this.weatherinformationLevel = res.data.weatherinformationLevel
-        this.weatherinformationLow = res.data.weatherinformationLow
-        this.weatherinformationPower = res.data.weatherinformationPower
-        this.weatherinformationTemperature = res.data.weatherinformationTemperature
-        this.weatherinformationTime = res.data.weatherinformationTime
-        this.weatherinformationWeather = res.data.weatherinformationWeather
+        if(res.code==200){
+          if(res.msg=="天气未添加"){
+            this.todatWeather=false
+          }else{
+            this.todatWeather=true
+            this.weatherinformationDirection = res.data.weatherinformationDirection
+            this.weatherinformationHigh = res.data.weatherinformationHigh
+            this.weatherinformationLevel = res.data.weatherinformationLevel
+            this.weatherinformationLow = res.data.weatherinformationLow
+            this.weatherinformationPower = res.data.weatherinformationPower
+            this.weatherinformationTemperature = res.data.weatherinformationTemperature
+            this.weatherinformationTime = res.data.weatherinformationTime
+            this.weatherinformationWeather = res.data.weatherinformationWeather
+          }
+        }else{
+          this.todatWeather=false
+        }
       })
     },
     getEventList(day) {