Skip to content

C
CivManage
Commit a6e70603 authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

fix: '物联网统一接入平台功能优化'

parent 77762b4b
Pipeline #66849 passed with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 52 additions and 59 deletions
          src/pages/platformCenter/hostmanager/IotConfig/IotConfig.jsx
          View file @ a6e70603
          ...@@ -402,7 +402,7 @@ const IotConfig = () => { ...@@ -402,7 +402,7 @@ const IotConfig = () => {
          }} }}
          > >
          <img src={Internet} style={{ height: '16px' }} alt="" /> <img src={Internet} style={{ height: '16px' }} alt="" />
          <span style={{ marginLeft: '10px', fontWeight: 'bold' }}>物联平台</span> <span style={{ marginLeft: '10px', fontWeight: 'bold' }}>物联网统一接入平台</span>
          </div> </div>
          <Divider /> <Divider />
          <Form.Item style={{ marginLeft: '20px', marginBottom: '0px' }}> <Form.Item style={{ marginLeft: '20px', marginBottom: '0px' }}>
          ...@@ -426,12 +426,15 @@ const IotConfig = () => { ...@@ -426,12 +426,15 @@ const IotConfig = () => {
          placeholder="请输入服务地址" placeholder="请输入服务地址"
          /> />
          </Form.Item> </Form.Item>
          <Button type="primary" onClick={() => PingIot1()} style={{ marginLeft: '25px' }}>
          测试连接
          </Button>
          <span style={{ display: show1 }}> <span style={{ display: show1 }}>
          <img <img
          src={Yes} src={Yes}
          style={{ style={{
          height: '24px', height: '24px',
          marginTop: '10px', marginTop: '5px',
          marginLeft: '26px', marginLeft: '26px',
          }} }}
          alt="" alt=""
          ...@@ -441,57 +444,46 @@ const IotConfig = () => { ...@@ -441,57 +444,46 @@ const IotConfig = () => {
          <CloseCircleFilled <CloseCircleFilled
          style={{ style={{
          fontSize: '24px', fontSize: '24px',
          marginTop: '10px', marginTop: '5px',
          marginLeft: '26px', marginLeft: '26px',
          }} }}
          /> />
          </span> </span>
          </div> </div>
          </Form.Item> </Form.Item>
          <Button type="primary" onClick={() => PingIot1()} style={{ marginLeft: '152px' }}>
          连接 <div style={{ marginTop: '20px' }}>
          </Button> {flag === 1 ? (
          {flag === 1 ? ( <>
          <> <Form.Item label="当前数据库" style={{ marginLeft: '50px' }}>
          <div <span style={{ marginLeft: '14px' }}>{`${currentDataBase.ip}/${
          style={{ currentDataBase.dbName
          marginTop: '40px', }`}</span>
          display: 'flex', {show3 === 'none' ? <></> : <span>({dbStatus})</span>}
          alignItems: 'center', </Form.Item>
          }} <Form.Item label="加载进度" style={{ marginLeft: '65px' }}>
          > <div style={{ width: 200, marginBottom: '30px' }}>
          <img src={Things} style={{ height: '20px' }} alt="" /> <Progress
          <span style={{ marginLeft: '10px', fontWeight: 'bold' }}>物联网统一接入平台</span> style={{ marginTop: '4px', marginLeft: '14px' }}
          </div> strokeColor={{
          <Divider /> from: '#108ee9',
          <Form.Item label="当前数据库" style={{ marginLeft: '50px' }}> to: '#87d068',
          <span style={{ marginLeft: '14px' }}>{`${currentDataBase.ip}/${ }}
          currentDataBase.dbName percent={processLength}
          }`}</span> status={processLength == '100' ? 'success' : 'active'}
          {show3 === 'none' ? <></> : <span>({dbStatus})</span>} />
          </Form.Item> </div>
          <Form.Item label="加载进度" style={{ marginLeft: '65px' }}> <div>
          <div style={{ width: 200, marginBottom: '30px' }}> <Button
          <Progress type="primary"
          style={{ marginTop: '4px', marginLeft: '14px' }} onClick={() => PingIot2()}
          strokeColor={{ style={{ marginLeft: '15px' }}
          from: '#108ee9', disabled={buStatus === '启动中'}
          to: '#87d068', >
          }} {buStatus}
          percent={processLength} </Button>
          status={processLength == '100' ? 'success' : 'active'} {/* <Switch
          />
          </div>
          <div>
          <Button
          type="primary"
          onClick={() => PingIot2()}
          style={{ marginLeft: '15px' }}
          disabled={buStatus === '启动中'}
          >
          {buStatus}
          </Button>
          {/* <Switch
          checkedChildren="开启" checkedChildren="开启"
          unCheckedChildren="关闭" unCheckedChildren="关闭"
          checked={currentConfig} checked={currentConfig}
          ...@@ -499,12 +491,13 @@ const IotConfig = () => { ...@@ -499,12 +491,13 @@ const IotConfig = () => {
          style={{ marginLeft: '15px' }} style={{ marginLeft: '15px' }}
          disabled={switchStatus} disabled={switchStatus}
          /> */} /> */}
          </div> </div>
          </Form.Item> </Form.Item>
          </> </>
          ) : ( ) : (
          <></> <></>
          )} )}
          </div>
          <div <div
          style={{ style={{
          ......
          src/services/hostmanager/hostmanager.js
          View file @ a6e70603
          ...@@ -24,17 +24,17 @@ export const PingIOTPlatform = param => ...@@ -24,17 +24,17 @@ export const PingIOTPlatform = param =>
          get(`${PUBLISH_SERVICE}/HostManager/PingIOTPlatform`, param); get(`${PUBLISH_SERVICE}/HostManager/PingIOTPlatform`, param);
          export const SaveTcpAddress = param => get(`${PUBLISH_SERVICE}/HostManager/SaveTcpAddress`, param); export const SaveTcpAddress = param => get(`${PUBLISH_SERVICE}/HostManager/SaveTcpAddress`, param);
          // 健康检查接口 // 健康检查接口
          export const HealthCheck = param => get(`/api/HealthCheck`, param); export const HealthCheck = param => get(`/lot/api/HealthCheck`, param);
          // 判断数据库服务是否已添加 // 判断数据库服务是否已添加
          export const CheckIsServiceAdd = param => post(`/api/DB/CheckIsServiceAdd`, param); export const CheckIsServiceAdd = param => post(`/lot/api/DB/CheckIsServiceAdd`, param);
          // 查询当前数据库服务状态信息 // 查询当前数据库服务状态信息
          export const GetServiceInfo = param => post(`/api/DB/GetServiceInfo`, param); export const GetServiceInfo = param => post(`/lot/api/DB/GetServiceInfo`, param);
          // 添加数据库 // 添加数据库
          export const AddDB = param => post(`/api/DB/AddDBV2`, param); export const AddDB = param => post(`/lot/api/DB/AddDBV2`, param);
          // 停止数据库服务 // 停止数据库服务
          export const DepositServiceDisable = param => post(`/api/DB/DepositServiceDisable`, param); export const DepositServiceDisable = param => post(`/lot/api/DB/DepositServiceDisable`, param);
          // 启用数据库服务 // 启用数据库服务
          export const DepositServiceEnable = param => post(`/api/DB/DepositServiceEnable`, param); export const DepositServiceEnable = param => post(`/lot/api/DB/DepositServiceEnable`, param);
          // 消息平台接口 // 消息平台接口
          export const GetMessageConfigInfo = param => export const GetMessageConfigInfo = param =>
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment