Merge remote-tracking branch 'origin/dev' into dev

2024-02-28 09:57:53 +08:00 · 2024-02-28 09:57:53 +08:00 · 46f099a696
parent abd9830dfd aa529766d9
commit 46f099a696
15 changed files with 258 additions and 88 deletions
--- a/index.html
+++ b/index.html
@ -4,7 +4,7 @@
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
-    <title>危化安全生产管理平台</title>
+    <title>安全生产信息化平台</title>

  </head>
  <body>
--- a/src/assets/images/map/title.png
+++ b/src/assets/images/map/title.png
--- a/src/assets/images/public/logo.png
+++ b/src/assets/images/public/logo.png
--- a/src/components/hidden_view/index.vue
+++ b/src/components/hidden_view/index.vue
@ -252,6 +252,39 @@
        </el-descriptions>
      </template>
    </template>
+    <template v-if="(data.info.SOURCE === '4' || data.info.SOURCE === '5') && data.info.FINAL_CHECK">
+      <el-divider content-position="left">安全环保验收信息</el-divider>
+        <el-descriptions :column="1" border class="mt-10">
+          <el-descriptions-item label="验收描述">
+            {{ data.info.FINAL_CHECKDESCR }}
+          </el-descriptions-item>
+          <el-descriptions-item label="是否合格">
+            <span v-if="data.info.FINAL_CHECK === '1'"> 是 </span>
+            <span v-else-if="data.info.FINAL_CHECK === '0'"> 否 </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="验收部门">
+            {{ data.info.FINAL_CHECKOR_NDEPTNAME }}
+          </el-descriptions-item>
+          <el-descriptions-item label="验收人">
+            {{ data.info.FINAL_CHECKOR_NAME }}
+          </el-descriptions-item>
+          <el-descriptions-item label="验收时间">
+            {{ data.info.FINAL_CHECKTIME }}
+          </el-descriptions-item>
+          <el-descriptions-item label="验收图片">
+            <img
+              v-for="item1 in data.yImgs"
+              :key="item1.IMGFILES_ID"
+              v-viewer
+              :src="VITE_FILE_URL + item1.FILEPATH"
+              alt=""
+              width="100"
+              height="100"
+              class="ml-10"
+            />
+          </el-descriptions-item>
+        </el-descriptions>
+    </template>
  </div>
 </template>

@ -288,6 +321,7 @@ const data = reactive({
  rImgs: [],
  sImgs: [],
  pImgs: [],
+  yImgs: [],
  checkList: [],
  videoDialog: {
    src: "",
@ -315,6 +349,7 @@ const fnGetData = async () => {
  data.rImgs = resData.rImgs;
  data.sImgs = resData.sImgs;
  data.pImgs = resData.pImgs;
+  data.yImgs = resData.yImgs;
  emits("throw-data", data.info);
 };
 watchEffect(() => {
--- a/src/request/aggregation_management.js
+++ b/src/request/aggregation_management.js
@ -2,6 +2,8 @@ import { post } from "@/request/axios.js";

 export const getGatheringAlarmRecordsList = (params) =>
  post("/positAlarm/getAlarmRecordList", params); // 聚集告警记录列表
+export const getGatheringAlarmRecordViewList = (params) =>
+  post("/positAlarm/alarmRecordgoEdit", params); // 聚集告警记录详情
 export const getAggregationAlarmTrend = (params) =>
  post("/positAlarm/aggregateAlarmTrends", params); // 聚集报警趋势
 export const getAggregatedDataStatistics = (params) =>
--- a/src/request/continuous_improvement.js
+++ b/src/request/continuous_improvement.js
@ -20,7 +20,7 @@ export const getEnterpriseReport2 = (params) =>
 export const getEnterpriseReport3 = (params) =>
  post("/studytask/list?showCount=100&currentPage=1", params);
 export const getEnterpriseReport4 = (params) =>
-  post("/confinedspace/getDiagnosis", params);
+  post("/eightWork/getDiagnosis", params);
 export const getEnterpriseReport5 = (params) =>
  post("/performanceexamine_dept/listAll", params);
 export const getEnterpriseReport6 = (params) =>
--- a/src/views/aggregation_management/gathering_alarm_records/components/viewInfo.vue
+++ b/src/views/aggregation_management/gathering_alarm_records/components/viewInfo.vue
@ -0,0 +1,134 @@
+<template>
+  <el-dialog v-model="visible" title="详情" :on-close="fnClose" width="80%">
+    <el-form
+      :model="searchForm"
+      label-width="80px"
+      @submit.prevent="fnResetPaginationTransfer"
+    >
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="检查周期" prop="dates">
+            <el-date-picker
+              v-model="searchForm.dates"
+              type="datetimerange"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
+              time-format="A hh:mm:ss"
+              range-separator="至"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button type="primary" native-type="submit">搜索</el-button>
+            <el-button native-type="reset" @click="fnResetPaginationTransfer">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <layout-card>
+      <layout-table
+        v-model:pagination="pagination"
+        :data="list"
+        @get-data="fnGetDataTransfer"
+      >
+        <el-table-column label="序号" width="70">
+          <template #default="{ $index }">
+            {{ serialNumber(pagination, $index) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="聚集等级" prop="level">
+          <template #default="{ row }">
+            <span v-if="row.level === '1'">一级</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="聚集人员" prop="psnName" />
+        <el-table-column label="时间" prop="alarmTime" />
+        <el-table-column label="操作">
+          <template #default="{ row }">
+            <el-button type="primary" text link @click="fnViewLocation(row)"
+              >查看位置</el-button
+            >
+          </template>
+        </el-table-column>
+      </layout-table>
+    </layout-card>
+
+    <template #footer>
+      <el-button @click="fnClose">关闭</el-button>
+      <el-button type="primary" @click="fnSubmit">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { useVModels } from "@vueuse/core";
+import { debounce } from "throttle-debounce";
+import { ElMessage } from "element-plus";
+import { serialNumber } from "@/assets/js/utils.js";
+import useListData from "@/assets/js/useListData.js";
+import { getGatheringAlarmRecordViewList } from "@/request/aggregation_management.js";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  form: {
+    type: Object,
+    required: true,
+    default: () => ({}),
+  },
+});
+const emits = defineEmits(["update:visible", "update:form", "get-data"]);
+const { visible } = useVModels(props, emits);
+const { list, searchForm, pagination, fnGetData, fnResetPagination } =
+  useListData(getGatheringAlarmRecordViewList, {
+    otherParams: {
+      gatherId: props.form.id,
+      STARTTIME: props.form.startTime,
+      ENDTIME: props.form.endTime,
+    },
+    key: "rows",
+  });
+const fnClose = () => {
+  visible.value = false;
+};
+const fnGetDataTransfer = () => {
+  fnGetData({
+    STARTTIME: searchForm.value.dates[0]
+      ? searchForm.value.dates[0]
+      : props.form.value.dates[0],
+    ENDTIME: searchForm.value.dates?.[1]
+      ? searchForm.value.dates[1]
+      : props.form.value.dates[1],
+    gatherId: props.form.id,
+  });
+};
+const fnViewLocation = (row) => {
+  console.log(row);
+  // 接口地址 positAlarm/getAlarmGatherPsnInfo
+};
+const fnResetPaginationTransfer = () => {
+  fnResetPagination({
+    STARTTIME: searchForm.value.dates?.[0],
+    ENDTIME: searchForm.value.dates?.[1],
+    gatherId: props.form.id,
+  });
+};
+
+const fnSubmit = debounce(
+  1000,
+  async () => {
+    ElMessage.success("处理成功");
+    fnClose();
+    emits("get-data");
+  },
+  { atBegin: true }
+);
+</script>
+
+<style scoped lang="scss"></style>
--- a/src/views/aggregation_management/gathering_alarm_records/index.vue
+++ b/src/views/aggregation_management/gathering_alarm_records/index.vue
@ -34,30 +34,56 @@
            {{ serialNumber(pagination, $index) }}
          </template>
        </el-table-column>
-        <el-table-column label="聚集地点" prop="regName" />
-        <el-table-column label="开始时间" prop="regName" />
-        <el-table-column label="结束时间" prop="regName" />
-        <el-table-column label="状态" prop="regName" />
+        <el-table-column label="状态" prop="status">
+          <template #default="{ row }">
+            {{ row.status === "1" ? "已处理" : "待处理" }}
+          </template>
+        </el-table-column>
+        <el-table-column label="聚集地点" prop="layerGroup" />
+        <el-table-column label="开始时间" prop="startTime" />
+        <el-table-column label="结束时间" prop="endTime" />
        <el-table-column label="操作" width="200">
          <template #default="{ row }">
-            {{ row }}
+            <el-button type="primary" text link @click="fnShowInfo(row)"
+              >查看详情</el-button
+            >
          </template>
        </el-table-column>
      </layout-table>
    </layout-card>
  </div>
+  <view-info
+    v-if="data.viewDialog.visible"
+    v-model:visible="data.viewDialog.visible"
+    v-model:form="data.viewDialog.form"
+  />
 </template>

 <script setup>
 import useListData from "@/assets/js/useListData.js";
+import ViewInfo from "./components/viewInfo.vue";
 import { serialNumber } from "@/assets/js/utils.js";
 import { getGatheringAlarmRecordsList } from "@/request/aggregation_management.js";
+import { reactive } from "vue";

 const { list, searchForm, pagination, fnGetData, fnResetPagination } =
  useListData(getGatheringAlarmRecordsList, {
    otherParams: { status: "" },
    key: "rows",
  });
+const data = reactive({
+  viewDialog: {
+    visible: false,
+    form: {
+      dates:[]
+    },
+  },
+});
+
+const fnShowInfo = (row) => {
+  data.viewDialog.visible = true;
+  data.viewDialog.form = row;
+};
 </script>

 <style scoped lang="scss"></style>
--- a/src/views/hidden_danger_government/ledger/index.vue
+++ b/src/views/hidden_danger_government/ledger/index.vue
@ -205,6 +205,7 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
      HIDDENLEVEL: "hiddenLevel0001",
      DISPOSESTATE: "-1",
      IS_SELF: "0",
+      STATE: 100,
    },
    defaultSearchForm: { STATE },
  });
--- a/src/views/hidden_danger_government/rectification/rectification.vue
+++ b/src/views/hidden_danger_government/rectification/rectification.vue
@ -429,8 +429,8 @@ const fnGetData = async () => {
  data.form.DEPARTMENT_NAME = resData.deppd.NAME;
  data.form.USER_NAME = resData.userpd.USERNAME;
  await fnInspectDepartmentChange(data.defaultDepartmentId, 0);
-  data.form.acceptanceList[0].DEPARTMENT_ID = data.defaultDepartmentId;
-  data.form.acceptanceList[0].USER_ID = data.defaultUserId;
+  // data.form.acceptanceList[0].DEPARTMENT_ID = data.defaultDepartmentId;
+  // data.form.acceptanceList[0].USER_ID = data.defaultUserId;
 };
 fnGetData();
 const fnAddInspectedList = () => {
--- a/src/views/large_screen_data_display/components/troubleshooting_type.vue
+++ b/src/views/large_screen_data_display/components/troubleshooting_type.vue
@ -29,17 +29,46 @@
        <div>
          <div class="dunpai1" />
          <div class="bottom_title">现场排查数</div>
-          <div id="main1" />
+          <el-progress
+            :percentage="
+              typeList.filter((item) => item.NAME === '现场清单')[0].percentage
+            "
+            color="#ec2c26"
+            text-inside
+            :stroke-width="20"
+          >
+            {{ typeList.filter((item) => item.NAME === "现场清单")[0].count }}
+          </el-progress>
        </div>
        <div>
          <div class="dunpai2" />
          <div class="bottom_title">基础排查数</div>
-          <div id="main2" />
+          <el-progress
+            :percentage="
+              typeList.filter((item) => item.NAME === '基础类清单')[0]
+                .percentage
+            "
+            color="#ea4e26"
+            text-inside
+            :stroke-width="20"
+          >
+            {{ typeList.filter((item) => item.NAME === "基础类清单")[0].count }}
+          </el-progress>
        </div>
        <div>
          <div class="dunpai3" />
          <div class="bottom_title">综合排查数</div>
-          <div id="main3" />
+          <el-progress
+            :percentage="
+              typeList.filter((item) => item.NAME === '综合类清单')[0]
+                .percentage
+            "
+            color="#ea6e27"
+            text-inside
+            :stroke-width="20"
+          >
+            {{ typeList.filter((item) => item.NAME === "综合类清单")[0].count }}
+          </el-progress>
        </div>
      </div>
    </div>
@ -47,18 +76,21 @@
 </template>

 <script setup>
-import { onMounted, ref } from "vue";
+import { ref } from "vue";
 import {
  getTroubleshootingTypeEcharts,
  getTroubleshootingTypeNumber,
 } from "@/request/large_screen_data_display.js";
 import { sumBy } from "lodash-es";
 import { arrayObjectDeduplication } from "@/assets/js/utils.js";
-import * as echarts from "echarts";
 import CountTo from "vue-countup-v3";

 const info = ref({});
-
+const typeList = ref([
+  { count: 0, percentage: 0, NAME: "现场清单" },
+  { count: 0, percentage: 0, NAME: "基础类清单" },
+  { count: 0, percentage: 0, NAME: "综合类清单" },
+]);
 const fnGetData = async () => {
  const resDataNumber = await getTroubleshootingTypeNumber();
  resDataNumber.typeList.forEach((item) => {
@ -66,73 +98,15 @@ const fnGetData = async () => {
  });
  const resDataEcharts = await getTroubleshootingTypeEcharts();
  const total = sumBy(resDataEcharts.typeList, (item) => item.count);
-  const key = {
-    现场清单: { color: "#ec2c26", el: "#main1" },
-    基础类清单: { color: "#ea4e26", el: "#main2" },
-    综合类清单: { color: "#ea6e27", el: "#main3" },
-  };
-  const typeList = [
-    ...resDataEcharts.typeList,
-    { count: 0, NAME: "现场清单" },
-    { count: 0, NAME: "基础类清单" },
-    { count: 0, NAME: "综合类清单" },
-  ];
-  arrayObjectDeduplication(typeList, "NAME").forEach((item) => {
-    fnInitEcharts(item.count, total, key[item.NAME].color, key[item.NAME].el);
+  resDataEcharts.typeList.forEach((item) => {
+    item.percentage = (item.count / total) * 100;
  });
+  typeList.value = arrayObjectDeduplication(
+    [...resDataEcharts.typeList, ...typeList.value],
+    "NAME"
+  );
 };
-onMounted(() => {
-  fnGetData();
-});
-const fnInitEcharts = (count, total, color, el) => {
-  const myChart = echarts.init(document.querySelector(el));
-  const option = {
-    grid: {
-      left: "10%",
-      right: "0%",
-      bottom: "0%",
-      top: "100%",
-      containLabel: true,
-    },
-    xAxis: {
-      show: false,
-      type: "value",
-    },
-    yAxis: {
-      type: "category",
-      show: false,
-    },
-    series: [
-      {
-        name: "次数",
-        type: "bar",
-        zlevel: 1,
-        itemStyle: {
-          barBorderRadius: 0,
-          color,
-        },
-        label: {
-          show: true,
-          position: "inside",
-        },
-        barWidth: 15,
-        data: [count],
-      },
-      {
-        name: "背景",
-        type: "bar",
-        barWidth: 15,
-        barGap: "-100%",
-        data: [total],
-        itemStyle: {
-          color: "#101f48",
-          barBorderRadius: 0,
-        },
-      },
-    ],
-  };
-  myChart.setOption(option);
-};
+fnGetData();
 </script>

 <style scoped lang="scss">
@ -199,11 +173,9 @@ const fnInitEcharts = (count, total, color, el) => {
        }
      }

-      #main1,
-      #main2,
-      #main3 {
+      .el-progress {
+        margin-left: 10px;
        flex: 1;
-        height: 20px;
      }
    }
  }
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="login">
    <div class="main">
-      <div class="title">危化安全生产管理平台</div>
+      <div class="title">安全生产信息化平台</div>
      <div class="form">
        <el-form
          ref="formRef"
--- a/src/views/risk_control/identifying_parts/index.vue
+++ b/src/views/risk_control/identifying_parts/index.vue
@ -148,11 +148,9 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import { nextTick, reactive } from "vue";
 import LayoutImportFile from "@/components/import_file/index.vue";
 import Add from "./components/add.vue";
-// import { useRouter } from "vue-router";
 import QrCode from "./components/qr_code.vue";
 import LayoutTooltipImg from "@/components/tooltip_img/index.vue";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
-// const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
  useListData(getIdentifyingPartsList);
 const data = reactive({
--- a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
+++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
@ -87,9 +87,10 @@ const stateList = [
  { ID: "101", NAME: "待指派整改人" },
  { ID: "1", NAME: "待整改" },
  { ID: "2", NAME: "待验收" },
+  { ID: "3", NAME: "隐患待验收" },
  { ID: "10", NAME: "验收打回" },
  { ID: "4", NAME: "已验收" },
-  { ID: "-2", NAME: "已指派确认人" },
+  { ID: "-2", NAME: "已指派整改人" },
  { ID: "8", NAME: "特殊处置通过" },
  { ID: "16", NAME: "确认打回" },
 ];
--- a/src/views/safety_environmental_management/hazard_management/index.vue
+++ b/src/views/safety_environmental_management/hazard_management/index.vue
@ -161,6 +161,7 @@ const hiddenStatusList = [
  { ID: "-2", NAME: "待确认" },
  { ID: "1", NAME: "未整改" },
  { ID: "2", NAME: "已整改" },
+  { ID: "3", NAME: "隐患待验收" },
  { ID: "4", NAME: "已验收" },
  { ID: "10", NAME: "验收打回" },
  { ID: "7", NAME: "待处理的特殊隐患" },