Merge branch 'master' of http://blit.7drlb.com:8888/r/moral_fronted

yupan

2022-10-27 1ce8dd8980692da59fac09d4f868b490f7f74b88

 .idea/workspace.xml

@@ -1,7 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="6a923843-d66d-4ccb-892a-72e969a7cbe1" name="Default Changelist" comment="export cityRankWord" />
    <list default="true" id="6a923843-d66d-4ccb-892a-72e969a7cbe1" name="Default Changelist" comment="export cityRankWord">
      <change afterPath="$PROJECT_DIR$/public/hunnan.docx" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/public/sailingReport.docx" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/assets/icon/hn_excel.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/assets/icon/hn_word.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/assets/icon/ico7.png" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/utils/ExportHunnanExcel.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/utils/exportImageFile.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/views/dailyreport/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/airQuality.docx" beforeDir="false" afterPath="$PROJECT_DIR$/cmsdist/airQuality.docx" 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-48dcde72.4e0b5cf8.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/css/chunk-54b04de7.fad76cf5.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/css/chunk-79193580.e0bf2615.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/css/chunk-82e7159e.4f67e73f.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/css/chunk-d9e32600.f4c2acf1.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/css/chunk-ee1d0b46.ef6a1de7.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_CO.fa2078cd.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_NO2.19a351bc.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_O3.6061497d.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_PM10.baf38528.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_PM2.5.54d4496f.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_SO2.ee7f0ef2.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/img/tl_TVOCNew.7f203da4.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/app.03846a50.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-48dcde72.0b7ebff2.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-54b04de7.85b77333.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-5f8a81f5.8442ae25.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-79193580.58478adf.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-82e7159e.250578ec.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-commons.69fc7f8d.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-d9e32600.f256f8d6.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/cmsdist/static/js/chunk-ee1d0b46.00d61b7f.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/public/airQuality.docx" beforeDir="false" afterPath="$PROJECT_DIR$/public/airQuality.docx" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/public/~$demo.docx" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_CO.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_CO.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_NO2.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_NO2.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_O3.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_O3.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_PM10.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_PM10.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_PM2.5.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_PM2.5.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_SO2.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_SO2.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/assets/images/tl_TVOCNew.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/images/tl_TVOCNew.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/components/Echarts/LineChart.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Echarts/LineChart.vue" 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/components/Wind/RegionalOverview.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Wind/RegionalOverview.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/utils/request.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/request.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/air/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/air/index.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/car/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/car/index.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/deviceDetail/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/deviceDetail/index.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/main/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/main/index.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/surveyReport/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/surveyReport/index.vue" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -10,8 +66,8 @@
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
        <option value="JavaScript File" />
        <option value="Vue Single File Component" />
        <option value="JavaScript File" />
      </list>
    </option>
  </component>
@@ -21,7 +77,7 @@
        <entry key="$PROJECT_DIR$" value="dev" />
      </map>
    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="GitSEFilterConfiguration">
    <file-type-list>
@@ -50,24 +106,24 @@
    <property name="node.js.selected.package.eslint" value="G:\webVue\fronted-vue\node_modules\eslint" />
    <property name="node.js.selected.package.standard" value="" />
    <property name="nodejs_package_manager_path" value="npm" />
    <property name="settings.editor.selected.configurable" value="preferences.editor" />
    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
    <property name="ts.external.directory.path" value="F:\webstorm\WebStorm 2021.1.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
    <property name="vue.rearranger.settings.migration" value="true" />
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="C:\Users\Administrator\Desktop\mo_fronted\moral_fronted\public" />
      <recent name="C:\Users\Administrator\Desktop\mo_fronted\moral_fronted\src\views" />
      <recent name="C:\Users\Administrator\Desktop\mo_fronted\moral_fronted\src\assets\images" />
      <recent name="C:\Users\Administrator\Desktop\mo_fronted\moral_fronted\src\assets\icon" />
      <recent name="G:\webVue\fronted-vue\public" />
      <recent name="G:\webVue\fronted-vue\public\map" />
      <recent name="G:\webVue\fronted-vue\src\utils" />
      <recent name="G:\webVue\fronted-vue\static" />
      <recent name="G:\webVue\fronted-vue\src\components\Echarts" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="C:\Users\Administrator\Desktop\mo_fronted\moral_fronted\src\assets\icon" />
      <recent name="G:\webVue\fronted-vue\public" />
      <recent name="G:\webVue\fronted-vue\static" />
      <recent name="G:\webVue\fronted-vue\src\views\airQualityReportDisplay" />
      <recent name="G:\webVue\fronted-vue\src\assets" />
      <recent name="G:\webVue\fronted-vue\src\assets\images\regionalOverview" />
    </key>
  </component>
  <component name="RunManager">
@@ -290,6 +346,28 @@
      <workItem from="1664410859800" duration="5839000" />
      <workItem from="1664438370302" duration="74000" />
      <workItem from="1664440877268" duration="254000" />
      <workItem from="1664443373851" duration="1519000" />
      <workItem from="1665016063213" duration="9485000" />
      <workItem from="1665038504561" duration="6264000" />
      <workItem from="1665102815522" duration="4575000" />
      <workItem from="1665189035828" duration="22332000" />
      <workItem from="1665275172545" duration="28631000" />
      <workItem from="1665361527720" duration="23905000" />
      <workItem from="1665448502849" duration="19062000" />
      <workItem from="1665534253383" duration="23646000" />
      <workItem from="1665620561210" duration="27499000" />
      <workItem from="1665706834605" duration="26490000" />
      <workItem from="1665966466475" duration="24840000" />
      <workItem from="1666052514444" duration="24090000" />
      <workItem from="1666139141607" duration="22847000" />
      <workItem from="1666225464440" duration="27030000" />
      <workItem from="1666311749864" duration="11562000" />
      <workItem from="1666570687132" duration="22630000" />
      <workItem from="1666657273724" duration="19000" />
      <workItem from="1666657357352" duration="34000" />
      <workItem from="1666657410241" duration="27263000" />
      <workItem from="1666743825980" duration="28135000" />
      <workItem from="1666829817501" duration="2666000" />
    </task>
    <task id="LOCAL-00001" summary="处理详情页侧面菜单不消失">
      <created>1627269084478</created>
@@ -458,19 +536,19 @@
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/src/views/reportForm/index.vue</url>
          <line>223</line>
          <option name="timeStamp" value="42" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/src/views/reportForm/index.vue</url>
          <line>241</line>
          <option name="timeStamp" value="43" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/src/components/Wind/Map.vue</url>
          <line>512</line>
          <line>846</line>
          <option name="timeStamp" value="44" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/src/views/car/index.vue</url>
          <line>789</line>
          <option name="timeStamp" value="45" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>