浏览代码

事件详情加类别和名称

qinhouyu 2 年之前
父节点
当前提交
7040973391
共有 2 个文件被更改,包括 10 次插入3 次删除
  1. 6 0
      src/views/eventdetailsdialog.vue
  2. 4 3
      vue.config.js

+ 6 - 0
src/views/eventdetailsdialog.vue

@@ -95,6 +95,7 @@
             <!-- 右侧 -->
             <!-- 右侧 -->
             <el-col :span="6" class="dia-right">
             <el-col :span="6" class="dia-right">
               <div class="e-right">
               <div class="e-right">
+                <div class="dia-left-top-tit">事件类别: {{eventTypeName}} , 事件标题: {{eventName}}</div>
                 <div class="forthis1">
                 <div class="forthis1">
                   <dv-border-box-7 backgroundColor="#040b1f"
                   <dv-border-box-7 backgroundColor="#040b1f"
                                    style="padding-bottom:1rem ;">
                                    style="padding-bottom:1rem ;">
@@ -1295,6 +1296,7 @@ export default {
       deptId: null,//事件流程部门
       deptId: null,//事件流程部门
       eventCode: null,
       eventCode: null,
       eventName: null,
       eventName: null,
+      eventTypeName: null,
       longitude: null,
       longitude: null,
       latitude: null,
       latitude: null,
       eventLog: null,
       eventLog: null,
@@ -2235,6 +2237,8 @@ console.log(this.dutysystemTableData)
         that.latitude = res.data.catalogue.latitude
         that.latitude = res.data.catalogue.latitude
         that.eventName = res.data.catalogue.eventName
         that.eventName = res.data.catalogue.eventName
         that.eventTypeXl = res.data.catalogue.eventTypeXl
         that.eventTypeXl = res.data.catalogue.eventTypeXl
+        that.eventTypeName = res.data.catalogue.event_type_name
+
         let markersMap = {
         let markersMap = {
           lng: 124.59,
           lng: 124.59,
           lat: 43.02,
           lat: 43.02,
@@ -2322,6 +2326,8 @@ console.log(this.dutysystemTableData)
         that.longitude = res.data.catalogue.longitude
         that.longitude = res.data.catalogue.longitude
         that.eventName = res.data.catalogue.eventName
         that.eventName = res.data.catalogue.eventName
         that.eventTypeXl = res.data.catalogue.eventTypeXl
         that.eventTypeXl = res.data.catalogue.eventTypeXl
+        that.eventTypeName = res.data.catalogue.event_type_name
+
         let markersMap = {
         let markersMap = {
           lng: 124.59,
           lng: 124.59,
           lat: 43.02,
           lat: 43.02,

+ 4 - 3
vue.config.js

@@ -52,10 +52,11 @@ module.exports = {
     proxy: {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://127.0.0.1:3031`,
+        target: `http://127.0.0.1:3031`,
+        // target: `https://2961rt3561.oicp.vip`,
+        // target: `https://29613561xe.eicp.vip`,
+        // target: `http://121.36.228.66:3031`,
         // target: `http://192.168.2.118:3031`,
         // target: `http://192.168.2.118:3031`,
-        target: `http://121.36.228.66:3031`,
-        // target: `http://172.28.20.101:3031`,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
           ['^' + process.env.VUE_APP_BASE_API]: ''