parent: 37040acb | patch | commit | ignore whitespace
guoshipeng
2023-01-05 e4bdde0126e1d922456c270626bac312df27912f 
风场时间段选择，空气质量报告模板修改
1 files added
6 files modified
232 ■■■■■ changed files
.idea/workspace.xml 26 ●●●●● patch | view | raw | blame | history
cmsdist/index.html 2 ●●●●● patch | view | raw | blame | history
public/airQuality.docx patch | view | raw | blame | history
src/components/Wind/Map.vue 128 ●●●●● patch | view | raw | blame | history
src/router/dynamicRouter.js 12 ●●●●● patch | view | raw | blame | history
src/views/PM5PM10ForecastChart/index.vue 56 ●●●●● patch | view | raw | blame | history
src/views/dailyreport/index.vue 8 ●●●●● patch | view | raw | blame | history 
 .idea/workspace.xml


@@ -2,11 +2,13 @@


<project version="4">


  <component name="ChangeListManager">


    <list default="true" id="6a923843-d66d-4ccb-892a-72e969a7cbe1" name="Default Changelist" comment="export cityRankWord">


      <change afterPath="$PROJECT_DIR$/src/views/PM5PM10ForecastChart/index.vue" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/cmsdist/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/cmsdist/index.html" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/cmsdist/static/css/chunk-60cd7b5b.4e0b5cf8.css" beforeDir="false" />


      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-e48dd19a.421499f9.js" beforeDir="false" />


      <change beforePath="$PROJECT_DIR$/src/utils/request.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/request.js" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/public/airQuality.docx" beforeDir="false" afterPath="$PROJECT_DIR$/public/airQuality.docx" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/src/components/Wind/Map.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Wind/Map.vue" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/src/router/dynamicRouter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/dynamicRouter.js" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/src/views/dailyreport/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/dailyreport/index.vue" afterDir="false" />


    </list>


    <option name="SHOW_DIALOG" value="false" />


    <option name="HIGHLIGHT_CONFLICTS" value="true" />


@@ -16,8 +18,8 @@


  <component name="FileTemplateManagerImpl">


    <option name="RECENT_TEMPLATES">


      <list>


        <option value="Vue Single File Component" />


        <option value="JavaScript File" />


        <option value="Vue Single File Component" />


      </list>


    </option>


  </component>


@@ -357,7 +359,19 @@


      <workItem from="1670458590350" duration="21492000" />


      <workItem from="1670545584810" duration="18335000" />


      <workItem from="1670804880293" duration="11690000" />


      <workItem from="1671253321003" duration="572000" />


      <workItem from="1671253321003" duration="2753000" />


      <workItem from="1671415778084" duration="4609000" />


      <workItem from="1671495660513" duration="12928000" />


      <workItem from="1671582310795" duration="11064000" />


      <workItem from="1671668658863" duration="2931000" />


      <workItem from="1672187240289" duration="5012000" />


      <workItem from="1672273570434" duration="11801000" />


      <workItem from="1672359879682" duration="8109000" />


      <workItem from="1672705574387" duration="6367000" />


      <workItem from="1672792104603" duration="10610000" />


      <workItem from="1672878692812" duration="4973000" />


      <workItem from="1672905950696" duration="254000" />


      <workItem from="1672906896558" duration="38000" />


    </task>


    <task id="LOCAL-00001" summary="处理详情页侧面菜单不消失">


      <created>1627269084478</created>


@@ -531,7 +545,7 @@


        </line-breakpoint>


        <line-breakpoint enabled="true" type="javascript">


          <url>file://$PROJECT_DIR$/src/views/car/index.vue</url>


          <line>1054</line>


          <line>1285</line>


          <option name="timeStamp" value="44" />


        </line-breakpoint>


      </breakpoints>




 cmsdist/index.html


@@ -6,7 +6,7 @@




    html {


      overflow-y: hidden;


    }</style><link href=/static/css/chunk-elementUI.f2af0811.css rel=stylesheet><link href=/static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=/static/css/app.cfbc7fff.css rel=stylesheet></head><body><noscript><strong>七星瓢虫环境科技 不支持无javaScript环境</strong></noscript><div id=app></div><script src=/static/js/chunk-elementUI.b4749c03.js></script><script src=/static/js/chunk-libs.afc70fdc.js></script><script>(function(e){function c(c){for(var u,a,h=c[0],r=c[1],f=c[2],o=0,k=[];o<h.length;o++)a=h[o],t[a]&&k.push(t[a][0]),t[a]=0;for(u in r)Object.prototype.hasOwnProperty.call(r,u)&&(e[u]=r[u]);b&&b(c);while(k.length)k.shift()();return d.push.apply(d,f||[]),n()}function n(){for(var e,c=0;c<d.length;c++){for(var n=d[c],u=!0,a=1;a<n.length;a++){var h=n[a];0!==t[h]&&(u=!1)}u&&(d.splice(c--,1),e=r(r.s=n[0]))}return e}var u={},a={runtime:0},t={runtime:0},d=[];function h(e){return r.p+"static/js/"+({"chunk-commons":"chunk-commons"}[e]||e)+"."+{"chunk-09784ec9":"dbe1340e","chunk-5f8a81f5":"8442ae25","chunk-48dcde72":"411a2b04","chunk-201c0396":"e0973614","chunk-26aa192a":"e6457b0f","chunk-2c6cd7be":"e570f775","chunk-2d0aa5b8":"aa86ab80","chunk-04dff74e":"1cb9d266","chunk-9b8df984":"3a71dead","chunk-2d0b9293":"7c7bfbf9","chunk-4adb9048":"880dca0f","chunk-5d23b120":"d84e40ff","chunk-85a2e2d8":"77323a94","chunk-aa6495fe":"47ab2c3e","chunk-495b3b99":"e0b7ddb2","chunk-5db5f624":"b668735f","chunk-ec6a3d1c":"24a1b25b","chunk-e6c00ab8":"efa42862","chunk-03e4f198":"83141390","chunk-515db732":"39e96745","chunk-c9c77a48":"a4085eb5","chunk-commons":"6b3b72b2","chunk-0e0b280e":"1a822fd8","chunk-47eed6e4":"a0c74128","chunk-6f5de554":"8fb28c7e","chunk-243d09ae":"62b14b01","chunk-3ae74665":"250f4e22","chunk-44900a0d":"01a48cc2","chunk-64670b04":"81e51d2c","chunk-605a94e1":"ac10f019","chunk-4a79fb70":"04314571","chunk-4ae0200c":"70472151","chunk-7a25313a":"3fe5b2c1","chunk-d38dc67e":"5d490a2c","chunk-7ad495bf":"75747fd9","chunk-56675a6e":"b82d1796","chunk-0a0d3ad6":"83ba6665","chunk-58cd2d80":"7b33f23b"}[e]+".js"}function r(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=[],n={"chunk-48dcde72":1,"chunk-201c0396":1,"chunk-26aa192a":1,"chunk-2c6cd7be":1,"chunk-04dff74e":1,"chunk-9b8df984":1,"chunk-4adb9048":1,"chunk-5d23b120":1,"chunk-85a2e2d8":1,"chunk-495b3b99":1,"chunk-ec6a3d1c":1,"chunk-03e4f198":1,"chunk-515db732":1,"chunk-c9c77a48":1,"chunk-0e0b280e":1,"chunk-47eed6e4":1,"chunk-243d09ae":1,"chunk-3ae74665":1,"chunk-44900a0d":1,"chunk-64670b04":1,"chunk-605a94e1":1,"chunk-4a79fb70":1,"chunk-4ae0200c":1,"chunk-7a25313a":1,"chunk-d38dc67e":1,"chunk-56675a6e":1,"chunk-0a0d3ad6":1,"chunk-58cd2d80":1};a[e]?c.push(a[e]):0!==a[e]&&n[e]&&c.push(a[e]=new Promise((function(c,n){for(var u="static/css/"+({"chunk-commons":"chunk-commons"}[e]||e)+"."+{"chunk-09784ec9":"31d6cfe0","chunk-5f8a81f5":"31d6cfe0","chunk-48dcde72":"4e0b5cf8","chunk-201c0396":"3bec9bdf","chunk-26aa192a":"2af0888d","chunk-2c6cd7be":"577279a3","chunk-2d0aa5b8":"31d6cfe0","chunk-04dff74e":"8bd549e9","chunk-9b8df984":"751d2ae0","chunk-2d0b9293":"31d6cfe0","chunk-4adb9048":"6e6b0b74","chunk-5d23b120":"0b74763b","chunk-85a2e2d8":"99ec93e0","chunk-aa6495fe":"31d6cfe0","chunk-495b3b99":"40cb5e47","chunk-5db5f624":"31d6cfe0","chunk-ec6a3d1c":"3d0ac165","chunk-e6c00ab8":"31d6cfe0","chunk-03e4f198":"0e23a2c4","chunk-515db732":"ccf69b0e","chunk-c9c77a48":"a37cd815","chunk-commons":"31d6cfe0","chunk-0e0b280e":"ff6fa18a","chunk-47eed6e4":"3de502ed","chunk-6f5de554":"31d6cfe0","chunk-243d09ae":"79a92fcd","chunk-3ae74665":"c52f1a86","chunk-44900a0d":"9c0e30cb","chunk-64670b04":"94095f03","chunk-605a94e1":"af7a0dbe","chunk-4a79fb70":"c452ee63","chunk-4ae0200c":"423b9be8","chunk-7a25313a":"3225998f","chunk-d38dc67e":"34fb2242","chunk-7ad495bf":"31d6cfe0","chunk-56675a6e":"0417d0b9","chunk-0a0d3ad6":"6c805bdf","chunk-58cd2d80":"ccb6045c"}[e]+".css",t=r.p+u,d=document.getElementsByTagName("link"),h=0;h<d.length;h++){var f=d[h],o=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(o===u||o===t))return c()}var k=document.getElementsByTagName("style");for(h=0;h<k.length;h++){f=k[h],o=f.getAttribute("data-href");if(o===u||o===t)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||t,d=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");d.code="CSS_CHUNK_LOAD_FAILED",d.request=u,delete a[e],b.parentNode.removeChild(b),n(d)},b.href=t;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){a[e]=0})));var u=t[e];if(0!==u)if(u)c.push(u[2]);else{var d=new Promise((function(c,n){u=t[e]=[c,n]}));c.push(u[2]=d);var f,o=document.createElement("script");o.charset="utf-8",o.timeout=120,r.nc&&o.setAttribute("nonce",r.nc),o.src=h(e),f=function(c){o.onerror=o.onload=null,clearTimeout(k);var n=t[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),a=c&&c.target&&c.target.src,d=new Error("Loading chunk "+e+" failed.\n("+u+": "+a+")");d.type=u,d.request=a,n[1](d)}t[e]=void 0}};var k=setTimeout((function(){f({type:"timeout",target:o})}),12e4);o.onerror=o.onload=f,document.head.appendChild(o)}return Promise.all(c)},r.m=e,r.c=u,r.d=function(e,c,n){r.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},r.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,c){if(1&c&&(e=r(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)r.d(n,u,function(c){return e[c]}.bind(null,u));return n},r.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="/",r.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],o=f.push.bind(f);f.push=c,f=f.slice();for(var k=0;k<f.length;k++)c(f[k]);var b=o;n()})([]);</script><script src=/static/js/app.164169e2.js></script></body><script>var docEl = document.documentElement,


    }</style><link href=/static/css/chunk-elementUI.f2af0811.css rel=stylesheet><link href=/static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=/static/css/app.cfbc7fff.css rel=stylesheet></head><body><noscript><strong>七星瓢虫环境科技 不支持无javaScript环境</strong></noscript><div id=app></div><script src=/static/js/chunk-elementUI.b4749c03.js></script><script src=/static/js/chunk-libs.afc70fdc.js></script><script>(function(e){function c(c){for(var u,a,h=c[0],r=c[1],f=c[2],o=0,k=[];o<h.length;o++)a=h[o],t[a]&&k.push(t[a][0]),t[a]=0;for(u in r)Object.prototype.hasOwnProperty.call(r,u)&&(e[u]=r[u]);b&&b(c);while(k.length)k.shift()();return d.push.apply(d,f||[]),n()}function n(){for(var e,c=0;c<d.length;c++){for(var n=d[c],u=!0,a=1;a<n.length;a++){var h=n[a];0!==t[h]&&(u=!1)}u&&(d.splice(c--,1),e=r(r.s=n[0]))}return e}var u={},a={runtime:0},t={runtime:0},d=[];function h(e){return r.p+"static/js/"+({"chunk-commons":"chunk-commons"}[e]||e)+"."+{"chunk-09784ec9":"dbe1340e","chunk-5f8a81f5":"8442ae25","chunk-48dcde72":"411a2b04","chunk-201c0396":"e0973614","chunk-26aa192a":"e6457b0f","chunk-2c6cd7be":"e570f775","chunk-2d0aa5b8":"aa86ab80","chunk-04dff74e":"1cb9d266","chunk-9b8df984":"3a71dead","chunk-2d0b9293":"7c7bfbf9","chunk-4adb9048":"880dca0f","chunk-5d23b120":"d84e40ff","chunk-85a2e2d8":"77323a94","chunk-aa6495fe":"47ab2c3e","chunk-495b3b99":"e0b7ddb2","chunk-5db5f624":"b668735f","chunk-ec6a3d1c":"24a1b25b","chunk-e6c00ab8":"efa42862","chunk-03e4f198":"83141390","chunk-515db732":"39e96745","chunk-c9c77a48":"a4085eb5","chunk-commons":"6b3b72b2","chunk-0e0b280e":"1a822fd8","chunk-47eed6e4":"a0c74128","chunk-6f5de554":"8fb28c7e","chunk-243d09ae":"62b14b01","chunk-44900a0d":"01a48cc2","chunk-64670b04":"81e51d2c","chunk-ec8fa258":"4d656dae","chunk-4a79fb70":"04314571","chunk-4ae0200c":"70472151","chunk-7a25313a":"3fe5b2c1","chunk-d89e6198":"0142a6be","chunk-d38dc67e":"5d490a2c","chunk-7ad495bf":"75747fd9","chunk-56675a6e":"b82d1796","chunk-0a0d3ad6":"83ba6665","chunk-58cd2d80":"7b33f23b"}[e]+".js"}function r(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=[],n={"chunk-48dcde72":1,"chunk-201c0396":1,"chunk-26aa192a":1,"chunk-2c6cd7be":1,"chunk-04dff74e":1,"chunk-9b8df984":1,"chunk-4adb9048":1,"chunk-5d23b120":1,"chunk-85a2e2d8":1,"chunk-495b3b99":1,"chunk-ec6a3d1c":1,"chunk-03e4f198":1,"chunk-515db732":1,"chunk-c9c77a48":1,"chunk-0e0b280e":1,"chunk-47eed6e4":1,"chunk-243d09ae":1,"chunk-44900a0d":1,"chunk-64670b04":1,"chunk-ec8fa258":1,"chunk-4a79fb70":1,"chunk-4ae0200c":1,"chunk-7a25313a":1,"chunk-d89e6198":1,"chunk-d38dc67e":1,"chunk-56675a6e":1,"chunk-0a0d3ad6":1,"chunk-58cd2d80":1};a[e]?c.push(a[e]):0!==a[e]&&n[e]&&c.push(a[e]=new Promise((function(c,n){for(var u="static/css/"+({"chunk-commons":"chunk-commons"}[e]||e)+"."+{"chunk-09784ec9":"31d6cfe0","chunk-5f8a81f5":"31d6cfe0","chunk-48dcde72":"4e0b5cf8","chunk-201c0396":"3bec9bdf","chunk-26aa192a":"2af0888d","chunk-2c6cd7be":"577279a3","chunk-2d0aa5b8":"31d6cfe0","chunk-04dff74e":"8bd549e9","chunk-9b8df984":"751d2ae0","chunk-2d0b9293":"31d6cfe0","chunk-4adb9048":"6e6b0b74","chunk-5d23b120":"0b74763b","chunk-85a2e2d8":"99ec93e0","chunk-aa6495fe":"31d6cfe0","chunk-495b3b99":"40cb5e47","chunk-5db5f624":"31d6cfe0","chunk-ec6a3d1c":"3d0ac165","chunk-e6c00ab8":"31d6cfe0","chunk-03e4f198":"0e23a2c4","chunk-515db732":"ccf69b0e","chunk-c9c77a48":"a37cd815","chunk-commons":"31d6cfe0","chunk-0e0b280e":"ff6fa18a","chunk-47eed6e4":"3de502ed","chunk-6f5de554":"31d6cfe0","chunk-243d09ae":"79a92fcd","chunk-44900a0d":"9c0e30cb","chunk-64670b04":"94095f03","chunk-ec8fa258":"c4b49e14","chunk-4a79fb70":"c452ee63","chunk-4ae0200c":"423b9be8","chunk-7a25313a":"3225998f","chunk-d89e6198":"38d255bc","chunk-d38dc67e":"34fb2242","chunk-7ad495bf":"31d6cfe0","chunk-56675a6e":"0417d0b9","chunk-0a0d3ad6":"6c805bdf","chunk-58cd2d80":"ccb6045c"}[e]+".css",t=r.p+u,d=document.getElementsByTagName("link"),h=0;h<d.length;h++){var f=d[h],o=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(o===u||o===t))return c()}var k=document.getElementsByTagName("style");for(h=0;h<k.length;h++){f=k[h],o=f.getAttribute("data-href");if(o===u||o===t)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||t,d=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");d.code="CSS_CHUNK_LOAD_FAILED",d.request=u,delete a[e],b.parentNode.removeChild(b),n(d)},b.href=t;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){a[e]=0})));var u=t[e];if(0!==u)if(u)c.push(u[2]);else{var d=new Promise((function(c,n){u=t[e]=[c,n]}));c.push(u[2]=d);var f,o=document.createElement("script");o.charset="utf-8",o.timeout=120,r.nc&&o.setAttribute("nonce",r.nc),o.src=h(e),f=function(c){o.onerror=o.onload=null,clearTimeout(k);var n=t[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),a=c&&c.target&&c.target.src,d=new Error("Loading chunk "+e+" failed.\n("+u+": "+a+")");d.type=u,d.request=a,n[1](d)}t[e]=void 0}};var k=setTimeout((function(){f({type:"timeout",target:o})}),12e4);o.onerror=o.onload=f,document.head.appendChild(o)}return Promise.all(c)},r.m=e,r.c=u,r.d=function(e,c,n){r.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},r.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,c){if(1&c&&(e=r(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)r.d(n,u,function(c){return e[c]}.bind(null,u));return n},r.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="/",r.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],o=f.push.bind(f);f.push=c,f=f.slice();for(var k=0;k<f.length;k++)c(f[k]);var b=o;n()})([]);</script><script src=/static/js/app.3b35c8c9.js></script></body><script>var docEl = document.documentElement,


    //当设备的方向变化（设备横向持或纵向持）此事件被触发。绑定此事件时，


    //注意现在当浏览器不支持orientationChange事件的时候我们绑定了resize 事件。


    //总来的来就是监听当前窗口的变化，一旦有变化就需要重新设置根字体的值




 public/airQuality.docx

Binary files differ



 src/components/Wind/Map.vue


@@ -181,6 +181,7 @@


          <li>21</li>



          <li></li>



          <li></li>



          <li>00</li>



        </ul>



        <div style="display: flex;width: 100%; border-top: 1px solid rgba(255,255,255,0.5)" class="dayDiv">



          <p class="p1"></p>



@@ -407,8 +408,10 @@


      dateFormat: '',



      alarmTableVisible: false,



      chooseTimeInfo: false, // 是否选择了时间点



      chooseTime: false,



      dateInfo: '', // 选择的日期



      timeInfo: '' // 选择的时间



      timeInfo: '', // 选择的时间



      nyr: '', // 选择的年月日



    }



  },



  computed: {



@@ -499,16 +502,21 @@


      }



      return `${rq}(${days})`



    },



    // 计算当前天之前或者之后的日期



    newData(day) {



    // 计算当天之前或者之后的日期



    newData(day, info) {



      var today = new Date()



      var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;



      var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day



      today.setTime(targetday_milliseconds)



      var tYear = today.getFullYear()



      var tMonth = today.getMonth() + 1



      tMonth = tMonth < 10 ? '0' + tMonth : tMonth



      var tDate = today.getDate()



      tDate = tDate < 10 ? '0' + tDate : tDate



      return tMonth + '/' + tDate



      if (info === 'nyr') {



        return tYear + '-' + tMonth + '-' + tDate



      } else {



        return tMonth + '/' + tDate



      }



    },



    // 事件代理



    eventProxy() {



@@ -528,35 +536,47 @@


      p2.innerHTML = this.getDayXQ('yesterday')



      p1.innerHTML = this.getDayXQ('beforeYea')



      var greenInfo = 0



      var that = this



      ul.onclick = (e) => {



        // 给所有的li颜色设为初始值



        for (let i = 0; i < lis.length; i++) {



          lis[i].style.backgroundColor = 'rgba(0,0,0,0.3)'



        }



        var target = e.target



        if (target.tagName.toLowerCase() === 'li') {



          // 给所有的li颜色设为初始值



          for (let i = 0; i < lis.length; i++) {



            lis[i].style.backgroundColor = 'rgba(0,0,0,0.3)'



          }



          // var li = this.querySelectorAll('li')



          // var index = Array.prototype.indexOf.call(li, target)



          for (let i = 0; i < lis.length; i++) {



            lis[i].style.backgroundColor = 'green'



            if (lis[i] === target) {



              mouseDiv2.style.left = (1.36986 * (i - 1) + 0.68493) + '%'



              // mouseDiv2.style.left = (1.36986 * (i - 1) + 0.68493) + '%'



              mouseDiv2.style.left = (1.36986 * (i + 1)) + '%'



              mouseDiv2.style.transform = 'translateX(-50%)'



              mouseDiv2.style.display = 'block'



              var times = (i - 0 + 1) % 24



              times = times > 9 ? times : '0' + times



              inText2.innerHTML = times + ':00'



              this.chooseTimeInfo = true // 选择时间点



              if (i / 24 < 1) {



                console.log(111)



              } else if (i / 24 <= 2 && i / 24 > 1) {



                console.log(222)



              this.chooseTime = true // 选择时间点



              if ((i + 1) / 24 < 1) {



                this.nyr = this.newData(-2, 'nyr') + ' ' + times + ':00'



                console.log(111, this.nyr)



              } else if ((i + 1) / 24 < 2 && (i + 1) / 24 >= 1) {



                this.nyr = this.newData(-1, 'nyr') + ' ' + times + ':00'



                console.log(222, this.nyr)



              } else if ((i + 1) / 24 < 3 && (i + 1) / 24 >= 2) {



                this.nyr = this.newData(0, 'nyr') + ' ' + times + ':00'



                console.log(333, this.nyr)



              } else {



                console.log(333)



                this.nyr = this.newData(1, 'nyr') + ' ' + times + ':00'



                console.log(444, this.nyr)



              }



              break



            }



          }



        }



        that.times = 1



        that.getParamsData()



      }



      // timeUl绑定点击事件



      timeUl.onclick = e => {



@@ -566,31 +586,50 @@


          for (let i = 0; i < timeLis.length; i++) {



            if (timeLis[i] === target) {



              greenInfo = i



              mouseDiv2.style.left = (1.36986 * (i - 2) + 0.68493) + '%'



              // mouseDiv2.style.left = (1.36986 * (i - 2) + 0.68493) + '%'



              mouseDiv2.style.left = (1.36986 * i) + '%'



              mouseDiv2.style.transform = 'translateX(-50%)'



              mouseDiv2.style.display = 'block'



              var times = i % 24



              times = times > 9 ? times : '0' + times



              inText2.innerHTML = times + ':00'



              this.chooseTimeInfo = true // 选择时间点



              this.chooseTime = true // 选择时间点



              if (i / 24 < 1) {



                this.nyr = this.newData(-2, 'nyr') + ' ' + times + ':00'



                console.log(111, this.nyr)



              } else if (i / 24 < 2 && i / 24 >= 1) {



                this.nyr = this.newData(-1, 'nyr') + ' ' + times + ':00'



                console.log(222, this.nyr)



              } else if (i / 24 < 3 && i / 24 >= 2) {



                this.nyr = this.newData(0, 'nyr') + ' ' + times + ':00'



                console.log(333, this.nyr)



              } else {



                this.nyr = this.newData(1, 'nyr') + ' ' + times + ':00'



                console.log(444, this.nyr)



              }



              break



            }



          }



          if (greenInfo !== 0) {



            for (let i = 0; i < lis.length; i++) {



              if (i < greenInfo) {



                lis[i].style.backgroundColor = 'green'



              } else {



                lis[i].style.backgroundColor = 'rgba(0,0,0,0.3)'



              }



          for (let i = 0; i < lis.length; i++) {



            if (i < greenInfo) {



              lis[i].style.backgroundColor = 'green'



            } else {



              lis[i].style.backgroundColor = 'rgba(0,0,0,0.3)'



            }



          }



          // console.log('下边点击进来了', greenInfo, 'index')



        }



        that.times = 1



        that.getParamsData()



      }



      // 鼠标移入移出事件



      for (let i = 0; i < lis.length; i++) {



        lis[i].onmouseenter = function() {



          // console.log('mouseenter', i)



          mouseDiv.style.left = (1.36986 * (i - 1) + 0.68493) + '%'



          // mouseDiv.style.left = (1.36986 * (i - 1) + 0.68493) + '%'



          mouseDiv.style.transform = 'translateX(-50%)'



          mouseDiv.style.left = (1.36986 * (i + 1)) + '%'



          mouseDiv.style.display = 'block'



          var times = (i - 0 + 1) % 24



          times = times > 9 ? times : '0' + times



@@ -605,7 +644,9 @@


      for (let i = 0; i < timeLis.length; i++) {



        timeLis[i].onmouseenter = function() {



          // console.log('mouseenter', i)



          mouseDiv.style.left = (1.36986 * (i - 2) + 0.68493) + '%'



          // mouseDiv.style.left = (1.36986 * (i - 2) + 0.68493) + '%'



          mouseDiv.style.left = (1.36986 * i) + '%'



          mouseDiv.style.transform = 'translateX(-50%)'



          mouseDiv.style.display = 'block'



          var times = i % 24



          times = times > 9 ? times : '0' + times



@@ -897,7 +938,9 @@


        params: {



          sensorCode: this.sensorKey,



          organizationId: this.$store.state.orgId,



          regionCode: this.$store.state.regionCode



          regionCode: this.$store.state.regionCode,



          chooseTime: this.chooseTime,



          time: this.nyr



        }



      }).then((data) => {



        // console.log('五分钟设备数据')



@@ -1233,7 +1276,7 @@


        var _this = this



        marker.on('mouseover', function(e) {



          this.noneData = false



          // $.getJSON('http://47.99.64.149:8080/historyFiveMinutely/queryPopDataByMac', { 'mac': keyData[i].mac }, (res) => {



          // $.getJSON('http://47.99.64.149:8080/historyFiveMinutely/queryPopDataByMac', { 'mac': keyData[i].mac, chooseTime: this.chooseTime, time: this.nyr }, (res) => {



          //   var data = JSON.stringify(res.data).replace(/,/g, `<br>`).replace(/{|}|"/g, '')



          //   // console.log(data)



          //   this.bindPopup(data).openPopup()



@@ -1242,7 +1285,9 @@


            url: '/historyFiveMinutely/queryPopDataByMac',



            method: 'get',



            params: {



              mac: keyData[i].mac



              mac: keyData[i].mac,



              chooseTime: _this.chooseTime,



              time: _this.nyr



            }



          }).then((res) => {



            for (const key in res.data) {



@@ -1412,8 +1457,20 @@


        this.times--



        if (this.times === 0) {



          // 时间点选择标记消失



          var mouseDiv2 = document.querySelector('.mouseDiv2')



          mouseDiv2.style.display = 'none'



          if (!this.chooseTimeInfo) {



            var mouseDiv2 = document.querySelector('.mouseDiv2')



            mouseDiv2.style.display = 'none'



            var lis = document.querySelectorAll('#eventPro>li')



            for (let i = 0; i < lis.length; i++) {



              lis[i].style.backgroundColor = 'rgba(0,0,0,0.3)'



            }



            this.chooseTime = false



            // console.log('rgb000')



          } else {



            this.chooseTimeInfo = false



            // console.log('else')



          }



          // console.log(this.chooseTimeInfo, 'this.chooseTimeInfo ')



          // clearInterval(this.timer)



          if (this.windState === 1) {



            // this.ws.close()



@@ -1516,7 +1573,9 @@


        url: '/monitorPoint/getWindData',



        method: 'get',



        params: {



          monitorPointIds: JSON.stringify(this.monitorPointIds[0])



          monitorPointIds: JSON.stringify(this.monitorPointIds[0]),



          chooseTime: this.chooseTime,



          time: this.nyr



        }



      }).then(res => {



        // console.log('新风场数据')



@@ -1722,12 +1781,12 @@


}



.jdt{



  height: 5px;



  width: 73%;



  width: 100%;



  display: flex;



  position: relative;



}



.timeDiv{



  width: 73%;



  width: 100%;



  float: left;



}



.topDate .timeDiv:nth-child(3){



@@ -1759,6 +1818,9 @@


  height: 100%;



  width: 1.36986%;



  list-style: none;



  position: relative;



  left: 0;



  top: 0;



}



.dayDiv p{



  width: 32.87664%;





 src/router/dynamicRouter.js


@@ -80,6 +80,13 @@


  meta: { title: '空气质量污染日历', icon: 'example' }


}




// const PM5PM10ForecastChart = {


//   path: 'charts/PM5PM10ForecastChart',


//   name: 'PM5PM10ForecastChart',


//   component: () => import('@/views/PM5PM10ForecastChart/index'),


//   meta: { title: 'PM5PM10预测图', icon: 'example' }


// }




// 报表管理


const showMpData = {


  path: 'report/showMpData',


@@ -203,8 +210,9 @@


  airQualityReportDisplay,


  Monitoringstation,


  Equipment,


  dailyreport,  


  sectionReport


  dailyreport,


  sectionReport,


  // PM5PM10ForecastChart


}




// 网络请求，第一次登陆只有4个路由，所以要添加路由，页面刷新的时候，判断大于4个路由，就不会重新添加。




 src/views/PM5PM10ForecastChart/index.vue


New file


@@ -0,0 +1,56 @@


<template>



 <div class="forecastChart">



   <div class="classTop">



     <el-select v-model="valueSelect" placeholder="请选择">



       <el-option



           v-for="item in options"



           :key="item.value"



           :label="item.label"



           :value="item.value">



       </el-option>



     </el-select>



     <el-date-picker



         v-model="valueDate"



         type="date"



         placeholder="选择日期">



     </el-date-picker>



   </div>



 </div>



</template>







<script>



export default {



  data() {



    return {



      options: [{



        value: '选项1',



        label: '黄金糕'



      }, {



        value: '选项2',



        label: '双皮奶'



      }, {



        value: '选项3',



        label: '蚵仔煎'



      }, {



        value: '选项4',



        label: '龙须面'



      }, {



        value: '选项5',



        label: '北京烤鸭'



      }],



      valueSelect: '',



      valueDate: ''



    }



  },



  methods: {







  }



}



</script>







<style scoped>



.forecastChart{



  width: 100%;



  height: 100%;



}



</style>





 src/views/dailyreport/index.vue


@@ -882,12 +882,16 @@


        upObj.time = this.upTime


        var objJson = JSON.stringify(upObj)


        console.log(objJson, 'objJson')


        // const formData = new FormData()


        // formData.append(`objJson`, objJson)


        // 弹框隐藏


        this.openBox = false


        this.$request({


          url: 'uav/getUavDaily',


          // data: formData,


          data: { objJson: objJson },


          method: 'post'


          method: 'post',


          contentType: 'application/json'


        }).then(res => {


          this.isDisplay = false


          if (res.code === 0) {


@@ -952,7 +956,7 @@


        this.sailingReport.index = imagesObj.length


        var data2 = obj.date.split('-')


        this.sailingReport.date2 = data2[0] + '年' + data2[1] + '月' + data2[2] + '日'


        var time = []   


        var time = []


        for (let i = 0; i < res.data.code.time.length; i++) {


          time.push(res.data.code.time[i])


        }