八项作业与部分bug

src/request/map.js

@@ -13,6 +13,7 @@ export const getUserByCardNo = (params) =>
 export const getEightWorks = (params) => post("/map/getEightWorks", params);
 
 export const getHotworkList = (params) => post("/map/getHotworkList", params);
+export const getEightWorksByType = (params) => post("/map/getEightWorksByType", params);
 export const getCameraList = (params) => post("/map/getCameraList", params);
 
 export const getConfinedspaceWorkList = (params) =>

src/views/BI/components/bottom_options.vue

@@ -50,11 +50,7 @@ import VideoAIAnalysis from "@/views/BI/components/video_ai_analysis.vue";
 import VideoAIAnalysisRight from "@/views/BI/components/video_ai_analysisRight.vue";
 import { useVModels } from "@vueuse/core";
 import { handleTrajectory, handleFence } from "@/views/BI/js/trajectory.js";
-import {
-  handleHortwork,
-  handleConfinedspaceWork,
-  handleHighWork,
-} from "@/views/BI/js/eight_work.js";
+import { handleWork } from "@/views/BI/js/eight_work.js";
 import { handleCamera } from "@/views/BI/js/camera.js";
 
 const props = defineProps({
@@ -167,9 +163,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "动火作业",
-        type: "hotWork",
+        type: "HOTWORK",
         check: false,
-        action: handleHortwork,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico5.png", import.meta.url)
@@ -179,9 +175,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "受限空间作业",
-        type: "acceptance",
+        type: "CONFINEDSPACE",
         check: false,
-        action: handleConfinedspaceWork,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico6.png", import.meta.url)
@@ -191,8 +187,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "临时用电作业",
-        type: "temporaryElectricalWork",
+        type: "ELECTRICITY",
         check: false,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico7.png", import.meta.url)
@@ -202,9 +199,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "高处作业",
-        type: "workAtHeight",
+        type: "HIGHWORK",
         check: false,
-        action: handleHighWork,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico8.png", import.meta.url)
@@ -214,8 +211,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "断路作业",
-        type: "circuitBreakingOperations",
+        type: "CUTROAD",
         check: false,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico9.png", import.meta.url)
@@ -225,8 +223,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "动土作业",
-        type: "groundbreakingWork",
+        type: "BREAKGROUND",
         check: false,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico10.png", import.meta.url)
@@ -236,7 +235,8 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "吊装作业",
-        type: "hoistingOperations",
+        type: "HOISTING",
+        action: handleWork,
         check: false,
       },
       {
@@ -247,8 +247,9 @@ const bottomOptionsList = [
           import.meta.url
         ).href,
         title: "盲板抽堵作业",
-        type: "blindPlatePluggingOperation",
+        type: "BLINDBOARD",
         check: false,
+        action: handleWork,
       },
       {
         img: new URL("/src/assets/images/map/bottom/ico12.png", import.meta.url)

src/views/BI/components/dialog/electricity_dialog.vue

@@ -0,0 +1,422 @@
+<template>
+  <el-dialog v-model="visible" title="作业票信息">
+    <div id="printContent">
+      <table class="archive_print_table">
+        <thead>
+        <tr>
+          <td colspan="10" style="border: none">
+            <el-divider content-position="left">
+              临时用电作业许可证
+            </el-divider>
+          </td>
+        </tr>
+        </thead>
+        <tr>
+          <td class="title">申请单位</td>
+          <td colspan="2">{{ data.info.APPLY_DEPARTMENT_NAME }}</td>
+          <td class="title">作业申请时间</td>
+          <td colspan="2">{{ data.info.CREATTIME }}</td>
+        </tr>
+        <tr>
+          <td class="title">作业地点</td>
+          <td colspan="2">{{ data.info.WORK_PLACE }}</td>
+          <td class="title">作业内容</td>
+          <td colspan="2">{{ data.info.WORK_CONTENT }}</td>
+        </tr>
+        <tr>
+          <td class="title">电源接入点及许可用电功率</td>
+          <td colspan="2">{{ data.info.ALLOW_POWER }}</td>
+          <td class="title">工作电压</td>
+          <td colspan="2">{{ data.info.WORK_VOLTAGE }}</td>
+        </tr>
+        <tr>
+          <td class="title">用电设备名称及额定功率</td>
+          <td>{{ data.info.RATED_POWER }}</td>
+          <td class="title">监护人</td>
+          <td>
+            <img
+              v-for="(item, index) in data.signs.GUARDIAN?.[0].SIGN_PATH"
+              :key="index"
+              v-viewer
+              :src="VITE_FILE_URL + item"
+              alt=""
+              width="20"
+              height="20"
+              class="mr-10 mt-10"
+            />
+          </td>
+          <td class="title">用电人</td>
+          <td>
+            <img
+              v-for="(item, index) in data.signs.ELECTRICITY?.[0].SIGN_PATH"
+              :key="index"
+              v-viewer
+              :src="VITE_FILE_URL + item"
+              alt=""
+              width="20"
+              height="20"
+              class="mr-10 mt-10"
+            />
+          </td>
+        </tr>
+        <tr>
+          <td class="title">作业人</td>
+          <td colspan="2">
+            <img
+              v-for="(item, index) in data.signs.WORK_USER?.[0].SIGN_PATH"
+              :key="index"
+              v-viewer
+              :src="VITE_FILE_URL + item"
+              alt=""
+              width="20"
+              height="20"
+              class="mr-10 mt-10"
+            />
+          </td>
+          <td class="title">电工证号</td>
+          <td colspan="2">{{ data.info.CARD_NO }}</td>
+        </tr>
+        <tr>
+          <td class="title">作业负责人</td>
+          <td colspan="2">
+            <img
+              v-for="(item, index) in data.signs.CONFIRM?.[0].SIGN_PATH"
+              :key="index"
+              v-viewer
+              :src="VITE_FILE_URL + item"
+              alt=""
+              width="20"
+              height="20"
+              class="mr-10 mt-10"
+            />
+          </td>
+          <td class="title">电工证号</td>
+          <td colspan="2">{{ data.info.LEADER_CARD_NO }}</td>
+        </tr>
+        <tr>
+          <td class="title">关联的其他特殊作业及安全作业票编号</td>
+          <td colspan="5">{{ data.info.SPECIAL_WORK }}</td>
+        </tr>
+        <tr>
+          <td class="title">风险辨识结果</td>
+          <td colspan="5">{{ data.info.RISK_IDENTIFICATION }}</td>
+        </tr>
+        <tr>
+          <td class="title" colspan="6">
+            可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）
+          </td>
+        </tr>
+        <template v-for="(item, index) in data.gasList" :key="index">
+          <tr>
+            <td class="title">分析时间</td>
+            <td colspan="2">{{ item.ANALYZE_TIME }}</td>
+            <td class="title">分析点</td>
+            <td colspan="2">{{ item.ANALYZE_PLACE }}</td>
+          </tr>
+          <tr>
+            <td class="title">可燃气体检测结果</td>
+            <td colspan="2">{{ item.ANALYZE_RESULT }}</td>
+            <td class="title">分析人</td>
+            <td colspan="2">
+              <img
+                v-viewer
+                :src="VITE_FILE_URL + item.SIGN_PATH"
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+            </td>
+          </tr>
+        </template>
+        <tr>
+          <td class="title">作业实施时间</td>
+          <td colspan="5">
+            {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+          </td>
+        </tr>
+        <tr>
+          <td colspan="11">
+            <table class="archive_print_table">
+              <tr>
+                <td style="width: 80px">序号</td>
+                <td>安全措施</td>
+                <td style="width: 100px">是否涉及</td>
+                <td style="width: 100px">确认人</td>
+              </tr>
+              <tr v-for="(item, index) in data.measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>
+                  {{ item.PROTECTIVE_MEASURES }}
+                  <div v-if="item.IMG_PATH" class="mt-10">
+                    <template
+                      v-for="img in item.IMG_PATH.split(',')"
+                      :key="img"
+                    >
+                      <img
+                        v-viewer
+                        :src="VITE_FILE_URL + img"
+                        alt=""
+                        width="20"
+                        height="20"
+                        class="mr-10 mt-10"
+                      />
+                    </template>
+                  </div>
+                </td>
+                <td>
+                  <span v-if="item.STATUS === '1'">
+                    涉&nbsp;&nbsp;&nbsp;及
+                  </span>
+                  <span v-if="item.STATUS === '-1'"> 不涉及 </span>
+                </td>
+                <td>
+                  <img
+                    v-if="item.SIGN_PATH"
+                    v-viewer
+                    :src="VITE_FILE_URL + item.SIGN_PATH"
+                    alt=""
+                    width="20"
+                    height="20"
+                    class="mr-10 mt-10"
+                  />
+                </td>
+              </tr>
+              <template v-if="data.signs.MEASURES_CONFIRM">
+                <tr
+                  v-for="(item, index) in data.signs.MEASURES_CONFIRM"
+                  :key="item.BUS_ELECTRICITY_MEASURES_ID"
+                >
+                  <td>{{ data.measuresList.length + 1 + index }}</td>
+                  <td colspan="2">
+                    <div style="display: flex; justify-content: space-between">
+                      <span> 其他安全措施： {{ item.DESCR }} </span>
+                    </div>
+                  </td>
+                  <td>
+                    <img
+                      v-if="item.SIGN_PATH?.[0]"
+                      v-viewer
+                      :src="VITE_FILE_URL + item.SIGN_PATH?.[0]"
+                      alt=""
+                      width="20"
+                      height="20"
+                      class="mr-10 mt-10"
+                    />
+                  </td>
+                </tr>
+              </template>
+            </table>
+          </td>
+        </tr>
+        <tr v-if="data.signs.CONFESS">
+          <td colspan="11">
+            <div>
+              安全交底人：
+              <div v-if="data.signs.CONFESS?.[0].IMG_PATH?.[0]">
+                <template
+                  v-for="img in data.signs.CONFESS?.[0].IMG_PATH"
+                  :key="img"
+                >
+                  <img
+                    v-viewer
+                    :src="VITE_FILE_URL + img"
+                    alt=""
+                    width="20"
+                    height="20"
+                    class="mr-10 mt-10"
+                  />
+                </template>
+              </div>
+            </div>
+            <div
+              v-for="(item, index) in data.signs.CONFESS?.[0].SIGN_TIME"
+              :key="index"
+              class="tr"
+            >
+              <span>签字：</span>
+              <img
+                v-viewer
+                :src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+              <span>{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="data.signs.ACCEPT_CONFESS">
+          <td colspan="11">
+            <div>接受交底人：</div>
+            <div
+              v-for="(item, index) in data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME"
+              :key="index"
+              class="tr"
+            >
+              <span>签字：</span>
+              <img
+                v-viewer
+                :src="
+                  VITE_FILE_URL +
+                  data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
+                "
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+              <span>{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="data.signs.CONFIRM">
+          <td colspan="11">
+            <div>作业负责人意见：{{ data.signs.CONFIRM?.[0].DESCR }}</div>
+            <div
+              v-for="(item, index) in data.signs.CONFIRM?.[0].SIGN_TIME"
+              :key="index"
+              class="tr"
+            >
+              <span>签字：</span>
+              <img
+                v-viewer
+                :src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+              <span>{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="data.signs.AUDIT">
+          <td colspan="11">
+            <div>用电单位意见：{{ data.signs.AUDIT?.[0].DESCR }}</div>
+            <div
+              v-for="(item, index) in data.signs.AUDIT?.[0].SIGN_TIME"
+              :key="index"
+              class="tr"
+            >
+              <span>签字：</span>
+              <img
+                v-viewer
+                :src="VITE_FILE_URL + data.signs.AUDIT?.[0].SIGN_PATH[index]"
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+              <span>{{ data.signs.AUDIT?.[0].SIGN_TIME[index] }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="data.signs.APPROVE">
+          <td colspan="11">
+            <div>配送电单位意见：{{ data.signs.APPROVE?.[0].DESCR }}</div>
+            <div
+              v-for="(item, index) in data.signs.APPROVE?.[0].SIGN_TIME"
+              :key="index"
+              class="tr"
+            >
+              <span>签字：</span>
+              <img
+                v-viewer
+                :src="VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]"
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+              <span>{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}</span>
+            </div>
+          </td>
+        </tr>
+
+        <tr v-if="data.signs.ACCEPT">
+          <td colspan="11">
+            <div>完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}</div>
+            <div
+              v-for="(item, index) in data.signs.ACCEPT?.[0].SIGN_TIME"
+              :key="index"
+              class="tr"
+            >
+              <span>签字：</span>
+              <img
+                v-viewer
+                :src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
+                alt=""
+                width="20"
+                height="20"
+                class="mr-10 mt-10"
+              />
+              <span>{{ data.signs.ACCEPT?.[0].SIGN_TIME[index] }}</span>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <template #footer>
+      <el-button @click="fnClose">关闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { useVModels } from "@vueuse/core";
+import { reactive } from "vue";
+import { findCharIndex } from "@/assets/js/utils.js";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  pd: {
+    type: Object,
+    required: true,
+    default: () => ({}),
+  },
+});
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
+const data = reactive({
+  info: {},
+  measuresList: [],
+  gasList: [],
+  signs: [],
+});
+
+const fnInit = () => {
+  data.info = props.pd.pd;
+  const measuresList = props.pd.measuresList;
+  for (let i = 0; i < measuresList.length; i++) {
+    const PROTECTIVE_MEASURES = measuresList[i].PROTECTIVE_MEASURES.split("");
+    for (let j = 1; j <= 3; j++) {
+      if (findCharIndex(PROTECTIVE_MEASURES, "（", j) !== -1) {
+        PROTECTIVE_MEASURES.splice(
+          findCharIndex(PROTECTIVE_MEASURES, "（", j) + 1,
+          0,
+          measuresList[i]["ANSWER" + j]
+        );
+      }
+    }
+    measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join("");
+  }
+  data.measuresList = measuresList;
+  data.gasList = props.pd.gasList;
+  data.signs = props.pd.signs;
+};
+fnInit();
+
+const emits = defineEmits(["update:visible"]);
+const { visible } = useVModels(props, emits);
+const fnClose = () => {
+  visible.value = false;
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/BI/components/work_safely.vue

@@ -18,7 +18,7 @@
     </div>
 
     <div class="block2">
-      <layout-title title="特殊作业情况统计" />
+      <layout-title title="特殊作业类型统计数据" />
       <div id="main1" class="option"></div>
     </div>
     <div class="block3">
@@ -107,6 +107,21 @@ const formatWork = (work) => {
     case "HIGHWORK":
       type = "高处作业";
       break;
+    case "BLINDBOARD":
+      type = "盲板抽堵作业";
+      break;
+    case "CUTROAD":
+      type = "断路作业";
+      break;
+    case "ELECTRICITY":
+      type = "临时用点作业";
+      break;
+    case "HOISTING":
+      type = "吊装作业";
+      break;
+    case "BREAKGROUND":
+      type = "动土作业";
+      break;
   }
   return type + "编号:" + work.CHECK_NO;
 };

src/views/BI/js/eight_work.js

@@ -1,103 +1,64 @@
-import {
-  getHotworkList,
-  getConfinedspaceWorkList,
-  getHighWorkList,
-} from "@/request/map";
+import { getEightWorksByType } from "@/request/map";
 import { addEntity } from "./map.js";
 
-let hotworkList = [];
-let confinedspaceList = [];
-let highWorkList = [];
-
-export const handleHortwork = (b) => {
+const workTypeList = {
+  BLINDBOARD: "盲板抽堵作业",
+  HOISTING: "吊装作业",
+  BREAKGROUND: "动土作业",
+  CUTROAD: "断路作业",
+  HIGHWORK: "高处作业",
+  ELECTRICITY: "临时用电作业",
+  CONFINEDSPACE: "受限空间作业",
+  HOTWORK: "动火作业",
+};
+const workList = {
+  BLINDBOARD: {},
+  HOISTING: {},
+  BREAKGROUND: {},
+  CUTROAD: {},
+  HIGHWORK: {},
+  ELECTRICITY: {},
+  CONFINEDSPACE: {},
+  HOTWORK: {},
+};
+const workIndexList = {
+  BLINDBOARD: "8",
+  HOISTING: "7",
+  BREAKGROUND: "6",
+  CUTROAD: "5",
+  HIGHWORK: "4",
+  ELECTRICITY: "3",
+  CONFINEDSPACE: "2",
+  HOTWORK: "1",
+};
+export const handleWork = (b, type) => {
   if (b) {
-    showHotworkList();
+    showEitghtworkList(type, workList[type]);
   } else {
-    if (hotworkList) {
-      hotworkList.children.forEach((e) => {
+    if (workList[type]) {
+      workList[type].children.forEach((e) => {
         e.destroy();
       });
     }
   }
 };
+const showEitghtworkList = async (type, list) => {
+  let x = {};
+  x = new window.CustomCesium.GroupModel(workTypeList[type]);
 
-const showHotworkList = async () => {
-  hotworkList = new window.CustomCesium.GroupModel("动火作业");
-
-  const { varList } = await getHotworkList();
-  varList.forEach(({ HOTWORK_ID, CHECK_NO, WORK_POSITION }) => {
+  const { varList } = await getEightWorksByType({ TYPE: type });
+  varList.forEach(({ ID, CHECK_NO, WORK_POSITION }) => {
     addEntity(
-      hotworkList,
-      HOTWORK_ID,
-      "动火作业",
-      '动火作业:'+CHECK_NO,
+      x,
+      ID,
+      workTypeList[type],
+      workTypeList[type] + ":" + CHECK_NO,
       WORK_POSITION.split(",")[0],
       WORK_POSITION.split(",")[1],
       WORK_POSITION.split(",")[2],
-      "/src/assets/images/map/bottom/ico1_select.png"
+      "/src/assets/images/map/bottom/ico" + workIndexList[type] + "_select.png"
     );
   });
-  hotworkList.show(true);
-};
-
-export const handleConfinedspaceWork = (b) => {
-  if (b) {
-    showConfinedspaceWorkList();
-  } else {
-    if (confinedspaceList) {
-      confinedspaceList.children.forEach((e) => {
-        e.destroy();
-      });
-    }
-  }
-};
-
-const showConfinedspaceWorkList = async () => {
-  confinedspaceList = new window.CustomCesium.GroupModel("受限空间作业");
-
-  const { varList } = await getConfinedspaceWorkList();
-  varList.forEach(({ CONFINEDSPACE_ID, CHECK_NO, WORK_POSITION }) => {
-    addEntity(
-      confinedspaceList,
-      CONFINEDSPACE_ID,
-      "受限空间作业",
-      '受限空间作业:'+CHECK_NO,
-      WORK_POSITION.split(",")[0],
-      WORK_POSITION.split(",")[1],
-      WORK_POSITION.split(",")[2],
-      "/src/assets/images/map/bottom/ico2_select.png"
-    );
-  });
-  confinedspaceList.show(true);
-};
-
-export const handleHighWork = (b) => {
-  if (b) {
-    showHighWorkList();
-  } else {
-    if (highWorkList) {
-      highWorkList.children.forEach((e) => {
-        e.destroy();
-      });
-    }
-  }
-};
-
-const showHighWorkList = async () => {
-  highWorkList = new window.CustomCesium.GroupModel("高处作业");
-
-  const { varList } = await getHighWorkList();
-  varList.forEach(({ HIGHWORK_ID, CHECK_NO, WORK_POSITION }) => {
-    addEntity(
-      highWorkList,
-      HIGHWORK_ID,
-      "高处作业",
-      '高处作业:'+CHECK_NO,
-      WORK_POSITION.split(",")[0],
-      WORK_POSITION.split(",")[1],
-      WORK_POSITION.split(",")[2],
-      "/src/assets/images/map/bottom/ico4_select.png"
-    );
-  });
-  highWorkList.show(true);
+  x.show(true);
+  Object.assign(list, x);
 };

src/views/BI/js/map.js

@@ -1,6 +1,7 @@
 import { h, render, ref } from "vue";
 import userDialog from "../components/dialog/user_dialog.vue";
 import hotworkDialog from "../components/dialog/hotwork_dialog.vue";
+import electricityDialog from "../components/dialog/electricity_dialog.vue";
 import confinedspaceDialog from "../components/dialog/confinedspace_dialog.vue";
 import highworkDialog from "../components/dialog/highwork_dialog.vue";
 import cameraDialog from "../components/dialog/camera_dialog.vue";
@@ -11,6 +12,11 @@ import {
   getConfinedSpaceView,
   getHighWorkView,
   getHotWorkView,
+  getHoistingView,
+  getBlindBoardView,
+  getGroundbreakingView,
+  getOpenCircuitView,
+  getTemporaryElectricityUsageView,
 } from "@/request/eight_work.js";
 import { getVideoManagerView } from "@/request/video_manager.js";
 // const mapUrl =
@@ -164,9 +170,24 @@ const handleMouseClick = () => {
     if (model._name.indexOf("受限空间作业") > -1) {
       clickConfinedspaceWork(model);
     }
+    if (model._name.indexOf("临时用电作业") > -1) {
+      clickElectricityWork(model);
+    }
     if (model._name.indexOf("高处作业") > -1) {
       clickHighwork(model);
     }
+    if (model._name.indexOf("断路作业") > -1) {
+      clickCutroadwork(model);
+    }
+    if (model._name.indexOf("动土作业") > -1) {
+      clickBreakgroundwork(model);
+    }
+    if (model._name.indexOf("吊装作业") > -1) {
+      clickHoistingwork(model);
+    }
+    if (model._name.indexOf("盲板抽堵作业") > -1) {
+      clickBlindboardwork(model);
+    }
     if (model._name.indexOf("摄像头") > -1) {
       clickCamera(model);
     }
@@ -284,7 +305,6 @@ const clickPerson = async (model) => {
   handleDialog(userDialog, pd);
 };
 const clickCamera = async (model) => {
-  console.log("clickCamera");
   const id = model._id;
   const pd = await getVideoManagerView({ VIDEOMANAGER_ID: id });
   pd.pd.cameraType = model._name;
@@ -296,13 +316,38 @@ const clickHotwork = async (model) => {
   const pd = await getHotWorkView({ HOTWORK_ID: id });
   handleDialog(hotworkDialog, pd);
 };
+const clickElectricityWork = async (model) => {
+  const id = model._id;
+  const pd = await getTemporaryElectricityUsageView({ ELECTRICITY_ID: id });
+  handleDialog(electricityDialog, pd);
+};
 
 const clickConfinedspaceWork = async (model) => {
   const id = model._id;
   const pd = await getConfinedSpaceView({ CONFINEDSPACE_ID: id });
   handleDialog(confinedspaceDialog, pd);
 };
+const clickCutroadwork = async (model) => {
+  const id = model._id;
+  const pd = await getOpenCircuitView({ CUTROAD_ID: id });
+  handleDialog(confinedspaceDialog, pd);
+};
 
+const clickBlindboardwork = async (model) => {
+  const id = model._id;
+  const pd = await getBlindBoardView({ BLINDBOARD_ID: id });
+  handleDialog(highworkDialog, pd);
+};
+const clickHoistingwork = async (model) => {
+  const id = model._id;
+  const pd = await getHoistingView({ HOISTING_ID: id });
+  handleDialog(highworkDialog, pd);
+};
+const clickBreakgroundwork = async (model) => {
+  const id = model._id;
+  const pd = await getGroundbreakingView({ BREAKGROUND_ID: id });
+  handleDialog(highworkDialog, pd);
+};
 const clickHighwork = async (model) => {
   const id = model._id;
   const pd = await getHighWorkView({ HIGHWORK_ID: id });

src/views/device_manager/user_card/components/batchaddcard.vue

@@ -54,7 +54,7 @@ const handleChange = () => {
     data.form.end = data.form.begin + 1;
   }
 };
-const emits = defineEmits(["update:visible", "submit"]);
+const emits = defineEmits(["update:visible", "submit", "get-data"]);
 const { visible } = useVModels(props, emits);
 const fnClose = () => {
   visible.value = false;
@@ -72,6 +72,7 @@ const fnSubmit = debounce(
     });
     fnClose();
     emits("submit");
+    emits("get-data");
   },
   { atBegin: true }
 );

src/views/device_manager/user_card/index.vue

@@ -39,7 +39,6 @@
         <el-table-column prop="cardNo" label="卡号" />
         <el-table-column prop="name" label="绑定人" />
         <el-table-column prop="stset" label="电量" />
-        <el-table-column prop="remark" label="备注" />
         <el-table-column label="操作" width="200">
           <template #default="{ row }">
             <el-button

src/views/large_screen_data_display/components/assignment_type.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="assignment_type">
-    <div class="title">作业类型</div>
+    <div class="title">特殊作业类型统计</div>
     <div id="main4" />
   </div>
 </template>

src/views/map_settings/layer_settings/components/add.vue

@@ -14,12 +14,6 @@
       <el-form-item label="楼层" prop="floor">
         <el-input v-model="form.floor" />
       </el-form-item>
-      <el-form-item label="list" prop="floor">
-        <el-input v-model="form.list" />
-      </el-form-item>
-      <el-form-item label="modUuid" prop="floor">
-        <el-input v-model="form.modUuid" />
-      </el-form-item>
     </el-form>
     <map-tools
       v-if="visible"