From 519b2befd64b3922a19a28e8c6eb8d988d1cd701 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 20 Sep 2022 14:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/const/eventgm/eventgm.js |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/const/eventgm/eventgm.js b/src/const/eventgm/eventgm.js
index d11847a..d4afbb3 100644
--- a/src/const/eventgm/eventgm.js
+++ b/src/const/eventgm/eventgm.js
@@ -6,8 +6,15 @@
   searchMenuSpan: 6,
   border: true,
   index: true,
-  viewBtn: true,
+  viewBtn: false,
+  delBtn: false,
+  editBtn: false,
+  menuType:'menu',
+  menuBtnTitle:'事件处置',
   selection: true,
+  selectable: (row) => {
+    return parseInt(row.state) == 0;
+  },
   dialogClickModal: false,
   column: [
     {
@@ -18,23 +25,6 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
-    },
-    {
-      label: "事件类型",
-      prop: "type",
-      type: "select",
-      dicUrl: "/api/blade-system/dict-biz/dictionary?code=EVENT_TYPE",
-      dataType: "number",
-      props: {
-        label: "dictValue",
-        value: "dictKey"
-      },
-      rules: [{
-        required: true,
-        message: "请选择事件类型",
-        trigger: "blur"
-      }],
-      search: true,
     },
     {
       label: "上报人",
@@ -62,19 +52,31 @@
       prop: "avueMapAddress",
       type: "map",
       component: 'avueMap',
-      value: {
-        // "formattedAddress": "",
-        // "longitude": 0,
-        // "latitude": 0
-      },
+      // value: {},
       hide: true,
       overHidden: true,
-      span: 24,
       rules: [{
         required: true,
         message: "选择坐标",
         trigger: "blur"
       }],
+    },
+    {
+      label: "事件类型",
+      prop: "type",
+      type: "select",
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=EVENT_TYPE",
+      dataType: "number",
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
+      rules: [{
+        required: true,
+        message: "请选择事件类型",
+        trigger: "blur"
+      }],
+      search: true,
     },
     {
       label: "地址",
@@ -118,18 +120,20 @@
       label: "事件状态",
       prop: "state",
       type: "select",
+      search: true,
+      disabled: true,
       dicUrl: "/api/blade-system/dict-biz/dictionary?code=EVENT_STATE",
       dataType: "number",
       props: {
         label: "dictValue",
         value: "dictKey"
       },
-      search: true,
     },
     {
-      label: "任务来源",
+      label: "事件来源",
       prop: "source",
       type: "select",
+      disabled: true,
       dicData: [{id:'WEB',name:'WEB'},{id:'APP',name:'APP'}],
       props: {
         label: "name",

--
Gitblit v1.9.3