Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

weapp/src/app.config.js

@@ -16,6 +16,9 @@ export default {
       "desc": '需要获取您的地理位置'
     }
   },
+  requiredPrivateInfos: [
+    'getLocation',
+  ],
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: "#2C66F3",

weapp/src/packages/components/inputPicker/index.jsx

@@ -17,7 +17,7 @@ export default function InputPicker(props) {
   function handleInput({ detail: { value: v } }) {
     onInput(v)
     if (v) {
-      setCurSelector(selector.filter(item => item.includes(v)))
+      setCurSelector(selector.filter(item => item && item.includes(v)))
     } else {
       setCurSelector(selector)
     }

weapp/src/packages/patrol/index.jsx

@@ -1,18 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import Taro, { useRouter } from '@tarojs/taro';
-import {
+import { View, RadioGroup, Radio, Image, Input, Picker } from '@tarojs/components';
-  View,
+import { AtButton, AtTextarea, AtImagePicker } from 'taro-ui';
-  RadioGroup,
-  Radio,
-  Button,
-  Image,
-  Input,
-  Picker
-} from '@tarojs/components';
-import { AtButton, AtTextarea, AtImagePicker, AtAvatar } from 'taro-ui';
 import InputPicker from '../components/inputPicker';
 import request from '@/services/request';
-import { postReport, getReportDetail } from '@/services/api';
+import { postReport, getReportDetail, delReport, getRoadSection } from '@/services/api';
 import './index.scss';
 import arrowIcon from '../../static/img/patrol/arrow-down.svg';
 
@@ -21,7 +13,6 @@ const Index = () => {
   const { params: { type } } = router
   const isView = type === 'view' ? true : false
 
-
   const [reportType, setReportType] = useState('patrol') // 上报类型
   const [projectType, setProjectType] = useState('') // 工程类型
   const [road, setRoad] = useState('') // 所在道路
@@ -33,9 +24,16 @@ const Index = () => {
   const [conserveBeforePic, setConserveBeforePic] = useState([]) // 养护前图片
   const [conserveUnderwayPic, setConserveUnderwayPic] = useState([]) // 养护中图片
   const [conserveAfterPic, setConserveAfterPic] = useState([]) // 养护后图片
+  const [longitude, setLongitude] = useState(0) // 经度
+  const [latitude, setLatitude] = useState(0) // 纬度
+
+  const [sourceRoadSel, setSourceRoadSel] = useState([])
+  const [sourceRoadStartSel, setSourceRoadStartSel] = useState([])
+  const [sourceRoadEndSel, setSourceRoadEndSel] = useState([])
 
-  const [roadStartSelector, setRoadStartSelector] = useState([])
+  const prjTypeSelector = ['道路', '桥梁', '涵洞', '其他']
-  const [roadEndSelector, setRoadEndSelector] = useState([])
+  const [roadStartSel, setRoadStartSel] = useState([])
+  const [roadEndSel, setRoadEndSel] = useState([])
 
   const [canReport, setCanReport] = useState(true)
 
@@ -52,17 +50,9 @@ const Index = () => {
     }
   ])
 
-  const rPrjTypeSelector = ['道路', '桥梁', '涵洞', '其他']
-  const rRoadSelector = ['富山一路', '金沙大道', '玉湖路']
-
-  const rRoadStartSelector = ['一段', '二段', '三段']
-  const rRoadEndSelector = ['一段', '二段', '三段']
-
   useEffect(() => {
-    if (isView) {
+    if (isView) { // 查看
-      Taro.showLoading({
+      Taro.showLoading({ title: '加载中' })
-        title: '加载中'
-      })
       request.get(getReportDetail(router.params.id)).then(res => {
         Taro.hideLoading()
         if (res.statusCode == 200 || res.statusCode == 204) {
@@ -84,10 +74,51 @@ const Index = () => {
       }, err => {
         Taro.showToast({ title: err.message || '请求出错', icon: 'none' })
       })
+    } else { // 填报
+      Taro.showLoading({ title: '加载中' })
+      let key = 'ODQBZ-3FZAU-6VIVL-2XXNM-F7CP7-WVFCY' // 写自己申请的key
+      Taro.getLocation({
+        type: 'wgs84',
+        success: function (res) {
+          setLongitude(res.longitude)
+          setLatitude(res.latitude)
+          Taro.request({
+            url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=${key}`,
+            success: function (res) {
+              // 根据自己项目需求获取res内容
+              let addresscity = res.data.result.address_component.province + res.data.result.address_component.city + res.data.result.address_component.district
+              setAddress(addresscity + res.data.result.address_component.street_number)
+            }
+          })
+        }
+      })
+      request.get(getRoadSection()).then(res => {
+        Taro.hideLoading()
+        if (res.statusCode == 200 || res.statusCode == 204) {
+          const { data } = res
+          let nextSourceRoadSel = []
+          let nextSourceRoadStartSel = []
+          let nextSourceRoadEndSel = []
+          data.map(item => {
+            nextSourceRoadSel.push(item.routeName)
+            nextSourceRoadStartSel.push(item.startingPlaceName)
+            nextSourceRoadEndSel.push(item.stopPlaceName)
+          })
+          setSourceRoadSel(nextSourceRoadSel)
+          setSourceRoadStartSel(nextSourceRoadStartSel)
+          setSourceRoadEndSel(nextSourceRoadEndSel)
+        } else {
+          Taro.showToast({ title: res.data.message || '请求出错', icon: 'none' })
+        }
+      }, err => {
+        Taro.showToast({ title: err.message || '请求出错', icon: 'none' })
+      })
     }
-    setRoadStartSelector(rRoadStartSelector)
-    setRoadEndSelector(rRoadEndSelector)
   }, [])
+  useEffect(() => {
+    setRoadStartSel(sourceRoadStartSel)
+    setRoadEndSel(sourceRoadEndSel)
+  }, [sourceRoadStartSel, sourceRoadEndSel])
 
   useEffect(() => {
     setTypeList([
@@ -110,7 +141,7 @@ const Index = () => {
       Taro.showToast({ title: '请完善必填信息', icon: 'none' })
       return
     }
-    if (rPrjTypeSelector.indexOf(projectType) === -1) {
+    if (prjTypeSelector.indexOf(projectType) === -1) {
       Taro.showToast({ title: '工程类型错误', icon: 'none' })
       return
     }
@@ -122,8 +153,8 @@ const Index = () => {
       roadSectionEnd,
       address,
       content,
-      // longitude: 37.000000000000,
+      longitude,
-      // latitude: 69.000000000000
+      latitude
     }
     if (reportType === 'patrol') {
       data['scenePic'] = scenePic.length > 0 ? scenePic.map(item => item.url) : null
@@ -165,22 +196,49 @@ const Index = () => {
     })
   }
 
+  function deleteReport() {
+    Taro.showModal({
+      title: '提示',
+      content: '确定删除吗？',
+      success: function (res) {
+        if (res.confirm) {
+          Taro.showLoading({
+            title: '删除中'
+          })
+          request.del(delReport(router.params.id)).then(res => {
+            Taro.hideLoading()
+            if (res.statusCode == 200 || res.statusCode == 204) {
+              Taro.showToast({ title: '删除成功', icon: 'none', duration: 1500 })
+              setTimeout(() => {
+                Taro.navigateBack()
+              }, 1000)
+            } else {
+              Taro.showToast({ title: res.data.message || '请求出错', icon: 'none' })
+            }
+          }, err => {
+            Taro.showToast({ title: err.message || '请求出错', icon: 'none' })
+          })
+        }
+      }
+    })
+  }
+
   function handleInput({ detail: { value } }, type) {
     switch (type) {
       case 'roadSectionStart':
         setRoadSectionStart(value)
         if (value) {
-          setRoadStartSelector(rRoadStartSelector.filter(item => item.includes(value)))
+          setRoadStartSel(sourceRoadStartSel.filter(item => item && item.includes(value)))
         } else {
-          setRoadStartSelector(rRoadStartSelector)
+          setRoadStartSel(sourceRoadStartSel)
         }
         break;
       case 'roadSectionEnd':
         setRoadSectionEnd(value)
         if (value) {
-          setRoadEndSelector(rRoadEndSelector.filter(item => item.includes(value)))
+          setRoadEndSel(sourceRoadEndSel.filter(item => item && item.includes(value)))
         } else {
-          setRoadEndSelector(rRoadEndSelector)
+          setRoadEndSel(sourceRoadEndSel)
         }
         break;
       case 'address':
@@ -221,106 +279,6 @@ const Index = () => {
     })
   }
 
-  function renderAddImg() {
-    return (
-      reportType === 'patrol' ?
-        <View className='patrol-img'>
-          现场图片：
-          <AtImagePicker
-            className='img-picker'
-            count={3 - scenePic.length}
-            showAddBtn={scenePic.length >= 3 ? false : true}
-            files={scenePic}
-            onChange={files => handleImgChange(files, 'scenePic')}
-            onImageClick={handleImgClick}
-          />
-        </View> :
-        <View className='conserve-img'>
-          养护图片:
-          <View className='horizontal-line hl-one'>
-            <View className='circle c-one'></View>
-            <View className='text t-one'>养护前</View>
-          </View>
-          <AtImagePicker
-            className='img-picker'
-            count={3 - conserveBeforePic.length}
-            showAddBtn={conserveBeforePic.length >= 3 ? false : true}
-            files={conserveBeforePic}
-            onChange={files => handleImgChange(files, 'conserveBeforePic')}
-            onImageClick={handleImgClick}
-          />
-          <View className='horizontal-line hl-two'>
-            <View className='circle c-two'></View>
-            <View className='text t-two'>养护中</View>
-          </View>
-          <AtImagePicker
-            className='img-picker'
-            count={3 - conserveUnderwayPic.length}
-            showAddBtn={conserveUnderwayPic.length >= 3 ? false : true}
-            files={conserveUnderwayPic}
-            onChange={files => handleImgChange(files, 'conserveUnderwayPic')}
-            onImageClick={handleImgClick}
-          />
-          <View className='horizontal-line hl-three'>
-            <View className='circle c-three'></View>
-            <View className='text t-three'>养护后</View>
-          </View>
-          <AtImagePicker
-            className='img-picker'
-            count={3 - conserveAfterPic.length}
-            showAddBtn={conserveAfterPic.length >= 3 ? false : true}
-            files={conserveAfterPic}
-            onChange={files => handleImgChange(files, 'conserveAfterPic')}
-            onImageClick={handleImgClick}
-          />
-        </View>
-    )
-  }
-
-  function renderViewImg() {
-    return (
-      reportType === 'patrol' ?
-        <View className='patrol-img'>
-          现场图片：
-          <View className='img-box'>
-            {scenePic.map(item => (
-              <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
-            ))}
-          </View>
-        </View> :
-        <View className='conserve-img'>
-          养护图片:
-          <View className='horizontal-line hl-one'>
-            <View className='circle c-one'></View>
-            <View className='text t-one'>养护前</View>
-          </View>
-          <View className='img-box'>
-            {conserveBeforePic.map(item => (
-              <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
-            ))}
-          </View>
-          <View className='horizontal-line hl-two'>
-            <View className='circle c-two'></View>
-            <View className='text t-two'>养护中</View>
-          </View>
-          <View className='img-box'>
-            {conserveUnderwayPic.map(item => (
-              <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
-            ))}
-          </View>
-          <View className='horizontal-line hl-three'>
-            <View className='circle c-three'></View>
-            <View className='text t-three'>养护后</View>
-          </View>
-          <View className='img-box'>
-            {conserveAfterPic.map(item => (
-              <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
-            ))}
-          </View>
-        </View>
-    )
-  }
-
   return (
     <View className='patrol'>
       <View className='report-type'>
@@ -350,15 +308,16 @@ const Index = () => {
         placeholder='请选择工程类型'
         value={projectType}
         onInput={setProjectType}
-        selector={rPrjTypeSelector}
+        selector={prjTypeSelector}
         isView={isView}
       />
       <InputPicker
+        key={sourceRoadSel} // 添加key保证selector更新重新渲染
         title='所在道路：'
         placeholder='请选择或输入您所在的道路'
         value={road}
         onInput={setRoad}
-        selector={rRoadSelector}
+        selector={sourceRoadSel}
         isView={isView}
       />
 
@@ -374,11 +333,11 @@ const Index = () => {
           disabled={isView}
         />
         {
-          isView &&
+          !isView &&
           <Picker
             mode='selector'
-            range={roadStartSelector}
+            range={roadStartSel}
-            onChange={e => setRoadSectionStart(roadStartSelector[e.detail.value])}
+            onChange={e => setRoadSectionStart(roadStartSel[e.detail.value])}
           >
             <Image src={arrowIcon} className='img-l' />
           </Picker>
@@ -394,11 +353,11 @@ const Index = () => {
           disabled={isView}
         />
         {
-          isView &&
+          !isView &&
           <Picker
             mode='selector'
-            range={roadEndSelector}
+            range={roadEndSel}
-            onChange={e => setRoadSectionEnd(roadEndSelector[e.detail.value])}
+            onChange={e => setRoadSectionEnd(roadEndSel[e.detail.value])}
           >
             <Image src={arrowIcon} className='img-r' />
           </Picker>
@@ -426,12 +385,95 @@ const Index = () => {
         disabled={isView}
       />
       {
-        isView ?
+        reportType === 'patrol' ?
-          renderViewImg() :
+          <View className='patrol-img'>
-          renderAddImg()
+            现场图片：
+            {
+              isView ?
+                <View className='img-box'>
+                  {scenePic.map(item => (
+                    <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
+                  ))}
+                </View> :
+                <AtImagePicker
+                  className='img-picker'
+                  count={3 - scenePic.length}
+                  showAddBtn={scenePic.length >= 3 ? false : true}
+                  files={scenePic}
+                  onChange={files => handleImgChange(files, 'scenePic')}
+                  onImageClick={handleImgClick}
+                />
+            }
+          </View> :
+          <View className='conserve-img'>
+            养护图片:
+            <View className='horizontal-line hl-one'>
+              <View className='circle c-one'></View>
+              <View className='text t-one'>养护前</View>
+            </View>
+            {
+              isView ?
+                <View className='img-box'>
+                  {conserveBeforePic.map(item => (
+                    <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
+                  ))}
+                </View> :
+                <AtImagePicker
+                  className='img-picker'
+                  count={3 - conserveBeforePic.length}
+                  showAddBtn={conserveBeforePic.length >= 3 ? false : true}
+                  files={conserveBeforePic}
+                  onChange={files => handleImgChange(files, 'conserveBeforePic')}
+                  onImageClick={handleImgClick}
+                />
+            }
+            <View className='horizontal-line hl-two'>
+              <View className='circle c-two'></View>
+              <View className='text t-two'>养护中</View>
+            </View>
+            {
+              isView ?
+                <View className='img-box'>
+                  {conserveUnderwayPic.map(item => (
+                    <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
+                  ))}
+                </View> :
+                <AtImagePicker
+                  className='img-picker'
+                  count={3 - conserveUnderwayPic.length}
+                  showAddBtn={conserveUnderwayPic.length >= 3 ? false : true}
+                  files={conserveUnderwayPic}
+                  onChange={files => handleImgChange(files, 'conserveUnderwayPic')}
+                  onImageClick={handleImgClick}
+                />
+            }
+
+            <View className='horizontal-line hl-three'>
+              <View className='circle c-three'></View>
+              <View className='text t-three'>养护后</View>
+            </View>
+            {
+              isView ?
+                <View className='img-box'>
+                  {conserveAfterPic.map(item => (
+                    <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
+                  ))}
+                </View> :
+                <AtImagePicker
+                  className='img-picker'
+                  count={3 - conserveAfterPic.length}
+                  showAddBtn={conserveAfterPic.length >= 3 ? false : true}
+                  files={conserveAfterPic}
+                  onChange={files => handleImgChange(files, 'conserveAfterPic')}
+                  onImageClick={handleImgClick}
+                />
+            }
+          </View>
       }
       {
-        !isView && <AtButton type='primary' className='sub-btn' onClick={report}>上报</AtButton>
+        isView ?
+          <AtButton type='primary' className='del-btn' onClick={deleteReport}>删除</AtButton> :
+          <AtButton type='primary' className='sub-btn' onClick={report}>上报</AtButton>
       }
     </View>
   )

weapp/src/packages/patrol/index.scss

@@ -26,7 +26,7 @@ page {
 
   .road-section {
     display: flex;
-    justify-content: space-between;
+    justify-content: left;
     height: 96px;
     align-items: center;
     background-color: #fff;
@@ -38,17 +38,18 @@ page {
 
     .input {
       width: 200px;
+      margin: 0 10px;
     }
 
     .img-r {
       width: 24px;
       height: 14px;
-      margin-right: 30px;
+      margin: 0 10px;
     }
     .img-l {
       width: 24px;
       height: 14px;
-      margin-right: 10px;
+      margin: 0 10px;
     }
   }
 
@@ -72,17 +73,6 @@ page {
   .patrol-img {
     background-color: #fff;
     padding: 20px;
-
-    .img-box {
-      display: flex;
-      flex-wrap: wrap;
-
-      .img {
-        width: 170px;
-        height: 170px;
-        margin: 10px 0 0 10px;
-      }
-    }
   }
 
   .conserve-img {
@@ -93,6 +83,7 @@ page {
       height: 30px;
       width: 100%;
       border-radius: 5px;
+      margin-top: 10px;
       display: flex;
       justify-content: left;
       align-items: center;
@@ -149,8 +140,26 @@ page {
     }
   }
 
+  .img-box {
+    display: flex;
+    flex-wrap: wrap;
+
+    .img {
+      width: 170px;
+      height: 170px;
+      margin: 10px 0 0 10px;
+    }
+  }
+
   .sub-btn {
     width: 70%;
     margin: 80px auto;
   }
+
+  .del-btn {
+    width: 70%;
+    margin: 80px auto;
+    background-color: #C23434;
+    border-color: #C23434;
+  }
 }

weapp/src/packages/patrolView/index.jsx

@@ -37,7 +37,7 @@ function Index() {
   useEffect(() => {
     request.get(getReportList(), {}, { hideErrorToast: true, hideLoading: true }).then(res => {
       if (res.statusCode == 200) {
-        console.log(res);
+        // console.log(res);
         setListData(res.data)
         return res.data;
       } else {

weapp/src/services/api.js

@@ -22,6 +22,17 @@ export const getReportDetail = id => {
   return `/report/${id}/detail`;
 };
 
+// 删除上报
+export const delReport = id => {
+  console.log(id)
+  return `/report/${id}`;
+};
+
+// 获取道路路段
+export const getRoadSection = () => {
+  return `/road/section`;
+};
+
 //行业查询
 export const getIndustryUrl = () => {
   return `/elec/business/industry`

web/client/index.ejs

@@ -9,6 +9,12 @@
       type="text/css"
       href="/assets/font_sc/iconfont.css"
     />
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+          securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
+      }
+  </script>
+  <script src="https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.Adaptor,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.Geocoder,AMap.CustomLayer,Map3D,ElasticMarker"></script>
   </head>
 
   <body style="background: transparent">

web/client/index.html

@@ -10,6 +10,12 @@
       href="/assets/font_sc/iconfont.css"
     />
     <link rel="stylesheet" href="/assets/fontziti/font.css" />
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+          securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
+      }
+  </script>
+  <script src="https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.Adaptor,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.Geocoder,AMap.CustomLayer,Map3D,ElasticMarker"></script>
   </head>
   <body>
     <link

web/client/src/sections/quanju/containers/example.js

@@ -21,20 +21,62 @@ const Example = (props) => {
         // dispatch({ type: 'TAB-CHANGE', data: tab })
     }
 
+
+    useEffect(() => {
+       
+
+        const timer = setTimeout(() => {
+            const map = new AMap.Map("amapId", {
+                //resizeEnable: true,
+                center: [115.912663, 28.543149],//地图中心点，初始定位加载显示楼块
+                // center: [115.857952, 28.683003],//地图中心点
+                zoom: 13,//地图显示的缩放级别
+                zooms: [8, 18],
+                pitch: 65, // 地图俯仰角度，有效范围 0 度- 83 度
+                viewMode: '3D', // 地图模式
+                // rotation: 60
+                // showLabel: false
+            });
+            let styleName = 'amap://styles/fb26776387242721c2fc32e2cb1daccc';
+            map.setMapStyle(styleName);
+    
+            let mapComplete = false;
+            let windowOnload = false;
+            window.onload = function () {
+                windowOnload = true;
+            }
+        }, 100);
+
+        //主题样式
+       
+        return () => {
+            const amapKeys = Object.keys(localStorage).filter(key => key.match(/^_AMap_/))  // 销毁地图
+            amapKeys.forEach(key => {
+                localStorage.removeItem(key)
+            })
+            clearTimeout(timer)
+        }
+    }, [])
+
+
     return (
         <Spin tip="biubiubiu~" spinning={loading}>
-            <div id='example2' style={{
+            <div style={{
                 backgroundColor: "#031839", width: "100vw", height: "100vh", /* transform: `scale(${Math.min(
                     document.body.clientWidth / 1920,
                     document.body.clientHeight / 1080
                 )})`, */
             }}>
+                <div id='amapId' style={{ position: 'absolute', width: "100%", height: "100%" }}></div>
                 <div style={{ width: "100%", height: "10%" }}>
                     <Header tabChange={tabChange} tabKey={tabKey} dispatch={dispatch} />
                 </div>
-                <div style={{ width: "100%", height: "90%" }}>
+
+                <div style={{ position: 'absolute', width: "100%", height: "90%" }}>
                     <Footer tabKey={tabKey} />
                 </div>
+                {/* </div> */}
+
             </div>
         </Spin>
     )

web/client/src/sections/quanju/containers/footer/build/style.less

@@ -45,8 +45,8 @@
                     align-items: center;
                     span{
                         &:nth-child(1){
-                            width: 8px;
+                            width: 0.5rem;
-                            height: 8px;
+                            height: 0.5rem;
                             margin-right: 5px;
                             background: #07B9FE;
                             clip-path: polygon(0 0, 100% 0, 0 100%, 0 0);
@@ -115,7 +115,7 @@
                                 font-size: 1.75rem;
                             font-family: YouSheBiaoTiHei;
                             color: #FFFFFF;
-                            line-height: 36px;
+                            // line-height: 36px;
                             text-shadow: 0px 0px 4px #07B9FE;
                             }
                         }
@@ -221,7 +221,7 @@
            h2{
             height: 30%;
             width: 100%;
-            padding-left: 15px;
+            padding-left: 0.9375rem;
             font-size: 1.5rem;
             font-family: YouSheBiaoTiHei;
             color: #FFFFFF;

web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js

@@ -230,7 +230,7 @@ const LeftCenter = (props) => {
                         <img src='assets/images/quanju/kelvhua_icon.png' alt='icon' style={{ width: '26%' }} />
                         <span style={{ color: '#C2EEFF', marginLeft: 5 }}>可绿化里程总数</span>
                     </Col>
-                    <Col span={9} style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#fff' }}>{totalData}</Col>
+                    <Col span={9} style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#fff' }}>{totalData.toFixed(3) || 0}</Col>
                 </Row>
                 <div ref={chartRef} style={{ height: "14.5vh", width: "100%" }}></div>
 

web/client/src/sections/quanju/containers/footer/guanli/index.js

@@ -6,6 +6,7 @@ import Module from '../../public/module'
 import LeftItem from './LeftItem'
 import {getjiandmanage,getjiandetail} from '../../../actions/example'
 import './style.less'
+import NoData from '../../public/noData';
 const Guanli = (props) => {
     const {dispatch} = props
     const [leftDatas,setleftDatas] = useState([])
@@ -56,9 +57,9 @@ const Guanli = (props) => {
         <div className='guanli'>
         <div className='guanli-left'> 
         <Module style={{height:"100%"}} title="检测点治超处理占比" customize={true}>
-        <AutoRollComponent content={renderLeftContent()}
+        {leftDatas && leftDatas.length!==0?<AutoRollComponent content={renderLeftContent()}
             containerStyle={{ position: "relative", height: "90%", }}
-            divHeight={"100%"} divId={"chart-overview-left"} />
+            divHeight={"100%"} divId={"chart-overview-left"} />:<NoData/>}
         </Module>  
         </div>
         <div className='guanli-right'>
@@ -75,9 +76,9 @@ const Guanli = (props) => {
                 <span>处罚</span>
                 <span>日期</span>
             </div>
-            <AutoRollComponent content={renderContent()}
+            {rightDatas && rightDatas.length!==0?<AutoRollComponent content={renderContent()}
             containerStyle={{ position: "relative", height: "90%", }}
-            divHeight={"100%"} divId={"chart-overview-deviceList"} />
+            divHeight={"100%"} divId={"chart-overview-deviceList"} />:<NoData style={{height:"70%"}}/>}
         </Module>
         </div>
         </div>

web/client/src/sections/quanju/containers/footer/guanli/style.less

@@ -1,6 +1,6 @@
 @media screen and (max-width:1366px){
     html{
-        font-size: 10px;
+        font-size: 12px;
     }
 }
 .guanli{
@@ -72,7 +72,7 @@
                         width: 8px;
                         height: 8px;
                         background-color: #fff;
-                        top: 1.5%;
+                        bottom: 7.0625rem;
                         left: 50%;
                         z-index: 10;
                         border-radius: 4px;

web/client/src/sections/quanju/containers/footer/operation/right.js

@@ -47,15 +47,15 @@ const Right = () => {
                                     </div>
                                     <div className='busVideo'>
                                         <div style={{
-                                            width:'98%',margin:'1% 1%',height:171,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
+                                            width:'98%',margin:'1% 1%',height:152,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
                                             border:'1px solid #1C60FE'
                                             }}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
                                         <div style={{
-                                            width:'48%',margin:'1% 1%',height:140,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
+                                            width:'48%',margin:'1% 1%',height:100,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
                                             border:'1px solid #1C60FE'
                                             }}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
                                         <div style={{
-                                            width:'48%',margin:'1% 1%',height:140,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
+                                            width:'48%',margin:'1% 1%',height:100,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
                                             border:'1px solid #1C60FE'
                                             }}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
                                     </div>

web/client/src/sections/quanju/containers/footer/operation/style.less

@@ -74,4 +74,5 @@
 .busVideo{
 	width: 100%;
 	overflow: hidden;
+	margin-bottom: 2%;
 }

web/client/src/sections/quanju/containers/public/noData.js

@@ -1,7 +1,7 @@
 import React from 'react'
 
-export default function NoData() {
+export default function NoData({style}) {
   return (
-    <div style={{color:"#fff",textAlign:'center',height:"100%",display:'flex',alignItems: "center",justifyContent: "space-around"}}>暂无数据</div>
+    <div style={{color:"#fff",textAlign:'center',height:style?.height||"100%",display:'flex',alignItems: "center",justifyContent: "space-around"}}>暂无数据</div>
   )
 }

web/client/src/sections/quanju/style.less

@@ -1,3 +1,8 @@
 #example:hover {
-    font-size: larger;
+  font-size: larger;
-}
+}
+.amap-logo {
+  display: none;
+
+  opacity: 0 !important;
+}