地图问题修改

2 years ago · 967f3d5f5a
7 changed files with 45 additions and 9 deletions
--- a/api/log/development.log
+++ b/api/log/development.log
@ -4171,3 +4171,6 @@ notNull Violation: PatrolPlan.patrolCount cannot be null
 2023-01-30 17:22:36.201 - debug: [FS-LOGGER] Init.
 2023-01-30 17:22:36.345 - info: [FS-ATTACHMENT] Inject attachment mw into router.
 2023-01-30 17:22:36.345 - info: [FS-AUTH] Inject auth and api mv into router.
+2023-01-31 14:27:41.283 - debug: [FS-LOGGER] Init.
+2023-01-31 14:27:42.123 - info: [FS-ATTACHMENT] Inject attachment mw into router.
+2023-01-31 14:27:42.124 - info: [FS-AUTH] Inject auth and api mv into router.
--- a/web/client/index.ejs
+++ b/web/client/index.ejs
@ -5,8 +5,14 @@
    <meta charset="UTF-8">
    <link rel="shortcut icon" href="/assets/images/logo.png">
    <link rel="stylesheet" type="text/css" href="/assets/font_sc/iconfont.css">
-    <script
-      src="https://webapi.amap.com/maps?v=2.0&key=862a5f37e751bdaeb31130b49bc82e62&plugin=AMap.AutoComplete,AMap.PlaceSearch"></script>
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
+      }
+    </script>
+   <script
+      src="https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.AutoComplete,AMap.PlaceSearch"></script>
+      <!-- <script src="https://webapi.amap.com/loca?v=2.0.0&key=00f9a29dedcdbd8befec3dfe0cef5003"></script> -->
 </head>

 <body style="background: transparent">
--- a/web/client/index.html
+++ b/web/client/index.html
@ -6,9 +6,14 @@
   <title></title>
   <link rel="shortcut icon" href="/assets/images/logo.png">
   <link rel="stylesheet" type="text/css" href="/assets/font_sc/iconfont.css">
+   <script type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
+      }
+    </script>
   <script
-      src="https://webapi.amap.com/maps?v=2.0&key=862a5f37e751bdaeb31130b49bc82e62&plugin=AMap.AutoComplete,AMap.PlaceSearch"></script>
-      <!-- <script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script> -->
+      src="https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.AutoComplete,AMap.PlaceSearch"></script>
+      <!-- <script src="https://webapi.amap.com/loca?v=2.0.0&key=00f9a29dedcdbd8befec3dfe0cef5003"></script> -->
 </head>

 <body>
--- a/web/client/src/sections/projectRegime/components/pointModel.js
+++ b/web/client/src/sections/projectRegime/components/pointModel.js
@ -129,7 +129,7 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, q
                  <Input placeholder="维度支持数字" />
               </Form.Item>
               <EnvironmentTwoTone style={{ position: 'absolute', top: 5, right: 27, fontSize: 22 }} onClick={() => {
-                  setShowBaiduMap(true)
+                  setShowBaiduMap(!showBaiduMap)
               }} />
            </div>
            <Form.Item
--- a/web/client/src/sections/projectRegime/components/projectAddModel.js
+++ b/web/client/src/sections/projectRegime/components/projectAddModel.js
@ -125,7 +125,7 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
                  <Input placeholder="经度支持数字" />
               </Form.Item>
               ~
-               <Form.Item name="latitude" initialValue={modelData?.latitude} style={{ display: 'inline-block', width: 'calc(40% + 15px)', }}
+               <Form.Item name="latitude"  style={{ display: 'inline-block', width: 'calc(40% + 15px)', }}
                  rules={[{ required: true, message: '', }, {
                     validator: (rule, value, callback) => {
                        const sjh = /^\d+$|^\d*\.\d+$/g;
@ -143,7 +143,7 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
                  <Input placeholder="维度支持数字" />
               </Form.Item>
               <EnvironmentTwoTone style={{ position: 'absolute', top: 5, right: 27, fontSize: 22 }} onClick={() => {
-                  setShowBaiduMap(true)
+                  setShowBaiduMap(!showBaiduMap)
               }} />
            </div>
            <Form.Item
@ -154,7 +154,6 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
               <Input id="tipinput" />
            </Form.Item>
            <Form.Item
-
               label="地图"
               name='map'
               style={showBaiduMap ? { display: 'block' } : { display: 'none' }}
--- a/web/client/src/sections/projectRegime/containers/information.js
+++ b/web/client/src/sections/projectRegime/containers/information.js
@ -158,7 +158,6 @@ const Information = (props) => {
            </Form>
            <div style={{ display: 'flex' }}>
               <Button type="primary" onClick={() => {
-                  console.log(45513);
                  setAddModel(true)
               }}>新建结构物</Button>
               {/* <Button type="primary" style={{ marginLeft: 20 }} onClick={() => {
--- a/web/log/development.txt
+++ b/web/log/development.txt
@ -5594,3 +5594,27 @@
  [32m'/_file-server/project/44501f2a-8fc5-4192-9669-efab29f2de23/5'[39m,
  [32m'jpg'[39m
 ]
+2023-01-31 14:27:52.530 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:27:52.533 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:27:54.791 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:30:32.837 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:30:32.840 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:30:33.103 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:33:57.041 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:33:57.044 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:33:57.369 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:36:43.023 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:36:43.027 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:36:43.296 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:39:50.294 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:39:50.298 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:39:50.568 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:46:06.649 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:46:06.652 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:46:06.950 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:52:12.059 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:52:12.062 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:52:12.301 - [32minfo[39m: [Router] Inject api: attachment/index
+2023-01-31 14:58:34.789 - [34mdebug[39m: [FS-LOGGER] Init.
+2023-01-31 14:58:34.792 - [34mdebug[39m: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
+2023-01-31 14:58:35.027 - [32minfo[39m: [Router] Inject api: attachment/index