Merge remote-tracking branch 'origin/master'

gassafetyprogress-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java

@@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/captchaImage","/common/upload").anonymous()
+                .antMatchers("/login", "/captchaImage").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/*.html",

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventInfo.java

@@ -37,8 +37,8 @@ public class TEventInfo extends BaseEntity
     private String eventLocation;
 
     /** 报案时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date reportTime;
 
     /** 报案人 */

gassafetyprogress-system/src/main/resources/mapper/system/TEventInfoMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportPerson != null  and reportPerson != ''"> and report_person like concat('%', #{reportPerson}, '%')</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
         </where>
+        order by report_time
     </select>
     
     <select id="selectTEventInfoById" parameterType="Long" resultMap="TEventInfoResult">

gassafetyprogress-system/src/main/resources/mapper/system/TPlanInfoMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planLevel != null  and planLevel != ''"> and plan_level = #{planLevel}</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTPlanInfoById" parameterType="Long" resultMap="TPlanInfoResult">

gassafetyprogress-web/src/assets/mapImages/coordinate.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1644901265903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7343" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M527.053 96.924c-169.131 0.322-306.127 137.496-306.127 306.7 0 157.986 128.978 324.17 278.121 502.935 7.838 9.418 17.977 14.485 28.006 15.061 10.029-0.576 20.168-5.643 28.002-15.061 149.144-178.765 278.123-344.948 278.123-502.935 0-169.205-136.997-306.378-306.126-306.7zM527.053 500.967c-66.070-0.358-119.562-53.956-119.562-120.099s53.492-119.74 119.562-120.099c66.069 0.358 119.557 53.956 119.557 120.099s-53.487 119.74-119.557 120.099z" p-id="7344" fill="#1296db"></path></svg>
\ No newline at end of file

gassafetyprogress-web/src/assets/mapImages/yalibiao.svg

-<svg id="组_2449" data-name="组 2449" xmlns="http://www.w3.org/2000/svg" width="23" height="33.9" viewBox="0 0 23 33.9">
-  <g id="路径_186" data-name="路径 186" fill="none">
-    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
-    <path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85127067565918 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
-  </g>
-  <path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.804) rotate(180)" fill="#7bf8f4"/>
-  <path id="路径_966" data-name="路径 966" d="M99.476,156.616a6.028,6.028,0,0,1-1.622,2.267.9.9,0,0,1-.583.252.8.8,0,0,1-.567-.236.765.765,0,0,1-.236-.535.705.705,0,0,1,.236-.535,6.035,6.035,0,0,0,1.748-4.377A5.726,5.726,0,0,0,96.7,149.2a6.645,6.645,0,0,0-9.085.016,5.836,5.836,0,0,0-1.763,4.283,6.134,6.134,0,0,0,1.952,4.346.765.765,0,0,1,.236.535.705.705,0,0,1-.236.535.748.748,0,0,1-.567.236.8.8,0,0,1-.567-.236,7.414,7.414,0,0,1-2.047-2.724,7.528,7.528,0,0,1,1.748-8.266,7.836,7.836,0,0,1,2.629-1.685,9.392,9.392,0,0,1,6.361-.063,6.113,6.113,0,0,1,2.141,1.26c2.866,2.425,3.023,5.9,2.047,8.943Zm-7.337-7.684a4.366,4.366,0,0,0-4.377,4.267.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,5.254,5.254,0,0,1,1.575-3.684,5.533,5.533,0,0,1,7.7,0,5.208,5.208,0,0,1,1.606,3.732.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,4.382,4.382,0,0,0-4.424-4.314Zm.913,5.4a1.113,1.113,0,0,1-1.559-.047,1.054,1.054,0,0,1-.268-1.149l-1.212-1.2a.418.418,0,0,1,0-.6.479.479,0,0,1,.63,0l1.228,1.2a1.162,1.162,0,0,1,1.2.268,1.024,1.024,0,0,1,.331.771A1.093,1.093,0,0,1,93.052,154.333Zm.016-.016" transform="translate(-80.582 -142.727)" fill="#7bf8f4"/>
-</svg>

gassafetyprogress-web/src/components/GetPos/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-02-12 11:07:10
- * @LastEditTime: 2022-02-12 15:13:41
+ * @LastEditTime: 2022-02-15 10:33:20
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
@@ -14,6 +14,7 @@
     width="60%"
     :before-close="handleClose"
   >
+    <template v-if="inputVisible">
       <div class="search-wrapper pos">
         <el-input
           v-model="searchinput"
@@ -30,16 +31,16 @@
           >定位</el-button
         >
       </div>
-
+    </template>
     <div id="getposmap"></div>
   </el-dialog>
 </template>
 
 <script>
-import { EditorMap } from "./untils/getPath.js";
+import { EditorMap } from "@/utils/mapClass/getPath.js";
 export default {
   props: {
-    //管道路径，二维数组
+    //管道路径，二维数组s
     pipePath: {
       type: Array,
       default: () => [],
@@ -55,10 +56,15 @@ export default {
       default: "",
     },
     // 显示隐藏
-    dialogVisible:{
-      type:Boolean,
-      default:false,
-    }
+    dialogVisible: {
+      type: Boolean,
+      default: false,
+    },
+    // input跟定位按钮是否展示
+    inputVisible: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -80,8 +86,7 @@ export default {
       });
     },
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     init() {
       this.$nextTick(() => {
@@ -90,13 +95,13 @@ export default {
         if (this.device == "") {
           // 如果传了路径就创建一个marker，如果没传就直接激活手动创建
           if (this.devicePos.length > 0) {
-            this.map.addDevice({path:this.devicePos});
+            this.map.addDevice({ path: this.devicePos });
           } else {
             this.map.mouseAddMarker();
           }
         } else {
           if (this.pipePath.length > 0) {
-            this.map.addPipeLine({path:this.pipePath});
+            this.map.addPipeLine({ path: this.pipePath });
           } else {
             this.mouseAddPipeline();
           }
@@ -104,7 +109,7 @@ export default {
       });
     },
     handleClose() {
-      this.$emit("close")
+      this.$emit("close");
     },
     open() {
       this.dialogVisible = true;
@@ -113,7 +118,7 @@ export default {
     pos() {
       this.path = this.map.getPath();
       this.$emit("getPath", this.path);
-      console.log(this.path)
+      console.log(this.path);
       if (this.path?.length > 0) {
         this.$emit("update:dialogVisible", false);
       }

gassafetyprogress-web/src/components/GetPos/untils/getPath.js → gassafetyprogress-web/src/utils/mapClass/getPath.js

@@ -248,7 +248,7 @@ export class EditorMap {
     let device = this.createMarker({
       map: this.map,
       anchor: "bottom-center",
-      icon: require("@/assets/mapImages/yalibiao.svg"),
+      icon: require("@/assets/mapImages/coordinate.svg"),
       position: path,
       extData: deviceData,
     });

gassafetyprogress-web/src/views/standingBook/equipment/index.vue

@@ -74,13 +74,13 @@
     </el-row>
 
     <el-table v-loading="loading" :data="equipmentList" >
-      <el-table-column label="用户名称" align="center" prop="userName" width="220px"/>
-      <el-table-column label="身份证号" align="center" prop="idCard"/>
+      <el-table-column label="用户名称" align="center" prop="userName" width="200px"/>
+      <el-table-column label="身份证号" align="center" prop="idCard" width="180px"/>
       <el-table-column label="联系电话" align="center" prop="linkMobile"/>
       <el-table-column label="详细地址" align="center" prop="userAddress" width="380px"/>
       <el-table-column label="安装时间" align="center" prop="installTime"/>
-      <el-table-column label="品牌名称" align="center" prop="brandName" width="130px"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="品牌名称" align="center" prop="brandName"/>
+      <el-table-column label="操作" align="center" width="180px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -385,13 +385,13 @@ export default {
           if (this.form.safeEquipmentId != null) {
             updateEquipment(this.form).then(response => {
               this.msgSuccess("修改成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           } else {
             addEquipment(this.form).then(response => {
               this.msgSuccess("新增成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           }

gassafetyprogress-web/src/views/standingBook/hidden/index.vue

@@ -67,7 +67,7 @@
 
     <el-table v-loading="loading" :data="hiddenList" >
       <el-table-column label="隐患名称" align="center" prop="hiddenTitle" width="200px"/>
-      <el-table-column label="隐患等级" align="center" prop="hiddenType" width="150px">
+      <el-table-column label="隐患等级" align="center" prop="hiddenType">
         <template slot-scope="scope">
           <span v-if="scope.row.hiddenType == '1'">一级隐患</span>
           <span v-if="scope.row.hiddenType == '2'">二级隐患</span>
@@ -75,9 +75,9 @@
         </template>
       </el-table-column>
       <el-table-column label="隐患位置" align="center" prop="hiddenLocation" width="300px"/>
-      <el-table-column label="隐患发现人员" align="center" prop="hiddenFindPeople" width="150px"/>
+      <el-table-column label="隐患发现人员" align="center" prop="hiddenFindPeople"/>
       <el-table-column label="发现时间" align="center" prop="hiddenFindDate" width="150px"/>
-      <el-table-column label="处理方案" align="center" prop="dealPlanUrl" width="150px">
+      <el-table-column label="处理方案" align="center" prop="dealPlanUrl">
         <template slot-scope="scope">
           <span
             class="dbtn"
@@ -89,13 +89,13 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="整治情况" align="center" prop="remediation" width="180px">
+      <el-table-column label="整治情况" align="center" prop="remediation">
         <template slot-scope="scope">
           <span v-if="scope.row.remediation != '' && scope.row.remediation != null">{{ scope.row.remediation }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="180px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -233,35 +233,33 @@
         </div>
       </el-dialog>
 
-      <el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2">
+      <el-dialog :title="title2" :visible.sync="open2" width="1200px" append-to-body @cancel="cancel2" @close="cancel2">
+        <el-row>
+          <el-col :span="14">
             <el-form ref="detailForm" :model="detailForm" label-width="120px">
               <el-row>
-            <el-col :span="11">
+                <el-col :span="10">
                   <el-form-item label="隐患名称:">
                     <font>{{detailForm.hiddenTitle}}</font>
                   </el-form-item>
                   <el-form-item label="隐患发现人员:">
                     <font>{{detailForm.hiddenFindPeople}}</font>
                   </el-form-item>
-              <el-form-item label="隐患位置:">
-                <font>{{detailForm.hiddenLocation}}</font>
+                  <el-form-item label="发现时间:">
+                    <font>{{detailForm.hiddenFindDate}}</font>
                   </el-form-item>
                 </el-col>
-            <el-col :span="12">
+                <el-col :span="13">
                   <el-form-item label="隐患等级:">
                     <font v-if="detailForm.hiddenType == '1'">一级隐患</font>
                     <font v-if="detailForm.hiddenType == '2'">二级隐患</font>
                     <font v-if="detailForm.hiddenType == '3'">三级隐患</font>
                   </el-form-item>
-              <el-form-item label="发现时间:">
-                <font>{{detailForm.hiddenFindDate}}</font>
+                  <el-form-item label="隐患位置:">
+                    <font>{{detailForm.hiddenLocation}}</font>
                   </el-form-item>
                   <el-form-item label="处理方案:">
-              <span
-                class="dbtn"
-                @click="checkFile(detailForm.dealPlanUrl)"
-                v-if="detailForm.dealPlan != ''"
-              >
+                    <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
                       <i class="el-icon el-icon-view"></i>查看/下载
                     </span>
                     <span v-else>-</span>
@@ -286,6 +284,14 @@
                 </el-form-item>
               </el-row>
             </el-form>
+          </el-col>
+
+          <el-col :span="9">
+            <div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+              <div style="width: 100%;height: 100%" id="hiddenContainer"></div>
+            </div>
+          </el-col>
+        </el-row>
       </el-dialog>
 
     <GetPos
@@ -301,15 +307,14 @@
 
 <script>
 import { listHidden, getHidden, delHidden, addHidden, updateHidden, exportHidden } from "@/api/standingBook/hidden";
-import Editor from '@/components/Editor';
 import FileUpload from '@/components/FileUpload';
 import GetPos from '@/components/GetPos';
+import { EditorMap } from "@/utils/mapClass/getPath.js";
 
 let uploadfile = require("@/assets/uploadfile.png");
 export default {
   name: "Hidden",
   components: {
-    Editor,
     FileUpload,
     GetPos
   },
@@ -344,6 +349,7 @@ export default {
       // 地图
       dialogTableVisible: false,
       devicePos: [],
+      map: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -406,11 +412,11 @@ export default {
       this.open1 = false;
       this.reset1();
       this.fileList = [];
-      this.devicePos = [];
     },
     cancel2() {
       this.open2 = false;
       this.reset2();
+      this.map.destroy();
     },
     // 表单重置
     reset1() {
@@ -458,6 +464,7 @@ export default {
         remarks: null
       };
       this.resetForm("detailForm");
+      this.devicePos = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -546,8 +553,16 @@ export default {
       this.reset2();
       getHidden(row.hiddenId).then(response => {
         this.detailForm = response.data;
+        this.devicePos = [this.detailForm.longitude, this.detailForm.latitude];
         this.open2 = true;
         this.title2 = "隐患整治台账详情";
+
+        this.$nextTick(() => {
+          this.map = new EditorMap("hiddenContainer", {}, this);
+          this.map.addDevice({ path: this.devicePos });
+          this.map.nowMouseTarget = null;
+          this.map.mousetoolClose(false);
+        });
       });
     },
     checkFile(url) {

gassafetyprogress-web/src/views/standingBook/trouble/index.vue

@@ -77,24 +77,24 @@
 
     <el-table v-loading="loading" :data="troubleList" >
       <el-table-column label="事故名称" align="center" prop="troubleName" width="200px"/>
-      <el-table-column label="事故类型" align="center" prop="troubleType" width="180px">
+      <el-table-column label="事故类型" align="center" prop="troubleType">
         <template slot-scope="scope">
           <span v-if="scope.row.troubleType == 1">生产安全事故</span>
           <span v-if="scope.row.troubleType == 2">非生产安全事故</span>
         </template>
       </el-table-column>
       <el-table-column label="事故地点" align="center" prop="troubleLocation" width="300px"/>
-      <el-table-column label="事故发生时间" align="center" prop="happenDate" width="180px"/>
-      <el-table-column label="责任单位" align="center" prop="responsibleUnit" width="150px"/>
-      <el-table-column label="责任人员" align="center" prop="responsiblePeople" width="150px"/>
-      <el-table-column label="是否处理" align="center" prop="isDeal" width="120px">
+      <el-table-column label="事故发生时间" align="center" prop="happenDate" width="150px"/>
+      <el-table-column label="责任单位" align="center" prop="responsibleUnit"/>
+      <el-table-column label="责任人员" align="center" prop="responsiblePeople"/>
+      <el-table-column label="是否处理" align="center" prop="isDeal">
         <template slot-scope="scope">
           <span v-if="scope.row.isDeal == 1">已处理</span>
           <span v-if="scope.row.isDeal == 2">未处理</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="处理完成时间" align="center" prop="dealDate" width="180px"/>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="180px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -242,10 +242,12 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2">
+    <el-dialog :title="title2" :visible.sync="open2" width="1200px" append-to-body @cancel="cancel2" @close="cancel2">
+      <el-row>
+        <el-col :span="14">
           <el-form ref="detailForm" :model="detailForm" label-width="120px">
             <el-row>
-            <el-col :span="11">
+              <el-col :span="10">
                 <el-form-item label="事故名称:">
                   <font>{{detailForm.troubleName}}</font>
                 </el-form-item>
@@ -257,7 +259,7 @@
                   <font v-else> - </font>
                 </el-form-item>
               </el-col>
-            <el-col :span="12">
+              <el-col :span="13">
                 <el-form-item label="事故类型:">
                   <font v-if="detailForm.troubleType == '1'">安全生产事故</font>
                   <font v-if="detailForm.troubleType == '2'">非生产安全事故</font>
@@ -297,6 +299,14 @@
               </el-form-item>
             </el-row>
           </el-form>
+        </el-col>
+
+        <el-col :span="9">
+          <div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+            <div style="width: 100%;height: 100%" id="troubleContainer"></div>
+          </div>
+        </el-col>
+      </el-row>
     </el-dialog>
 
     <GetPos
@@ -313,6 +323,7 @@
 <script>
 import { listTrouble, getTrouble, delTrouble, addTrouble, updateTrouble, exportTrouble } from "@/api/standingBook/trouble";
 import GetPos from '@/components/GetPos';
+import { EditorMap } from "@/utils/mapClass/getPath.js";
 
 export default {
   name: "Trouble",
@@ -343,6 +354,7 @@ export default {
       // 地图
       dialogTableVisible: false,
       devicePos: [],
+      map: null,
       // 弹出层标题
       title1: "",
       title2: "",
@@ -416,11 +428,11 @@ export default {
     cancel1() {
       this.open1 = false;
       this.reset1();
-      this.devicePos = [];
     },
     cancel2() {
       this.open2 = false;
       this.reset2();
+      this.map.destroy();
     },
     // 表单重置
     reset1() {
@@ -471,6 +483,7 @@ export default {
         remarks: null
       };
       this.resetForm("detailForm");
+      this.devicePos = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -505,13 +518,13 @@ export default {
           if (this.form.troubleId != null) {
             updateTrouble(this.form).then(response => {
               this.msgSuccess("修改成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           } else {
             addTrouble(this.form).then(response => {
               this.msgSuccess("新增成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           }
@@ -553,8 +566,17 @@ export default {
       this.reset2();
       getTrouble(row.troubleId).then(response => {
         this.detailForm = response.data;
+        this.devicePos = [this.detailForm.longitude, this.detailForm.latitude];
+        console.log("this.devicePos",this.devicePos);
         this.open2 = true;
         this.title2 = "燃气事故台账详情";
+
+        this.$nextTick(() => {
+          this.map = new EditorMap("troubleContainer", {}, this);
+          this.map.addDevice({ path: this.devicePos });
+          this.map.nowMouseTarget = null;
+          this.map.mousetoolClose(false);
+        });
       });
     },
     MapdialogFun() {