Merge branch 'feat_upload_server_url_0416'

4 months ago · 5a74bd7896
6 changed files with 111 additions and 60 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 *.zip
+
+.idea
+package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
@ -48,6 +48,7 @@
        "jest": "^27.4.3",
        "jest-resolve": "^27.4.2",
        "jest-watch-typeahead": "^1.0.0",
+        "konva": "^8.3.5",
        "mini-css-extract-plugin": "^2.4.5",
        "postcss-flexbugs-fixes": "^5.0.2",
        "postcss-loader": "^6.2.1",
@ -12277,8 +12278,7 @@
          "url": "https://github.com/sponsors/lavrton"
        }
      ],
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/language-subtag-registry": {
      "version": "0.3.23",
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "outline",
  "version": "0.1.0",
  "private": true,
-  "proxy": "http://192.168.1.200:8080",
+  "proxy": "http://192.168.1.102:8080",
  "dependencies": {
    "@ant-design/icons": "^6.0.0",
    "@babel/core": "^7.16.0",
--- a/src/App.tsx
+++ b/src/App.tsx
@ -15,7 +15,12 @@ import { updateDevice } from "./store/features/contextSlice";
 import { getStatus, update } from "./services/ktj/org";
 import SyncData from "./components/syncData";
 import { sysSet } from "./services/user/system";
-import { updateSystemAccountState, updateSystemAllState, updateSystemOrgState } from "./store/system/systemSlice";
+import {
+	updateSystemAccountState,
+	updateSystemAllState,
+	updateSystemOrgState,
+	updateUploadServerUrlState
+} from "./store/system/systemSlice";
 import { system } from "./types";
 import Home from "./home";

@ -105,6 +110,9 @@ function App() {
 					if(item.code === 'UPLOAD_USERNAME'){
 						dispatch(updateSystemAccountState(item))
 					}
+					if(item.code === 'UPLOAD_SERVER_URL'){
+						dispatch(updateUploadServerUrlState(item))
+					}
 				})
 				
 			}
--- a/src/pages/system/Setting.tsx
+++ b/src/pages/system/Setting.tsx
@ -8,7 +8,11 @@ import { OrgItem } from '../../services/ktjTypes';
 import {bleItem, child, GwdItem, orgCascaderType, systemItem} from './types';
 import { sysSet } from '../../services/user/system';
 import {  useAppDispatch, useAppSelector } from "../../utils/hooks";
-import { updateSystemAccountState, updateSystemAllState, updateSystemOrgState } from '../../store/system/systemSlice';
+import {
+  updateSystemAccountState,
+  updateSystemOrgState,
+  updateUploadServerUrlState
+} from '../../store/system/systemSlice';
 import {createWebSocket, sharedWsUrl} from "../../services/socket";
 import {start, stop, disconnect, connect} from "../../services/ble/ble";

@ -27,6 +31,7 @@ export default function Setting(){
  const [systemList, setSystemList] = useState<systemItem[]>([])
  const [accountInfo, setAccountInfo] = useState<systemItem>({})
  const [orgInfo, setOrgInfo] = useState<systemItem>({})
+  const [uploadServerUrl, setUploadServerUrl] = useState<systemItem>({})
  const [orgValues, setOrgValues] = useState<string[]>([])
  const [bleList, setBleList] = useState<bleItem[]>([])

@ -86,6 +91,19 @@ export default function Setting(){


  useEffect(()=>{
+    if(systemState.uploadServerUrl){
+      const cloneUploadServerUrl = systemState.uploadServerUrl
+      let uploadServerUrl:systemItem = {
+        id: cloneUploadServerUrl.id,
+        name: cloneUploadServerUrl.name,
+        code: cloneUploadServerUrl.code,
+        value: cloneUploadServerUrl.value
+      }
+      setUploadServerUrl(uploadServerUrl)
+    }
+  }, [systemState.uploadServerUrl])
+
+  useEffect(()=>{
    if(orgInfo && orgInfo.value){
      let orgIds:string[] = []
      const values:child[] = JSON.parse(orgInfo.value)
@ -129,6 +147,59 @@ export default function Setting(){
    }
  }

+  let newAccountInfo = {
+    name:'',
+    value: ''
+  }
+  function onSaveAccount(){
+    const accountParams = {
+      code:"UPLOAD_USERNAME",
+      name:accountInfo.name,
+      value:newAccountInfo.value,
+      id:accountInfo.id
+    }
+    sysSet(accountParams, "PUT").then(res=>{
+      if(res.status === 0){
+        dispatch(updateSystemAccountState(accountParams))
+        message.success("修改成功")
+      }
+    })
+  }
+
+  /**
+   * 上传服务器地址输入框内容变更
+   * @param uploadServerUrlValue
+   */
+  function onUploadServerUrlChange(uploadServerUrlValue:string){
+    const uploadServerUrlParams = {
+      code:"UPLOAD_SERVER_URL",
+      name:uploadServerUrl.name,
+      value:uploadServerUrlValue,
+      id:uploadServerUrl.id
+    }
+    sysSet(uploadServerUrlParams, "PUT").then(res=>{
+      if(res.status === 0){
+        dispatch(updateUploadServerUrlState(uploadServerUrlParams))
+        message.success("修改成功")
+      }
+    })
+  }
+
+  function onAccountChange(accountValue:string){
+    const accountParams = {
+      code:accountInfo.code,
+      name:accountInfo.name,
+      value:accountValue,
+      id:accountInfo.id
+    }
+    sysSet(accountParams, "PUT").then(res=>{
+      if(res.status === 0){
+        dispatch(updateSystemAccountState(accountParams))
+        message.success("修改成功")
+      }
+    })
+  }
+
  function convertToCascaderData(data:OrgItem[]) {
    return data.map(item => {
      const newItem:orgCascaderType = {
@ -251,64 +322,24 @@ export default function Setting(){
    }
  };

-  const saveSet = (item:systemItem, value:string) => {
-    const params = {
-      id:item.id,
-      value
-    }
-    sysSet(params, "PUT").then(res=>{
-      if(res.status === 0){
-        const list:systemItem[] = JSON.parse(JSON.stringify(systemList))
-        list.forEach(el => {
-          if(item.id === el.id){
-            el.value = value
-          }
-        })
-        dispatch(updateSystemAllState(list))
-        message.success("修改成功")
-      }
-    })
-  }
-
-  const form = () =>{
-    return <Form
-        name="basic"
-        labelCol={{ span: 3, offset: 1 }}
-        wrapperCol={{ span: 16 }}
-        style={{ maxWidth: 600 }}
-        autoComplete="off"
-    >
-      {
-        systemList.map((item, index) => {
-          return <Form.Item
-              key={index}
-              label={item.name}
-              name={item.code}
-          >
-            {item.code === 'ORG' ?
-                <Cascader className='w-[300px]' key={orgValues.length} defaultValue={orgValues} options={KTJOrgList} onChange={onOrgChange} placeholder="请选择局段线" />
-                : <Input defaultValue={item.value} onBlur={(e) => saveSet(item, e.target.value)}/>}
-          </Form.Item>
-        })
-      }
-    </Form>
-  }
-

  // @ts-ignore
  return <><div className={'pr-2.5 pl-2.5  w-full h-full'}>
    <div className={'h-full w-full bg-white p-10 rounded-2xl'}>
      <h1 className='text-[20px]'>系统配置</h1>
      <section className='p-[20px]'>
-        {form()}
-        {/*<div>*/}
-        {/*  <span>铁路局：</span>*/}
-        {/*  <Cascader className='w-[300px]' key={orgValues.length} defaultValue={orgValues} options={KTJOrgList} onChange={onOrgChange} placeholder="请选择局段线" /></div>*/}
-        {/*<div className='mt-[10px]'>*/}
-        {/* <span> {accountInfo.name}：</span>*/}
-        {/*  <Input key={accountInfo.value} defaultValue={accountInfo.value} onChange={(e)=>{onAccountChange(e.target.value)}} className='w-[300px]'></Input>*/}
-        {/*  <Button className='ml-[10px]' size='small' type="primary" onClick={onSaveAccount}>保存</Button>*/}
-        {/*</div>*/}
+        <div>
+          <span>铁路局：</span>
+          <Cascader className='w-[300px]' key={orgValues.length} defaultValue={orgValues} options={KTJOrgList} onChange={onOrgChange} placeholder="请选择局段线" /></div>
+        <div className='mt-[10px]'>
+         <span> {accountInfo.name}：</span>
+          <Input key={accountInfo.value} defaultValue={accountInfo.value} onBlur={(e)=>{onAccountChange(e.target.value)}} className='w-[300px]'></Input>
+        </div>
+
+        <div className='mt-[10px]'>
+          <span> {uploadServerUrl.name}：</span>
+          <Input key={uploadServerUrl.value} defaultValue={uploadServerUrl.value} onBlur={(e)=>{onUploadServerUrlChange(e.target.value)}} className='w-[300px]'></Input>
+        </div>
      </section>
      <h1 className='text-[20px]'>设备配置</h1>
      {connectionStatus()}
--- a/src/store/system/systemSlice.ts
+++ b/src/store/system/systemSlice.ts
@ -13,6 +13,12 @@ const initialState = {
    name:'',
    value:'',
    code:''
+  },
+    uploadServerUrl: {
+        id:'',
+        name:'',
+        value:'',
+        code:''
    }
 };
 // 创建一个 Slice
@ -29,8 +35,11 @@ export const systemStateSlice = createSlice({
        updateSystemAccountState: (state, { payload }) => {
 			state.accountInfo = payload
 		},
+        updateUploadServerUrlState: (state, { payload }) => {
+            state.uploadServerUrl = payload
+        }
 	},
 });
-export const {updateSystemAllState, updateSystemOrgState, updateSystemAccountState } = systemStateSlice.actions;
+export const {updateSystemAllState, updateSystemOrgState, updateSystemAccountState, updateUploadServerUrlState } = systemStateSlice.actions;
 // 默认导出
 export default systemStateSlice.reducer;