Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

api/app/lib/models/report.js

@@ -186,6 +186,16 @@ module.exports = dc => {
             field: "handle_state",
             autoIncrement: false
         },
+        codeRoad: {
+            index: 19,
+            type: DataTypes.STRING,
+            allowNull: true,
+            defaultValue: "",
+            // comment: "路线代码",
+            primaryKey: false,
+            field: "code_road",
+            autoIncrement: false
+        },
     }, {
         tableName: "report",
         comment: "",

api/log/development.log

@@ -11218,3 +11218,6 @@ headers: {}
 2023-06-27 20:02:06.352 - debug: [FS-LOGGER] Init.
 2023-06-27 20:02:06.794 - info: [FS-ATTACHMENT] Inject attachment mw into router.
 2023-06-27 20:02:06.795 - info: [FS-AUTH] Inject auth and api mv into router.
+2023-07-12 14:02:42.806 - debug: [FS-LOGGER] Init.
+2023-07-12 14:02:45.494 - info: [FS-ATTACHMENT] Inject attachment mw into router.
+2023-07-12 14:02:45.494 - info: [FS-AUTH] Inject auth and api mv into router.

scripts/1.2.3/schema/2.update_report.sql

@@ -0,0 +1,2 @@
+alter table report
+	add code_road varchar(512);

weapp/src/packages/components/inputPicker/index.jsx

@@ -30,7 +30,7 @@ export default function InputPicker (props) {
   const handlePickerChange = (e) => {
     onInput(curSelector[e.detail.value])
   }
-console.log(onlySelect);
+
   return (
     <View className='input-picker'>
       <View className='input-box'>

web/client/src/sections/quanju/containers/example.js

@@ -30,16 +30,13 @@ const Example = (props) => {
                     document.body.clientHeight / 1080
                 )})`, */
          }}>
-
             <div style={{ width: "100%", height: "10%" }}>
                <Header tabChange={tabChange} tabKey={tabKey} dispatch={dispatch} user={user} />
             </div>
             <div style={{ position: 'absolute', width: "100%", height: "90%" }}>
-               <Gis tabKey={tabKey} />
+               {/* <Gis tabKey={tabKey} /> */}
                <Footer tabKey={tabKey} dispatch={dispatch} />
-
             </div>
-
          </div>
       </Spin>
    )