src/utils/request冲突解决提交

guoshipeng

2022-12-17 05b03aa8cc49dc9415c011522433dd261704cc5b

 .idea/workspace.xml

@@ -2,28 +2,11 @@
<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$/public/UAVReport.docx" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/utils/exportUAVImage.js" 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$/public/airQuality.docx" beforeDir="false" afterPath="$PROJECT_DIR$/public/airQuality.docx" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/public/sailingReport.docx" beforeDir="false" afterPath="$PROJECT_DIR$/public/sailingReport.docx" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/components/Echarts/LineChart2.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Echarts/LineChart2.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/components/Echarts/LineChartSpe.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Echarts/LineChartSpe.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/components/Form/HourPicker1.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Form/HourPicker1.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/components/PlanMap/Map.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/PlanMap/Map.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/router/dynamicRouter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/dynamicRouter.js" 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$/src/views/O3/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/O3/index.vue" 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/charts/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/charts/index.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/contrast/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/contrast/index.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/views/dailyreport/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/dailyreport/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/personnel/role.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/personnel/role.vue" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -374,6 +357,7 @@
      <workItem from="1670458590350" duration="21492000" />
      <workItem from="1670545584810" duration="18335000" />
      <workItem from="1670804880293" duration="11690000" />
      <workItem from="1671253321003" duration="572000" />
    </task>
    <task id="LOCAL-00001" summary="处理详情页侧面菜单不消失">
      <created>1627269084478</created>