tj

src/layout/components/Navbar.vue

@@ -28,7 +28,13 @@
           :class="sideMenuTabIndex===tab.id?'active-'+sideMenuTabIndex:''"
           @click="sideTabChange(tab.id,tab)"
         >
-          <i class="iconfont" :class="tab.icon" />
+          <!-- <i class="iconfont" :class="tab.icon" /> -->
+          <template v-if="sideMenuTabIndex===tab.id">
+            <img :src="tab.icon" alt="">
+          </template>
+          <template v-else>
+            <img :src="tab.iconSelectEd" alt="">
+          </template>
           <p>{{ tab.name }}</p>
         </div>
       </div>
@@ -78,15 +84,13 @@ export default {
       sideMenuTabIndex: 0,
       sideMenuTabList: [
         /** ckq */
-        { name: '采空区信息', icon: 'icon-common_quality', path: '/goaf/info', permit: 'aqpt_workflow', id: 0 },
-        { name: '人员巡检', icon: 'icon-common_saving', path: '/goaf/checklist/index', permit: 'aqpt_alert_center', id: 5 },
-        { name: '传感器', icon: 'icon-common_equipment', path: '/aqpt/equipment', permit: 'aqpt_equipment', id: 4 },
-        { name: '预警', icon: 'icon-common_saving', path: '/alert', permit: 'aqpt_alert_center', id: 1 },
-        // { name: '工作台', icon: 'icon-common_task', path: '/task', permit: 'aqpt_task_center', id: 2 },
-        // { name: '安全智库', icon: 'icon-common_knowledge', path: '/aqpt/art', permit: 'aqpt_art_center', id: 7 },
-        { name: '文档中心', icon: 'icon-common_file', path: '/aqpt/doc', permit: 'aqpt_doc_center', id: 8 },
-        { name: '系统管理', icon: 'icon iconfont icon-common_configuration', path: '/aqpt/account', permit: 'aqpt_system', id: 9 },
-        { name: '数字全景', icon: 'el-icon-s-platform', href: 'http://localhost:8080/', permit: 'aqpt_panorama', id: 10 }
+        { name: '采空区信息', icon: require('@/assets/images/Navbar/goaf.png'), iconSelectEd: require('@/assets/images/Navbar/goaf_selected.png'), path: '/goaf/info', permit: 'aqpt_workflow', id: 0 },
+        { name: '人员巡检', icon: require('@/assets/images/Navbar/check.png'), iconSelectEd: require('@/assets/images/Navbar/check_selected.png'), path: '/goaf/checklist/index', permit: 'aqpt_alert_center', id: 5 },
+        { name: '传感器', icon: require('@/assets/images/Navbar/sensor.png'), iconSelectEd: require('@/assets/images/Navbar/sensor_selected.png'), path: '/aqpt/equipment', permit: 'aqpt_equipment', id: 4 },
+        { name: '预警', icon: require('@/assets/images/Navbar/warn.png'), iconSelectEd: require('@/assets/images/Navbar/warn_selected.png'), path: '/alert', permit: 'aqpt_alert_center', id: 1 },
+        { name: '文档中心', icon: require('@/assets/images/Navbar/doc.png'), iconSelectEd: require('@/assets/images/Navbar/doc_selected.png'), path: '/aqpt/doc', permit: 'aqpt_doc_center', id: 8 },
+        { name: '系统管理', icon: require('@/assets/images/Navbar/sys.png'), iconSelectEd: require('@/assets/images/Navbar/sys_selected.png'), path: '/aqpt/account', permit: 'aqpt_system', id: 9 },
+        { name: '数字全景', icon: require('@/assets/images/Navbar/bigscreen.png'), iconSelectEd: require('@/assets/images/Navbar/bigscreen_selected.png'), href: 'http://localhost:8080/', permit: 'aqpt_panorama', id: 10 }
       ]
     }
   },
@@ -326,6 +330,10 @@ export default {
         }
         .iconfont{
           font-size: 36px;
+          img{
+            display: block;
+            width:  36px;
+          }
           &.el-icon-s-platform{
                 font-family: "element-icons" !important;
           }

src/router/modules/aqpt.js

@@ -60,44 +60,6 @@ const aqptRouter = [
       }
     ]
   },
-
-  // {
-  //   path: '/aqpt/management',
-  //   component: Layout,
-  //   redirect: '/aqpt/management/leadingGroup',
-  //   name: 'AqptManagement',
-  //   meta: {
-  //     title: '管理体系',
-  //     icon: 'icon-common_organization',
-  //     permit: 'aqpt_management'
-  //   },
-  //   groupId: [3],
-  //   children: [
-  //     {
-  //       path: 'leadingGroup',
-  //       component: () => import('@/views/system/leadingGroup/index'),
-  //       name: 'aqpt_management_leading_group',
-  //       meta: { title: '领导小组', noCache: true, permit: 'aqpt_management_leading_group' }
-  //     }, {
-  //       path: 'regulation',
-  //       component: () => import('@/views/system/regulation/index'),
-  //       name: 'aqpt_management_regulation',
-  //       meta: { title: '管理制度', noCache: true, permit: 'aqpt_management_regulation' }
-  //     },
-  //     {
-  //       path: 'hazard',
-  //       component: () => import('@/views/aqpt/hazard/index'),
-  //       name: 'aqpt_management_hazard',
-  //       meta: { title: '危险源库', noCache: true, permit: 'aqpt_management_hazard' }
-  //     },
-  //     {
-  //       path: 'checkList',
-  //       component: () => import('@/views/system/checklist/index'),
-  //       name: 'aqpt_management_checkList',
-  //       meta: { title: '检查清单', noCache: true, permit: 'aqpt_management_checklist' }
-  //     }
-  //   ]
-  // },
   /** 采空区*/
   {
     path: '/goaf',
@@ -314,69 +276,6 @@ const aqptRouter = [
     ]
   },
 
-  // {
-  //   path: '/aqpt/ticket',
-  //   component: Layout,
-  //   name: 'AqptTicket',
-  //   meta: {
-  //     title: '危险作业',
-  //     icon: 'icon-common_satisfaction',
-  //     permit: 'aqpt_ticket'
-  //   },
-  //   groupId: [5],
-  //   redirect: '/aqpt/ticket/dz',
-  //   children: [
-  //     {
-  //       path: 'dz',
-  //       component: () => import('@/views/aqpt/ticket/dz/index'),
-  //       name: 'aqpt_ticket_dz',
-  //       meta: { title: '吊装作业', affix: true, permit: 'aqpt_ticket_dz' }
-  //     },
-  //     {
-  //       path: 'dh',
-  //       component: () => import('@/views/aqpt/ticket/dh/index'),
-  //       name: 'aqpt_ticket_dh',
-  //       meta: { title: '动火作业', affix: true, permit: 'aqpt_ticket_dh' }
-  //     },
-  //     {
-  //       path: 'dt',
-  //       component: () => import('@/views/aqpt/ticket/dt/index'),
-  //       name: 'aqpt_ticket_dt',
-  //       meta: { title: '动土作业', affix: true, permit: 'aqpt_ticket_dt' }
-  //     },
-  //     {
-  //       path: 'dl',
-  //       component: () => import('@/views/aqpt/ticket/dl/index'),
-  //       name: 'aqpt_ticket_dl',
-  //       meta: { title: '断路作业', affix: true, permit: 'aqpt_ticket_dl' }
-  //     },
-  //     {
-  //       path: 'gk',
-  //       component: () => import('@/views/aqpt/ticket/gk/index'),
-  //       name: 'aqpt_ticket_gk',
-  //       meta: { title: '高处作业', affix: true, permit: 'aqpt_ticket_gk' }
-  //     },
-  //     {
-  //       path: 'sbjx',
-  //       component: () => import('@/views/aqpt/ticket/sbjx/index'),
-  //       name: 'aqpt_ticket_sbjx',
-  //       meta: { title: '设备检修作业', affix: true, permit: 'aqpt_ticket_sbjx' }
-  //     },
-  //     {
-  //       path: 'mbcd',
-  //       component: () => import('@/views/aqpt/ticket/mbcd/index'),
-  //       name: 'aqpt_ticket_mbcd',
-  //       meta: { title: '盲板抽堵作业', affix: true, permit: 'aqpt_ticket_mbcd' }
-  //     },
-  //     {
-  //       path: 'sxkj',
-  //       component: () => import('@/views/aqpt/ticket/sxkj/index'),
-  //       name: 'aqpt_ticket_sxkj',
-  //       meta: { title: '受限空间作业', affix: true, permit: 'aqpt_ticket_sxkj' }
-  //     }
-  //   ]
-  // },
-
   {
     path: '/aqpt/training',
     component: Layout,
@@ -470,33 +369,33 @@ const aqptRouter = [
     ]
   },
 
-  {
-    path: '/aqpt/art',
-    component: Layout,
-    name: 'AqptArtCenter',
-    redirect: '/aqpt/art/index',
-    groupId: [7],
-    hidden: true,
-    meta: {
-      title: '安全智库',
-      permit: 'aqpt_art_center'
-    },
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/system/art/index'),
-        name: 'aqpt_art_center',
-        meta: { title: '安全智库', noCache: true, icon: 'icon-common_knowledge', permit: 'aqpt_art_center' }
-      }
-    ]
-  },
+  // {
+  //   path: '/aqpt/art',
+  //   component: Layout,
+  //   name: 'AqptArtCenter',
+  //   redirect: '/aqpt/art/index',
+  //   groupId: [7],
+  //   hidden: true,
+  //   meta: {
+  //     title: '安全智库',
+  //     permit: 'aqpt_art_center'
+  //   },
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/system/art/index'),
+  //       name: 'aqpt_art_center',
+  //       meta: { title: '安全智库', noCache: true, icon: 'icon-common_knowledge', permit: 'aqpt_art_center' }
+  //     }
+  //   ]
+  // },
   {
     path: '/aqpt/doc',
     component: Layout,
     name: 'AqptDoc',
     redirect: '/aqpt/doc/index',
     groupId: [8],
-    hidden: true,
+    // hidden: true,
     meta: {
       title: '文件中心',
       permit: 'aqpt_doc_center'
@@ -507,6 +406,12 @@ const aqptRouter = [
         component: () => import('@/views/system/doc/index'),
         name: 'aqpt_doc_center',
         meta: { title: '文件中心', noCache: true, icon: 'icon-common_file', permit: 'aqpt_doc_center' }
+      },
+      {
+        path: 'knowledge',
+        component: () => import('@/views/system/art/index'),
+        name: 'aqpt_art_center',
+        meta: { title: '安全智库', noCache: true, icon: 'icon-common_knowledge', permit: 'aqpt_doc_center' }
       }
     ]
   },

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '六院联创数字化管理平台',
+  title: '采空区信息化管理系统',
 
   /**
    * @type {boolean} true | false
@@ -38,8 +38,8 @@ module.exports = {
   */
   serverUrl: 'http://192.168.1.214:8080/', // 正式环境
   // devServerUrl: 'http://1.15.92.205:8080/', // 开发环境
-  devServerUrl: 'http://192.168.3.5:8080/', // 开发环境 qu
-  // devServerUrl: 'http://192.168.3.201:8080/', // 开发环境  test
+  // devServerUrl: 'http://192.168.3.5:8080/', // 开发环境 qu
+  devServerUrl: 'http://192.168.3.201:8080/', // 开发环境  test
   mqttUrl: 'ws://1.15.92.205:8083/mqtt', // 水泥厂mqtt地址
   /**
   * websocket 地址

src/views/goaf/checklist/index.vue

@@ -17,7 +17,7 @@
     <el-row class="content-body">
       <el-table border :data="dataList" height="calc(100vh - 220px)">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="80" />
-        <el-table-column prop="checklistTitle" label="名称" header-align="left" align="left" width="260">
+        <el-table-column prop="checklistTitle" label="检查表名称" header-align="left" align="left" width="260">
           <template v-slot="{row}">
             <span><i class="el-icon-tickets" /> {{ row.checklistTitle }}</span>
           </template>

src/views/goaf/info/components/Goaf.vue

@@ -9,9 +9,9 @@
   >
     <div class="content-container goaf">
       <vuescroll :ops="ops" style="height: calc(100vh - 220px)">
-        <el-form ref="ruleForm" :model="formData" :rules="rules" label-position="right" label-width="160px">
+        <el-form ref="ruleForm" :model="formData" :rules="rules" label-position="top">
           <el-form-item label="采空区名称" prop="goafName">
-            <el-input v-model="formData.goafName" style="width:90%" />
+            <el-input v-model="formData.goafName" style="width:50%" />
           </el-form-item>
           <el-form-item label="矿带" required>
             <el-input-number v-model="formData.goafOrebelt" placeholder="矿带" :controls="false" />

src/views/goaf/info/components/GoafInfo.vue

@@ -13,10 +13,8 @@
         <el-button type="primary" @click="handleAdd">新增</el-button>
       </el-col>
     </el-row>
-
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
-        <!-- <el-table-column type="index" label="序号" header-align="center" align="center" width="60" /> -->
         <el-table-column prop="goafOrebelt" label="矿带">
           <template v-slot="{row}">
             <span>{{ convertNum(row.goafOrebelt) }}</span>
@@ -33,35 +31,15 @@
         <el-table-column prop="goafRemainVolume" label="剩余可充填体积（m³）" width="180" />
         <el-table-column prop="goafIsFill" label="是否充填" width="80">
           <template v-slot="{row}">
-            <span>{{ row.goafFillMethod==0?'是':'否' }}</span>
+            <span v-if="row.goafFillMethod==0" style="color:'#49E86C'">是</span>
+            <span v-else style="color:'#E44E2D'">否</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="goafAvexArea" label="水平断面均暴露面积" />
-        <el-table-column prop="goafAvinWidth" label="平均倾向宽度" />
-        <el-table-column prop="goafAvexHeight" label="平均暴露高度">
-          <template v-slot="{row}">
-            <span>{{ row.goafAvexHeight==0?'已填充':row.goafAvexHeight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="goafVoidVolume" label="体积">
-          <template v-slot="{row}">
-            <span>{{ row.goafVoidVolume==0?'已填充':row.goafVoidVolume }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="goafKeyTrend" label="倾向" />
-        <el-table-column prop="goafKeyDipangle" label="倾角（度）" />
-                <el-table-column prop="goafExpLocation" label="勘探位置" />
-        <el-table-column prop="goafFormationTime" label="形成时间" width="150" />
-        <el-table-column prop="goafFillMethod" label="充填方式">
-          <template v-slot="{row}">
-            <span>{{ row.goafFillMethod==0?'废石':'尾矿' }}</span>
-          </template>
-        </el-table-column>         -->
         <el-table-column label="操作" header-align="center" align="center" width="240">
           <template v-slot="{row}">
-            <el-button type="primary" @click="showDetail(row)">详情</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(row)">修改</el-button>
-            <el-button size="mini" type="danger" icon="el-icon-edit" @click="handleDelete(row)">删除</el-button>
+            <el-button size="mini" type="text" style="color:'#1B81FF'" @click="showDetail(row)">详情</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" style="color:'#1B81FF'" @click="handleUpdate(row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" style="color:'#E44E2D'" @click="handleDelete(row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/goaf/map/components/VisualEditor.vue

@@ -130,7 +130,6 @@ export default {
       checkItemIndex: -1,
       state: 0,
       markerId: undefined,
-      veditId: undefined,
       dragstartMarker: undefined,
       markerItems: [
         { icon: require('@/assets/images/icon/4.png'), name: '' }
@@ -241,6 +240,7 @@ export default {
         attributionControl: false,
         zoomControl: true // zoomControl（缩放控制）：确定缩放控制是否默认加载在地图上。
       })
+      this.layerGroup = L.layerGroup().addTo(this.map)
       this.geoLayer = L.geoJson(null, { pmIgnore: false })
       this.geoLayer.addTo(this.map)
       this.mapListener()
@@ -276,6 +276,7 @@ export default {
       this.formData.mapId = obj.mapId
       this.setRasterLayer()
       this.clearLayers()
+      this.initMapState()
     },
     createMapLayer() {
       createMapLayer().then(() => {
@@ -316,6 +317,7 @@ export default {
           })
           layer.setIcon(icon)
           self.layer = layer
+          console.log(this)
           layer.addTo(this.layerGroup)
           layer.on('click', (ev) => {
             if (self.type === 2) {
@@ -349,8 +351,6 @@ export default {
       const self = this
       const layerList = this.mapLayerList
       const feature = []
-      this.layerGroup = L.layerGroup().addTo(this.map)
-
       if (layerList != null && layerList.length > 0) {
         layerList.forEach((item) => {
           const layerMarker = item.layerMarker && JSON.parse(item.layerMarker)
@@ -407,6 +407,19 @@ export default {
         this.layerGroup.clearLayers()
       }
     },
+    initMapState() {
+      this.type = 1
+      this.checkItemIndex = -1
+      this.state = 0
+      this.markerId = undefined
+      this.dragstartMarker = undefined
+      this.resetForm()
+      this.layer = null
+      this.layers = []
+      this.goafOrebodys = []
+      this.goafOreheights = []
+      this.goafNames = []
+    },
     submit() {
       // 图层操作完，一次导出geoJSON
       const layers = this.map._layers

src/views/goaf/sensor/index.vue

@@ -17,7 +17,11 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
-        <el-table-column prop="sensorTypeName" label="传感器类型名称" />
+        <el-table-column prop="sensorTypeName" label="设备名称" />
+        <el-table-column prop="sensorTypeName" label="安装区域" />
+        <el-table-column prop="sensorTypeName" label="安装地点" />
+        <el-table-column prop="sensorTypeName" label="设备类型名称" />
+        <el-table-column prop="sensorTypeName" label="设备责任人" />
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">
             <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(row)">修改</el-button>