四色图

package.json

@@ -61,6 +61,7 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-draggable-resizable": "^2.3.0",
     "vue-grid-layout": "^2.4.0",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",

src/api/risk/draw.js

@@ -17,3 +17,30 @@ export function getDictList(query) {
     params: query,
   });
 }
+
+
+// 保存固有风险
+export function updateBatch(data) {
+  return request({
+    url: "/ledger/room/update/batch",
+    method: "post",
+    data
+  });
+}
+
+export function getFun(url, params) {
+  const Url = '/app-api' + url
+  return request({
+    url: Url,
+    method: "get",
+    params,
+  });
+}
+export function postFun(url, data) {
+  const Url = '/app-api' + url
+  return request({
+    url: Url,
+    method: "post",
+    data,
+  });
+}
\ No newline at end of file

src/components/vue-draggable-resizable/utils/dom.js

+import { isFunction } from './fns'
+
+export function matchesSelectorToParentElements (el, selector, baseNode) {
+  let node = el
+
+  const matchesSelectorFunc = [
+    'matches',
+    'webkitMatchesSelector',
+    'mozMatchesSelector',
+    'msMatchesSelector',
+    'oMatchesSelector'
+  ].find(func => isFunction(node[func]))
+
+  if (!isFunction(node[matchesSelectorFunc])) return false
+
+  do {
+    if (node[matchesSelectorFunc](selector)) return true
+    if (node === baseNode) return false
+    node = node.parentNode
+  } while (node)
+
+  return false
+}
+
+export function getComputedSize ($el) {
+  const style = window.getComputedStyle($el)
+
+  return [
+    parseFloat(style.getPropertyValue('width'), 10),
+    parseFloat(style.getPropertyValue('height'), 10)
+  ]
+}
+
+export function addEvent (el, event, handler) {
+  if (!el) {
+    return
+  }
+  if (el.attachEvent) {
+    el.attachEvent('on' + event, handler)
+  } else if (el.addEventListener) {
+    el.addEventListener(event, handler, true)
+  } else {
+    el['on' + event] = handler
+  }
+}
+
+export function removeEvent (el, event, handler) {
+  if (!el) {
+    return
+  }
+  if (el.detachEvent) {
+    el.detachEvent('on' + event, handler)
+  } else if (el.removeEventListener) {
+    el.removeEventListener(event, handler, true)
+  } else {
+    el['on' + event] = null
+  }
+}

src/components/vue-draggable-resizable/utils/fns.js

+export function isFunction (func) {
+  return (typeof func === 'function' || Object.prototype.toString.call(func) === '[object Function]')
+}
+
+export function snapToGrid (grid, pendingX, pendingY, scale = 1) {
+  const [scaleX, scaleY] = typeof scale === 'number' ? [scale, scale] : scale
+  const x = Math.round((pendingX / scaleX) / grid[0]) * grid[0]
+  const y = Math.round((pendingY / scaleY) / grid[1]) * grid[1]
+  return [x, y]
+}
+
+export function getSize (el) {
+  const rect = el.getBoundingClientRect()
+
+  return [
+    parseInt(rect.width),
+    parseInt(rect.height)
+  ]
+}
+
+export function computeWidth (parentWidth, left, right) {
+  return parentWidth - left - right
+}
+
+export function computeHeight (parentHeight, top, bottom) {
+  return parentHeight - top - bottom
+}
+
+export function restrictToBounds (value, min, max) {
+  if (min !== null && value < min) {
+    return min
+  }
+
+  if (max !== null && max < value) {
+    return max
+  }
+
+  return value
+}

src/components/vue-draggable-resizable/vue-draggable-resizable.css

+.vdr {
+  touch-action: none;
+  position: absolute;
+  box-sizing: border-box;
+  border: 1px dashed black;
+}
+.handle {
+  box-sizing: border-box;
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  background: #EEE;
+  border: 1px solid #333;
+}
+.handle-tl {
+  top: -10px;
+  left: -10px;
+  cursor: nw-resize;
+}
+.handle-tm {
+  top: -10px;
+  left: 50%;
+  margin-left: -5px;
+  cursor: n-resize;
+}
+.handle-tr {
+  top: -10px;
+  right: -10px;
+  cursor: ne-resize;
+}
+.handle-ml {
+  top: 50%;
+  margin-top: -5px;
+  left: -10px;
+  cursor: w-resize;
+}
+.handle-mr {
+  top: 50%;
+  margin-top: -5px;
+  right: -10px;
+  cursor: e-resize;
+}
+.handle-bl {
+  bottom: -10px;
+  left: -10px;
+  cursor: sw-resize;
+}
+.handle-bm {
+  bottom: -10px;
+  left: 50%;
+  margin-left: -5px;
+  cursor: s-resize;
+}
+.handle-br {
+  bottom: -10px;
+  right: -10px;
+  cursor: se-resize;
+}
+@media only screen and (max-width: 768px) {
+  [class*="handle-"]:before {
+    content: '';
+    left: -10px;
+    right: -10px;
+    bottom: -10px;
+    top: -10px;
+    position: absolute;
+  }
+}

src/directive/permission/hasPermi.js

- /**
- * v-hasPermi 操作权限处理
- * Copyright (c) 2019 ruoyi
- */
+/**
+* v-hasPermi 操作权限处理
+* Copyright (c) 2019 ruoyi
+*/
 
 import store from '@/store'
 

src/router/index.js

@@ -204,13 +204,13 @@ export const dynamicRoutes = [
     ],
   },
   {
-    path: "/risk/drawCanvas/index",
+    path: "/risk/drawCanvas",
     component: Layout,
     hidden: true,
     permissions: ["system:ledgerRoom:list"],
     children: [
       {
-        path: "index/:id(\\d+)",
+        path: "index",
         component: () => import("@/views/risk/drawCanvas/index"),
         name: "drawCanvas",
         meta: { title: "四色图", activeMenu: "/risk/drawCanvas/index" },

src/views/ledger/floor/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="楼宇名称" prop="buildingName">
         <el-input
           v-model="queryParams.buildingName"
@@ -18,7 +25,11 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -28,8 +39,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -42,7 +61,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:ledgerFloor:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +73,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:ledgerFloor:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -64,7 +85,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:ledgerFloor:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,12 +96,20 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:ledgerFloor:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="floorList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="floorList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
@@ -91,31 +121,48 @@
       <el-table-column label="楼层属性" align="center" prop="type" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-         <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-home"
+            @click="handleManage(scope.row)"
+            v-hasPermi="['system:ledgerFloor:edit']"
+            >房间管理</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:ledgerFloor:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:ledgerFloor:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -134,6 +181,7 @@
         <el-form-item label="楼层属性" prop="type">
           <el-input v-model="form.type" placeholder="请输入楼层属性" />
         </el-form-item>
+
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option
@@ -144,7 +192,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
+        <!-- <el-form-item label="新增房间" prop="type">
+          <el-button type="primary" @click="showDrawCanvas">添加</el-button>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -155,11 +205,17 @@
 </template>
 
 <script>
-import { listFloor, getFloor, delFloor, addFloor, updateFloor } from "@/api/ledger/floor";
+import {
+  listFloor,
+  getFloor,
+  delFloor,
+  addFloor,
+  updateFloor,
+} from "@/api/ledger/floor";
 
 export default {
   name: "Floor",
-  dicts: ['sys_normal_disable', 'data_source'],
+  dicts: ["sys_normal_disable", "data_source"],
   data() {
     return {
       // 遮罩层
@@ -193,18 +249,26 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    handleManage({ id, buildingId }) {
+      this.$router.push({
+        name: "drawCanvas",
+        params: {
+          floorId: id,
+          buildingId,
+        },
+      });
+    },
     /** 查询基础数据-楼层列表 */
     getList() {
       this.loading = true;
-      listFloor(this.queryParams).then(response => {
+      listFloor(this.queryParams).then((response) => {
         this.floorList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -228,7 +292,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -244,9 +308,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -257,8 +321,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getFloor(id).then(response => {
+      const id = row.id || this.ids;
+      getFloor(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改基础数据-楼层";
@@ -266,16 +330,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateFloor(this.form).then(response => {
+            updateFloor(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addFloor(this.form).then(response => {
+            addFloor(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -287,19 +351,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除基础数据-楼层编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除基础数据-楼层编号为"' + ids + '"的数据项？')
+        .then(function () {
           return delFloor(ids);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/system/ledger/floor/export', {
-        ...this.queryParams
-      }, `floor_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "/system/ledger/floor/export",
+        {
+          ...this.queryParams,
+        },
+        `floor_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/map/map-detail.vue

@@ -292,6 +292,9 @@ export default {
       padding: 5px 0;
     }
   }
+  ::v-deep .map-content-title {
+    width: 30%;
+  }
 }
 ul,
 li {

src/views/risk/existing/index.vue

@@ -125,18 +125,14 @@
           >导出</el-button
         >
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">
       </right-toolbar>
     </el-row>
     <el-table
       v-loading="loading"
       :data="inherentList"
       @selection-change="handleSelectionChange"
-      
     >
-      
       <el-table-column label="项目信息" align="center" fixed width="500">
         <el-table-column
           label="区域公司"
@@ -144,7 +140,12 @@
           prop="deptName"
           width="100"
         />
-        <el-table-column  label="项目名称" align="center" prop="projectName" width="100">
+        <el-table-column
+          label="项目名称"
+          align="center"
+          prop="projectName"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-popover
               placement="top-start"
@@ -162,31 +163,107 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="所属城市" align="center" prop="city"  width="100"/>
-        <el-table-column label="项目业态" align="center" prop="businessFormat"  width="100"/>
-        <el-table-column label="项目类型" align="center" prop="type"  width="100"/>
+        <el-table-column
+          label="所属城市"
+          align="center"
+          prop="city"
+          width="100"
+        />
+        <el-table-column
+          label="项目业态"
+          align="center"
+          prop="businessFormat"
+          width="100"
+        />
+        <el-table-column
+          label="项目类型"
+          align="center"
+          prop="type"
+          width="100"
+        />
       </el-table-column>
 
       <el-table-column label="项目风险清单" align="center">
         <el-table-column label="固有风险" align="center">
-          <el-table-column label="危险源名称" align="center" prop="inherentName"  width="100"/>
-          <el-table-column label="风险等级" align="center" prop="inherentLevel"  width="100"/>
+          <el-table-column
+            label="危险源名称"
+            align="center"
+            prop="inherentName"
+            width="100"
+          />
+          <el-table-column
+            label="风险等级"
+            align="center"
+            prop="inherentLevel"
+            width="100"
+          />
         </el-table-column>
         <el-table-column label="现有风险" align="center">
-          <el-table-column label="危险源名称" align="center" prop="existingName"  width="100"/>
-          <el-table-column label="风险等级" align="center" prop="existingLevel"  width="100"/>
+          <el-table-column
+            label="危险源名称"
+            align="center"
+            prop="existingName"
+            width="100"
+          />
+          <el-table-column
+            label="风险等级"
+            align="center"
+            prop="existingLevel"
+            width="100"
+          />
+        </el-table-column>
+        <el-table-column
+          label="风险点位置"
+          align="center"
+          prop="presenceLocation"
+          width="100"
+        />
+        <el-table-column
+          label="可能导致的事故后果"
+          align="center"
+          prop="listType"
+          width="100"
+        >
+          <template slot-scope="scope">
+            <el-popover
+              placement="top-start"
+              title="项目名称"
+              width="200"
+              trigger="hover"
+              :content="scope.row.listType"
+            >
+              <span slot="reference">{{
+                scope.row.listType.length > 10
+                  ? scope.row.listType.substring(0, 10) + "..."
+                  : scope.row.listType
+              }}</span>
+            </el-popover>
+          </template>
         </el-table-column>
-        <el-table-column label="风险点位置" align="center" prop="presenceLocation"  width="100"/>
-        <el-table-column label="可能导致的事故后果" align="center" prop="listType"  width="100"/>
       </el-table-column>
 
       <el-table-column label="项目整体风险等级" align="center">
-        <el-table-column label="固有风险" align="center" prop="inherentProjectLevel" width="100"/>
-        <el-table-column label="现状风险" align="center" prop="existingProjectLevel" width="100"/>
+        <el-table-column
+          label="固有风险"
+          align="center"
+          prop="inherentProjectLevel"
+          width="100"
+        />
+        <el-table-column
+          label="现状风险"
+          align="center"
+          prop="existingProjectLevel"
+          width="100"
+        />
       </el-table-column>
 
       <el-table-column label="风险管控" align="center">
-        <el-table-column label="应采取的管控措施" align="center" prop="inherentMeasuresAdministration"  width="100">
+        <el-table-column
+          label="应采取的管控措施"
+          align="center"
+          prop="inherentMeasuresAdministration"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-popover
               placement="top-start"
@@ -196,14 +273,21 @@
               :content="scope.row.inherentMeasuresAdministration"
             >
               <span slot="reference">{{
-              scope.row.inherentMeasuresAdministration&&scope.row.inherentMeasuresAdministration.length > 10
-                ? scope.row.inherentMeasuresAdministration.substring(0, 10) + "..."
+                scope.row.inherentMeasuresAdministration &&
+                scope.row.inherentMeasuresAdministration.length > 10
+                  ? scope.row.inherentMeasuresAdministration.substring(0, 10) +
+                    "..."
                   : scope.row.inherentMeasuresAdministration
               }}</span>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="已采取的管控措施" align="center" prop="existingMeasuresAdministration"  width="100">
+        <el-table-column
+          label="已采取的管控措施"
+          align="center"
+          prop="existingMeasuresAdministration"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-popover
               placement="top-start"
@@ -213,28 +297,64 @@
               :content="scope.row.existingMeasuresAdministration"
             >
               <span slot="reference">{{
-              scope.row.existingMeasuresAdministration&&scope.row.existingMeasuresAdministration.length > 10
-                ? scope.row.existingMeasuresAdministration.substring(0, 10) + "..."
+                scope.row.existingMeasuresAdministration &&
+                scope.row.existingMeasuresAdministration.length > 10
+                  ? scope.row.existingMeasuresAdministration.substring(0, 10) +
+                    "..."
                   : scope.row.existingMeasuresAdministration
               }}</span>
             </el-popover>
           </template>
         </el-table-column>
         <el-table-column label="分级管控" align="center">
-          <el-table-column label="管控责任单位" align="center" prop="measuresDeptName"  width="100"/>
-          <el-table-column label="管控责任人" align="center" prop="measuresUserName"  width="100"/>
-          <el-table-column label="人员联系方式" align="center" prop="measuresUserPhone"  width="100"/>
+          <el-table-column
+            label="管控责任单位"
+            align="center"
+            prop="measuresDeptName"
+            width="100"
+          />
+          <el-table-column
+            label="管控责任人"
+            align="center"
+            prop="measuresUserName"
+            width="100"
+          />
+          <el-table-column
+            label="人员联系方式"
+            align="center"
+            prop="measuresUserPhone"
+            width="100"
+          />
         </el-table-column>
       </el-table-column>
 
-      
       <el-table-column label="重大危险源管理" align="center">
-        <el-table-column label="是否存在重大危险源" align="center" prop="majorHazardSource" width="100"/>
-        <el-table-column label="重大危险源名称" align="center" prop="hazardSourceName" width="100"/>
-        <el-table-column label="重大危险源描述" align="center" prop="majorHazardDescription" width="100"/>
+        <el-table-column
+          label="是否存在重大危险源"
+          align="center"
+          prop="majorHazardSource"
+          width="100"
+        />
+        <el-table-column
+          label="重大危险源名称"
+          align="center"
+          prop="hazardSourceName"
+          width="100"
+        />
+        <el-table-column
+          label="重大危险源描述"
+          align="center"
+          prop="majorHazardDescription"
+          width="100"
+        />
       </el-table-column>
 
-      <el-table-column label="判定依据" align="center" prop="referenceBasis" width="100"/>
+      <el-table-column
+        label="判定依据"
+        align="center"
+        prop="referenceBasis"
+        width="100"
+      />
 
       <el-table-column label="操作" align="center" prop="describe">
         <template slot-scope="scope">

src/views/risk/plan/ledgerdata.vue

@@ -185,7 +185,7 @@
                       size="mini"
                       type="text"
                       icon="el-icon-view"
-                      @click="showDrawCanvas(scope.row.floorId)"
+                      @click="showDrawCanvas(scope.row.floorId,scope.row.buildingId)"
                       >查看四色图</el-button
                     >
                     <router-link
@@ -349,6 +349,7 @@ export default {
         name: "drawCanvas",
         params: {
           floorId: floorId,
+          isViews: true,
         },
       });
     },

vue.config.js

@@ -44,6 +44,12 @@ module.exports = {
           ["^" + process.env.VUE_APP_BASE_API]: "",
         },
       },
+      "/app-api": {
+        // target: "http://192.168.10.137:8080/",
+        target: `http://192.168.4.232:8080/`, //服务器地址
+        // target: `http://192.168.15.230:8081`, //晓晋本地地址
+        changeOrigin: true,
+      },
     },
     disableHostCheck: true,
   },
@@ -57,7 +63,7 @@ module.exports = {
           pxtorem({
             rootValue: 192,//这个尺寸可以根据自己的图去配置，这里配置的是宽度375的图（如果用了vant插件）
             propList: ['*'],
-            exclude: /(element-ui|node_modules|layout|assets)/
+            exclude: /(element-ui|node_modules|layout|assets|risk|drawCanvas)/
           })
         ]
       }