From 36288757266bca925c829346ddbb0265743b9315 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 16 May 2024 20:01:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jczz_web

---
 src/views/cGovernance/taskECallTwo/index.vue |  144 ++++++++++++++++++++++++++++++------------------
 1 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/src/views/cGovernance/taskECallTwo/index.vue b/src/views/cGovernance/taskECallTwo/index.vue
index 0c68b00..d6e16d1 100644
--- a/src/views/cGovernance/taskECallTwo/index.vue
+++ b/src/views/cGovernance/taskECallTwo/index.vue
@@ -264,41 +264,71 @@
               prop: "applicantGrid",
               submitBtn: "保存",
               hide: true,
-              // type: 'map',
-              dataType: "string",
-              // span: 24,
-              // value: [117.966460, 28.431002, ""]
+              parent: false,
+              type: "tree",
+              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1123598813738675201",
+              props: {
+                label: "title",
+                value: "id"
+              },
+              // rules: [{
+              //   required: true,
+              //   message: "请选择网格",
+              //   trigger: "blur",
+              // }, ],
             },
             {
               width: 110,
               label: "诉求人行政区划",
               labelWidth: 120,
               prop: "applicantDistrict",
-              // type: "upload",
-              listType: "picture-card",
-              dataType: "string",
-              multiple: true,
-              row: true,
+              type: "tree",
+              dicUrl: "/api/blade-counties/counties/list",
+              props: {
+                label: "name",
+                value: "code"
+              },
+              // rules: [{
+              //   required: true,
+              //   message: "请选择事发地址网格",
+              //   trigger: "blur",
+              // }, ],
               // span: 24,
             },
             {
               label: "事发地址",
               prop: "sceneAddr",
-              // type: "textarea",
               submitBtn: "保存",
               hide: true,
               type: 'map',
-              dataType: "string",
               span: 24,
-              value: [117.966460, 28.431002, ""]
+              value: [117.966460, 28.431002, ""],
+              mapChange: (params) => {
+                console.log('高德回调参数', params)
+              },
+              //高德初始化参数
+              params: {
+                zoom: 10,
+                zoomEnable: false,
+                dragEnable: false,
+              }
             },
             {
               label: "事发地址网格",
               prop: "sceneAddrGrid",
               labelWidth: 120,
-              // type: "textarea",
-              // hide: true,
-              // span: 24,
+              parent: false,
+              type: "tree",
+              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1123598813738675201",
+              props: {
+                label: "title",
+                value: "id"
+              },
+              // rules: [{
+              //   required: true,
+              //   message: "请选择事发地址网格",
+              //   trigger: "blur",
+              // }, ],
             },
             {
               label: "事发所属行政区划",
@@ -306,6 +336,17 @@
               labelWidth: 130,
               // type: "textarea",
               hide: true,
+              type: "tree",
+              dicUrl: "/api/blade-counties/counties/list",
+              props: {
+                label: "name",
+                value: "code"
+              },
+              // rules: [{
+              //   required: true,
+              //   message: "请选择事发地址网格",
+              //   trigger: "blur",
+              // }, ],
               // span: 24,
             },
             {
@@ -354,6 +395,18 @@
               prop: "issueClazz",
               // type: "select",
               // hide: true,
+              type: "tree",
+              dicUrl: "/api/blade-issueClazz/issueClazz/tree",
+              props: {
+                label: "title",
+                value: "code"
+              },
+              // rules: [{
+              //   required: true,
+              //   message: "请选择事发地址网格",
+              //   trigger: "blur",
+              // }, ],
+              // span: 24,
             },
             {
               label: "紧急程度",
@@ -399,36 +452,13 @@
             // type: "select",
             // hide: true,
             // },
-            {
-              label: "受理单位",
-              prop: "acptOrgName",
-              // type: "select",
-              // hide: true,
-            },
-            {
-              label: "处办方式",
-              prop: "handleWay",
-              type: "select",
-              dicData: [{
-                label: "方式一",
-                value: 0
-              }, {
-                label: "方式二",
-                value: 1
-              }, {
-                label: "方式三",
-                value: 2
-              }],
-              // type: "select",
-              // hide: true,
-            },
-            {
-              label: "外部处办方式",
-              prop: "externalHandleWay",
-              labelWidth: 120,
-              // type: "select",
-              // hide: true,
-            },
+            // {
+            //   label: "受理单位",
+            //   prop: "acptOrgName",
+            //   type: "select",
+            //   hide: true,
+            // },
+
             {
               label: "直接答复内容",
               prop: "directFeed",
@@ -643,16 +673,22 @@
         row[type] = !row[type]
       },
 
+      locationDispose(data) {
+        return {
+          longitude: data[0],
+          latitude: data[1],
+          sceneAddr: data[2]
+        }
+      },
+
       rowSave(row, done, loading) {
-        // if (row.imageUrls.length > 0) {
-        //   var urls = []
-        //   var split = row.imageUrls.split(",")
-        //   split.forEach(url => {
-        //     var names = url.split("jczz/")
-        //     urls.push(names[1])
-        //   })
-        //   row.imageUrls = urls.join(",")
-        // }
+        console.log("777777777777777777777" + JSON.stringify(row))
+
+        let local = this.locationDispose(row.sceneAddr)
+        row.sceneAddr = local.sceneAddr
+        row.sceneGeoLat = local.latitude
+        row.sceneGeoLng = local.longitude
+        console.log("88888888888888888888888888" + JSON.stringify(row))
         add(row).then(
           () => {
             this.onLoad(this.page)

--
Gitblit v1.9.3