free-sun
/
Inspection
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

地图问题修改

master
wenlele 2 years ago
parent
473e72552e
commit
967f3d5f5a
7 changed files with 45 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      api/log/development.log
  2. 8
      web/client/index.ejs
  3. 9
      web/client/index.html
  4. 2
      web/client/src/sections/projectRegime/components/pointModel.js
  5. 5
      web/client/src/sections/projectRegime/components/projectAddModel.js
  6. 1
      web/client/src/sections/projectRegime/containers/information.js
  7. 24
      web/log/development.txt

3
api/log/development.log
View File

@ -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.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-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-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.

8
web/client/index.ejs
View File

@ -5,8 +5,14 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="shortcut icon" href="/assets/images/logo.png"> <link rel="shortcut icon" href="/assets/images/logo.png">
<link rel="stylesheet" type="text/css" href="/assets/font_sc/iconfont.css"> <link rel="stylesheet" type="text/css" href="/assets/font_sc/iconfont.css">
<script type="text/javascript">
window._AMapSecurityConfig = {
securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
}
</script>
<script <script
src="https://webapi.amap.com/maps?v=2.0&key=862a5f37e751bdaeb31130b49bc82e62&plugin=AMap.AutoComplete,AMap.PlaceSearch"></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> </head>
<body style="background: transparent"> <body style="background: transparent">

9
web/client/index.html
View File

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

2
web/client/src/sections/projectRegime/components/pointModel.js
View File

@ -129,7 +129,7 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, q
<Input placeholder="维度支持数字" /> <Input placeholder="维度支持数字" />
</Form.Item> </Form.Item>
<EnvironmentTwoTone style={{ position: 'absolute', top: 5, right: 27, fontSize: 22 }} onClick={() => { <EnvironmentTwoTone style={{ position: 'absolute', top: 5, right: 27, fontSize: 22 }} onClick={() => {
setShowBaiduMap(true) setShowBaiduMap(!showBaiduMap)
}} /> }} />
</div> </div>
<Form.Item <Form.Item

5
web/client/src/sections/projectRegime/components/projectAddModel.js
View File

@ -125,7 +125,7 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
<Input placeholder="经度支持数字" /> <Input placeholder="经度支持数字" />
</Form.Item> </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: '', }, { rules={[{ required: true, message: '', }, {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
const sjh = /^\d+$|^\d*\.\d+$/g; const sjh = /^\d+$|^\d*\.\d+$/g;
@ -143,7 +143,7 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
<Input placeholder="维度支持数字" /> <Input placeholder="维度支持数字" />
</Form.Item> </Form.Item>
<EnvironmentTwoTone style={{ position: 'absolute', top: 5, right: 27, fontSize: 22 }} onClick={() => { <EnvironmentTwoTone style={{ position: 'absolute', top: 5, right: 27, fontSize: 22 }} onClick={() => {
setShowBaiduMap(true) setShowBaiduMap(!showBaiduMap)
}} /> }} />
</div> </div>
<Form.Item <Form.Item
@ -154,7 +154,6 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
<Input id="tipinput" /> <Input id="tipinput" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="地图" label="地图"
name='map' name='map'
style={showBaiduMap ? { display: 'block' } : { display: 'none' }} style={showBaiduMap ? { display: 'block' } : { display: 'none' }}

1
web/client/src/sections/projectRegime/containers/information.js
View File

@ -158,7 +158,6 @@ const Information = (props) => {
</Form> </Form>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Button type="primary" onClick={() => { <Button type="primary" onClick={() => {
console.log(45513);
setAddModel(true) setAddModel(true)
}}>新建结构物</Button> }}>新建结构物</Button>
{/* <Button type="primary" style={{ marginLeft: 20 }} onClick={() => { {/* <Button type="primary" style={{ marginLeft: 20 }} onClick={() => {

24
web/log/development.txt
View File

@ -5594,3 +5594,27 @@
'/_file-server/project/44501f2a-8fc5-4192-9669-efab29f2de23/5', '/_file-server/project/44501f2a-8fc5-4192-9669-efab29f2de23/5',
'jpg' 'jpg'
] ]
2023-01-31 14:27:52.530 - debug: [FS-LOGGER] Init.
2023-01-31 14:27:52.533 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:27:54.791 - info: [Router] Inject api: attachment/index
2023-01-31 14:30:32.837 - debug: [FS-LOGGER] Init.
2023-01-31 14:30:32.840 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:30:33.103 - info: [Router] Inject api: attachment/index
2023-01-31 14:33:57.041 - debug: [FS-LOGGER] Init.
2023-01-31 14:33:57.044 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:33:57.369 - info: [Router] Inject api: attachment/index
2023-01-31 14:36:43.023 - debug: [FS-LOGGER] Init.
2023-01-31 14:36:43.027 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:36:43.296 - info: [Router] Inject api: attachment/index
2023-01-31 14:39:50.294 - debug: [FS-LOGGER] Init.
2023-01-31 14:39:50.298 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:39:50.568 - info: [Router] Inject api: attachment/index
2023-01-31 14:46:06.649 - debug: [FS-LOGGER] Init.
2023-01-31 14:46:06.652 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:46:06.950 - info: [Router] Inject api: attachment/index
2023-01-31 14:52:12.059 - debug: [FS-LOGGER] Init.
2023-01-31 14:52:12.062 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:52:12.301 - info: [Router] Inject api: attachment/index
2023-01-31 14:58:34.789 - debug: [FS-LOGGER] Init.
2023-01-31 14:58:34.792 - debug: init fs.attachment and inject it into app(app.fs.attachment) and runtime ctx(ctx.fs.attachment)
2023-01-31 14:58:35.027 - info: [Router] Inject api: attachment/index

Write Preview
Loading…
Cancel
Save