马宇豪
2023-08-02 3b941ede66cdd942faf1639356544fb57e850db1
修改泥石流删除洪涝
已修改15个文件
91 ■■■■ 文件已修改
src/components/Home/IndexEcharts.vue 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/Home/Projecting.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/Report.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/callRecord.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/components/msgDetailMod.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/components/msgEditMod.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/components/reactionMod.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/history.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/list.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/massSend.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/msgRecord.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/msgReview.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/notice.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/reactionManage.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Admin/release.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/Home/IndexEcharts.vue
@@ -21,28 +21,48 @@
      const res = await getWarningData()
      if(res.data.code == 100){
        let data = res.data.data
        let redData = [0,0,0,0,0,0]
        let orangeData = [0,0,0,0,0,0]
        let yellowData = [0,0,0,0,0,0]
        let blueData = [0,0,0,0,0,0]
        let redData = [0,0,0,0,0]
        let orangeData = [0,0,0,0,0]
        let yellowData = [0,0,0,0,0]
        let blueData = [0,0,0,0,0]
        if(data[1] && data[1].length>0){
          for(let i of data[1]){
            redData[i.disasterType - 1] = i.count
            // redData[i.disasterType - 1] = i.count
            if(i.disasterType == 1){redData[0] = i.count}
            if(i.disasterType == 3){redData[1] = i.count}
            if(i.disasterType == 4){redData[2] = i.count}
            if(i.disasterType == 5){redData[3] = i.count}
            if(i.disasterType == 6){redData[4] = i.count}
          }
        }
        if(data[2] && data[2].length>0){
          for(let i of data[2]){
            orangeData[i.disasterType - 1] = i.count
            // orangeData[i.disasterType - 1] = i.count
            if(i.disasterType == 1){orangeData[0] = i.count}
            if(i.disasterType == 3){orangeData[1] = i.count}
            if(i.disasterType == 4){orangeData[2] = i.count}
            if(i.disasterType == 5){orangeData[3] = i.count}
            if(i.disasterType == 6){orangeData[4] = i.count}
          }
        }
        if(data[3] && data[3].length>0){
          for(let i of data[3]){
            yellowData[i.disasterType - 1] = i.count
            // yellowData[i.disasterType - 1] = i.count
            if(i.disasterType == 1){yellowData[0] = i.count}
            if(i.disasterType == 3){yellowData[1] = i.count}
            if(i.disasterType == 4){yellowData[2] = i.count}
            if(i.disasterType == 5){yellowData[3] = i.count}
            if(i.disasterType == 6){yellowData[4] = i.count}
          }
        }
        if(data[4] && data[4].length>0){
          for(let i of data[4]){
            blueData[i.disasterType - 1] = i.count
            // blueData[i.disasterType - 1] = i.count
            if(i.disasterType == 1){blueData[0] = i.count}
            if(i.disasterType == 3){blueData[1] = i.count}
            if(i.disasterType == 4){blueData[2] = i.count}
            if(i.disasterType == 5){blueData[3] = i.count}
            if(i.disasterType == 6){blueData[4] = i.count}
          }
        }
        let whole = redData.concat(orangeData,yellowData,blueData)
@@ -78,9 +98,9 @@
          nameGap: 10,
          indicator: [
            { name: "地震", max: maxNum },
            { name: "洪涝", max: maxNum },
            // { name: "洪涝", max: maxNum },
            { name: "气象", max: maxNum },
            { name: "泥石流", max: maxNum },
            { name: "地质灾害", max: maxNum },
            { name: "水旱", max: maxNum },
            { name: "森林草原火灾", max: maxNum }
          ],
src/components/Home/Projecting.vue
@@ -37,9 +37,8 @@
      img: require('@/assets/user.png'),
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/Report.vue
@@ -97,9 +97,8 @@
      timeRange: [],
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/callRecord.vue
@@ -156,9 +156,8 @@
      },
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/components/msgDetailMod.vue
@@ -67,9 +67,8 @@
      details: {},
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/components/msgEditMod.vue
@@ -238,9 +238,8 @@
      },
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/components/reactionMod.vue
@@ -51,15 +51,11 @@
          value: 1
        },
        {
          name: '洪涝',
          value: 2
        },
        {
          name: '气象',
          value: 3
        },
        {
          name: '泥石流',
          name: '地质灾害',
          value: 4
        },
        {
src/views/Admin/history.vue
@@ -176,9 +176,8 @@
      },
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/list.vue
@@ -200,9 +200,8 @@
                confirmLoading: false,
        riskOptions: [
          {name: '地震',value: 1},
          {name: '洪涝',value: 2},
          {name: '气象',value: 3},
          {name: '泥石流',value: 4},
          {name: '地质灾害',value: 4},
          {name: '水旱',value: 5},
          {name: '森林草原火灾',value: 6}
        ],
src/views/Admin/massSend.vue
@@ -228,9 +228,8 @@
        },
        riskOptions: [
          {name: '地震',value: 1},
          {name: '洪涝',value: 2},
          {name: '气象',value: 3},
          {name: '泥石流',value: 4},
          {name: '地质灾害',value: 4},
          {name: '水旱',value: 5},
          {name: '森林草原火灾',value: 6}
        ],
src/views/Admin/msgRecord.vue
@@ -73,9 +73,8 @@
      details: {},
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/msgReview.vue
@@ -96,9 +96,8 @@
      timeRange: [],
      riskOptions: [
        {name: '地震',value: 1},
        {name: '洪涝',value: 2},
        {name: '气象',value: 3},
        {name: '泥石流',value: 4},
        {name: '地质灾害',value: 4},
        {name: '水旱',value: 5},
        {name: '森林草原火灾',value: 6}
      ],
src/views/Admin/notice.vue
@@ -211,15 +211,11 @@
                        value: 1
                    },
                    {
                        name: '洪涝',
                        value: 2
                    },
                    {
                        name: '气象',
                        value: 3
                    },
                    {
                        name: '泥石流',
                        name: '地质灾害',
                        value: 4
                    },
                    {
src/views/Admin/reactionManage.vue
@@ -71,15 +71,11 @@
          value: 1
        },
        {
          name: '洪涝',
          value: 2
        },
        {
          name: '气象',
          value: 3
        },
        {
          name: '泥石流',
          name: '地质灾害',
          value: 4
        },
        {
src/views/Admin/release.vue
@@ -179,9 +179,8 @@
        },
        riskOptions: [
          {name: '地震',value: 1},
          {name: '洪涝',value: 2},
          {name: '气象',value: 3},
          {name: '泥石流',value: 4},
          {name: '地质灾害',value: 4},
          {name: '水旱',value: 5},
          {name: '森林草原火灾',value: 6}
        ],