fix:系统迭代

src/api/homePage.ts

@@ -16,7 +16,7 @@ export function wkTypes(params) {
   return request({
     url: `/screen/index/wkTypes`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //工作动态分类型开展情况-前五条
@@ -42,7 +42,7 @@ export function riskPoolPage(params) {
   return request({
     url: `/screen/index/riskPoolPage`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 /**
@@ -54,7 +54,7 @@ export function othteamPage(params) {
   return request({
     url: `/screen/index/getOthteamPage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 //应急仓库分页
@@ -62,7 +62,14 @@ export function otheWareHousePage(params) {
   return request({
     url: `/screen/index/getOtheWareHousePage`,
     method: "GET",
-    params:params
+    params: params
+  });
+}
+//应急仓库详情
+export function emerWareHouseDetail(wareHouseId: any) {
+  return request({
+    url: `/screen/index/emerWareHouseDetail/${wareHouseId}`,
+    method: "GET",
   });
 }
 //应急通讯录体系
@@ -70,7 +77,7 @@ export function performUserPage(params) {
   return request({
     url: `/screen/index/performUserPage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 //分页查看应急上报事件
@@ -78,7 +85,7 @@ export function emerEventPage(params) {
   return request({
     url: `/screen/index/emerEventPage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 //值守人员
@@ -86,7 +93,7 @@ export function dutyList(params) {
   return request({
     url: `/screen/index/dutyList`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 /**
@@ -97,6 +104,6 @@ export function workPerformProgress(params) {
   return request({
     url: `/screen/index/workPerformProgress`,
     method: "GET",
-    params:params
+    params: params
   });
 }

src/api/statistics.ts

@@ -23,7 +23,7 @@ export function riskPoolPage(params) {
   return request({
     url: `/screen/index/riskPoolPage`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 /**
@@ -35,7 +35,7 @@ export function othteamPage(params) {
   return request({
     url: `/screen/index/getOthteamPage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 //应急仓库分页
@@ -43,7 +43,7 @@ export function otheWareHousePage(params) {
   return request({
     url: `/screen/index/getOtheWareHousePage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 //应急通讯录体系
@@ -51,7 +51,7 @@ export function performUserPage(params) {
   return request({
     url: `/screen/index/performUserPage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 //分页查看应急上报事件
@@ -59,7 +59,7 @@ export function emerEventPage(params) {
   return request({
     url: `/screen/index/emerEventPage`,
     method: "GET",
-    params:params
+    params: params
   });
 }
 /**
@@ -70,7 +70,7 @@ export function latestWork(params) {
   return request({
     url: `/screen/statistic/latestWork`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //工作类型分析
@@ -78,7 +78,7 @@ export function workTypeStatistic(params) {
   return request({
     url: `/screen/statistic/workTypeStatistic`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //村庄工作分析
@@ -86,7 +86,7 @@ export function villageWorkStatistic(params) {
   return request({
     url: `/screen/statistic/villageWorkStatistic`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //工作类型列表
@@ -94,7 +94,7 @@ export function wkTypes(params) {
   return request({
     url: `/screen/statistic/wkTypes`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //工作分类型统计分析
@@ -102,7 +102,7 @@ export function workStatisticByType(params) {
   return request({
     url: `/screen/statistic/workStatisticByType`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //风险池分类型统计
@@ -110,14 +110,14 @@ export function rkStatByType(params) {
   return request({
     url: `/screen/statistic/rkStatByType`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }
 //应急数据统计
 export function emerStat(params) {
   return request({
-    url: `/screen/statistic/emerStat`,
+    url: `/screen/statistic/emerTeamStat`,
     method: "GET",
-    params:params,
+    params: params,
   });
 }

src/views/data-statistics/right-side/components/command.vue

@@ -26,98 +26,202 @@ import { emerStat } from "@/api/statistics";
 //工作类型折线图
 const tenementRef = ref();
 let jobTypeOption = {
-  tooltip: {
+    backgroundColor: '#031245',
-    trigger: "axis",
+    color: [
-  },
+        '#63caff',
-  legend: {
+        '#49beff',
-    data: ["待完成", "已完成"],
+        '#03387a',
-    top: "top",
+        '#03387a',
-    left: "center",
+        '#03387a',
-    orient: "horizontal",
+        '#6c93ee',
-    itemWidth: 15,
+        '#a9abff',
-    itemHeight: 15,
+        '#f7a23f',
-    itemGap: 15,
+        '#27bae7',
-    borderRadius: 0,
+        '#ff6d9d',
-    textStyle: {
+        '#cb79ff',
-      color: "#D0DEEE",
+        '#f95b5a',
-      fontFamily: "Source Han Sans CN, Source Han Sans CN",
+        '#ccaf27',
-      fontSize: 15,
+        '#38b99c',
-      fontWeight: 400,
+        '#93d0ff',
+        '#bd74e0',
+        '#fd77da',
+        '#dea700',
+    ],
+    grid: {
+        containLabel: true,
+        left: 20,
+        right: 20,
+        bottom: 10,
+        top: 40,
     },
-  },
+    xAxis: {
-  grid: {
+        axisLabel: {
-    left: "3%",
+            color: '#c0c3cd',
-    right: "4%",
+            fontSize: 14,
-    bottom: "3%",
+            interval: 0,
-    containLabel: true,
-  },
-  xAxis: {
-    type: "category",
-    // boundaryGap: false,
-    data: [],
-  },
-  yAxis: [
-    {
-      type: "value",
-      name: "数量",
-      nameTextStyle: {
-        //y轴上方单位的颜色
-        color: "#6C8097",
-      },
-      axisLine: {
-        show: true,
-        lineStyle: {
-          color: "#6C8097",
         },
-      },
+        axisTick: {
-      splitLine: {
+            lineStyle: {
-        show: true,
+                color: '#384267',
-        lineStyle: {
+            },
-          color: "#6C8097",
+            show: true,
-          type: "dashed",
         },
-      },
+        splitLine: {
-      axisLabel: {
+            show: false,
-        color: "rgb(139, 143, 147)",
-        textStyle: {
-          fontSize: 14,
         },
-      },
+        axisLine: {
-      axisTick: {
+            lineStyle: {
+                color: '#384267',
+                width: 1,
+                type: 'dashed',
+            },
+            show: true,
+        },
+        data: [],
+        type: 'category',
+    },
+    yAxis: {
+        axisLabel: {
+            color: '#c0c3cd',
+            fontSize: 14,
+        },
+        axisTick: {
+            lineStyle: {
+                color: '#384267',
+                width: 1,
+            },
+            show: true,
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: '#384267',
+                type: 'dashed',
+            },
+        },
+        axisLine: {
+            lineStyle: {
+                color: '#384267',
+                width: 1,
+                type: 'dashed',
+            },
+            show: true,
+        },
+        name: '',
+    },
+    series: [
+        {
+            data: [200, 85, 112, 275, 305, 415, 741, 405],
+            type: 'bar',
+            barMaxWidth: 'auto',
+            barWidth: 30,
+            itemStyle: {
+                color: {
+                    x: 0,
+                    y: 0,
+                    x2: 0,
+                    y2: 1,
+                    type: 'linear',
+                    global: false,
+                    colorStops: [
+                        {
+                            offset: 0,
+                            color: '#0b9eff',
+                        },
+                        {
+                            offset: 1,
+                            color: '#63caff',
+                        },
+                    ],
+                },
+            },
+            label: {
+                show: true,
+                position: 'top',
+                distance: 10,
+                color: '#fff',
+            },
+        },
+        {
+            data: [1, 1, 1, 1, 1, 1, 1, 1],
+            type: 'pictorialBar',
+            barMaxWidth: '20',
+            symbol: 'diamond',
+            symbolOffset: [0, '50%'],
+            symbolSize: [30, 15],
+        },
+        {
+            data: [200, 85, 112, 275, 305, 415, 741, 405],
+            type: 'pictorialBar',
+            barMaxWidth: '20',
+            symbolPosition: 'end',
+            symbol: 'diamond',
+            symbolOffset: [0, '-50%'],
+            symbolSize: [30, 12],
+            zlevel: 2,
+        },
+        {
+            data: [741, 741, 741, 741, 741, 741, 741, 741],
+            type: 'bar',
+            barMaxWidth: 'auto',
+            barWidth: 30,
+            barGap: '-100%',
+            zlevel: -1,
+        },
+        {
+            data: [1, 1, 1, 1, 1, 1, 1, 1],
+            type: 'pictorialBar',
+            barMaxWidth: '20',
+            symbol: 'diamond',
+            symbolOffset: [0, '50%'],
+            symbolSize: [30, 15],
+            zlevel: -2,
+        },
+  ],
+    dataZoom: [
+		{
+			type: "slider",
+			show: false,
+			endValue: 50,
+			bottom: "3%",
+			zoomLock: true,
+			showDataShadow: false,
+			showDetail: false,
+		},
+		{
+			type: "inside",
+			show: true,
+			xAxisIndex: [0],
+			moveOnMouseWheel: false,
+			preventDefaultMouseMove: false,
+		},
+	],
+    tooltip: {
+        trigger: 'axis',
         show: false,
-      },
     },
-  ],
-  series: [
-    {
-      name: "数量",
-      type: "line",
-      data: [],
-      symbolSize: 10,
-      itemStyle: {
-        color: "#FFFFFF", // 折线点的颜色
-        shadowColor: "#fff",
-        shadowBlur: 15,
-        borderColor: "#aaa",
-      },
-    },
-  ],
 };
 //工作类型折线图数据处理
 const getemerStat = () => {
   let params = {
-    startTime: "",
+    startTime: null,
-    endTime: "",
+    endTime: null,
   };
   emerStat(params).then((res: any) => {
-    console.log(res, "res");
-
     jobTypeOption.xAxis.data = [];
     jobTypeOption.series[0].data = [];
+    jobTypeOption.series[2].data = [];
+    jobTypeOption.series[3].data = [];
     res.data.forEach((item) => {
-      jobTypeOption.xAxis.data.push(item.typeName);
+      jobTypeOption.xAxis.data.push(item.orgName);
-      jobTypeOption.series[0].data.push(item.typeNum);
+      jobTypeOption.series[0].data.push(item.teamNum);
+      jobTypeOption.series[2].data.push(item.teamNum);
+      
     });
+    let max = Math.max(...jobTypeOption.series[0].data);
+    for (let i = 0; i < res.data.length; i++) {
+      jobTypeOption.series[3].data.push(max);
+    }
     const tenementChart = echarts.init(tenementRef.value);
     tenementChart.setOption(jobTypeOption, true);
   });

src/views/data-statistics/right-side/components/early-warning.vue

@@ -90,7 +90,19 @@ let jobTypeOption = {
   ],
   series: [
     {
-      name: "数量",
+      name: "类型总数量",
+      type: "line",
+      data: [],
+      symbolSize: 10,
+      itemStyle: {
+        color: "#FFFFFF", // 折线点的颜色
+        shadowColor: "#fff",
+        shadowBlur: 15,
+        borderColor: "#aaa",
+      },
+    },
+    {
+      name: "预警数量",
       type: "line",
       data: [],
       symbolSize: 10,
@@ -102,6 +114,24 @@ let jobTypeOption = {
       },
     },
   ],
+  dataZoom: [
+		{
+			type: "slider",
+			show: false,
+			endValue: 50,
+			bottom: "3%",
+			zoomLock: true,
+			showDataShadow: false,
+			showDetail: false,
+		},
+		{
+			type: "inside",
+			show: true,
+			xAxisIndex: [0],
+			moveOnMouseWheel: false,
+			preventDefaultMouseMove: false,
+		},
+	],
 };
 //工作类型折线图数据处理
 const getrkStatByType = () => {
@@ -112,9 +142,11 @@ const getrkStatByType = () => {
   rkStatByType(params).then((res: any) => {
     jobTypeOption.xAxis.data = [];
     jobTypeOption.series[0].data = [];
+    jobTypeOption.series[1].data = [];
     res.data.forEach((item) => {
       jobTypeOption.xAxis.data.push(item.typeName);
       jobTypeOption.series[0].data.push(item.typeCount);
+      jobTypeOption.series[1].data.push(item.warningCount);
     });
     const tenementChart = echarts.init(tenementRef.value);
     tenementChart.setOption(jobTypeOption, true);

src/views/home-page/right-side/dialog/emeEventDetalis.vue

@@ -3,7 +3,7 @@
   <BaseDialog
     :dialogVisible="props.visible"
     @close="onclone"
-    titleName="应急队伍详情"
+    titleName="应急事件详情"
     width="50%"
     @onSubmit="handleSubmit"
     :footerclosed="true"

src/views/home-page/right-side/dialog/emeMaterialsDetails.vue

@@ -3,7 +3,7 @@
   <BaseDialog
     :dialogVisible="props.visible"
     @close="onclone"
-    titleName="应急队伍详情"
+    titleName="应急物资详情"
     width="50%"
     @onSubmit="handleSubmit"
     :footerclosed="true"
@@ -84,6 +84,17 @@
         ></el-input>
       </el-form-item>
     </el-form>
+    <el-table
+        :data="tableData"
+        max-height="180"
+        style="width: 100%"
+        show-overflow-tooltip
+      >
+        <el-table-column type="index" label="序号" align="center" width="60" />
+        <el-table-column prop="equname" label="装备名称" align="center" />
+        <el-table-column prop="equnum" label="装备数量" align="center" width="110" />
+        <el-table-column prop="equtype" label="装备类型" align="center" />
+      </el-table>
   </BaseDialog>
 </template>
 
@@ -91,6 +102,7 @@
 import { reactive, ref, onMounted, watch } from "vue";
 import { ElMessage, FormInstance, FormRules } from "element-plus";
 import { areaTree, riskTypeList } from "@/api/account";
+import { emerWareHouseDetail } from "@/api/homePage";
 const formRef = ref<FormInstance>();
 const props = defineProps({
   visible: {
@@ -105,6 +117,7 @@ const props = defineProps({
   id: String,
 });
 const form = ref<any>({ content: "" });
+const tableData = ref([])
 const emits = defineEmits(["close", "onSubmit"]);
 const handleSubmit = () => {
   onclone();
@@ -127,6 +140,11 @@ const getRiskTypeList = () => {
     types.value = res.data;
   });
 };
+const getemerWareHouseDetail = (id) => {
+  emerWareHouseDetail(id).then((res: any) => {
+    tableData.value  = res.data.equipList
+  })
+}
 onMounted(() => {
   getareaTree();
   getRiskTypeList();
@@ -136,6 +154,7 @@ watch(
   () => props.visible,
   () => {
     form.value = props.form;
+    if(form.value.houseId)getemerWareHouseDetail(form.value.houseId)
   }
 );
 </script>

src/views/home-page/right-side/dialog/emeSystemDetails.vue

@@ -3,7 +3,7 @@
   <BaseDialog
     :dialogVisible="props.visible"
     @close="onclone"
-    titleName="应急队伍详情"
+    titleName="应急体系详情"
     width="50%"
     @onSubmit="handleSubmit"
     :footerclosed="true"