From 4adb8b8868aeed1f5f3b89ae269a7724c6b451ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 八月 2023 16:58:31 +0800
Subject: [PATCH] 2023-08-11
---
src/views/design/header/versions/index.jsx | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/views/design/header/versions/index.jsx b/src/views/design/header/versions/index.jsx
index 5290e82..100b669 100644
--- a/src/views/design/header/versions/index.jsx
+++ b/src/views/design/header/versions/index.jsx
@@ -1,10 +1,10 @@
import React, {Component} from 'react'
import { is, fromJS } from 'immutable'
-import { Modal, notification, Timeline, Icon, Button, Typography } from 'antd'
+import { Modal, notification, Timeline, Button, Typography } from 'antd'
+import { ClockCircleOutlined, SyncOutlined, WarningOutlined, CheckCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
-import options from '@/store/options.js'
import Utils from '@/utils/utils.js'
import './index.scss'
@@ -27,7 +27,7 @@
func: 's_get_sversions_sys',
}
- Api.getSystemConfig(_param).then(result => {
+ Api.getCloudConfig(_param).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -38,9 +38,9 @@
}
let edition_int = ''
- if (options.sysType === 'SSO') {
+ if (window.GLOB.sysType === 'SSO') {
edition_int = result.edition_int_sso
- } else if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ } else if (window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
edition_int = result.edition_int_local
} else {
if (result.edition_int_sso < result.edition_int_local) {
@@ -58,12 +58,12 @@
return
}
- let sysType = options.sysType.toLowerCase()
+ let sysType = window.GLOB.sysType.toLowerCase()
if (window.GLOB.systemType === 'production' || sysType !== 'local') {
sysType = ''
}
-
+
let param = {
func: 's_get_sversions_sys_epc',
edition_int: edition_int,
@@ -115,7 +115,7 @@
res.func = 's_sVersion_Local_add'
res.VersionName = version.id
- Api.getLocalConfig(res).then(result => {
+ Api.genericInterface(res).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -127,7 +127,7 @@
} else if (!result.vid) {
notification.warning({
top: 92,
- message: '褰撳墠搴旂敤闇�瑕佸崌绾х郴缁熸帴鍙ｏ紝璇疯仈绯荤鐞嗗憳锛�',
+ message: '褰撳墠搴旂敤鏃犳硶鑷姩鍗囩骇锛岃澶嶅埗浼犺緭鍙凤紝鎵嬪姩瀹屾垚鍗囩骇锛�',
duration: 5
})
this.execError()
@@ -150,7 +150,7 @@
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
param.DateCount = ''
- Api.getLocalConfig(param).then(response => {
+ Api.genericInterface(param).then(response => {
if (!response.status) {
notification.warning({
top: 92,
@@ -231,7 +231,7 @@
}
execSso = (ssoParam, scripts) => {
- Api.getLocalConfig(ssoParam).then(res => {
+ Api.genericInterface(ssoParam).then(res => {
if (!res.status) {
notification.warning({
top: 92,
@@ -259,7 +259,7 @@
}
execLocal = (localParam, ssoParam, scripts) => {
- Api.getLocalConfig(localParam).then(res => {
+ Api.genericInterface(localParam).then(res => {
if (!res.status) {
notification.warning({
top: 92,
@@ -326,7 +326,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- Api.getLocalConfig(param).then(response => {
+ Api.genericInterface(param).then(response => {
if (!response.status) {
notification.warning({
top: 92,
@@ -406,7 +406,7 @@
return (
<>
- <div style={{padding: '5px 25px'}} onClick={this.verup}>鐗堟湰鍗囩骇</div>
+ <div style={{padding: '5px 25px'}} onClick={this.verup}>搴旂敤鍗囩骇</div>
<Modal
wrapClassName="version-up-modal"
title="搴旂敤鍗囩骇"
@@ -415,22 +415,22 @@
closable={false}
maskClosable={false}
footer={[
- error && version && versions && versions.length > (version.index + 1) ? <Button key="close" onClick={this.skip}>璺宠繃</Button> : null,
- error && version ? <Button key="close" onClick={this.reset}>閲嶆柊鎵ц</Button> : null,
+ error && version && versions && versions.length > (version.index + 1) ? <Button key="skip" className="mk-orange" onClick={this.skip}>璺宠繃</Button> : null,
+ error && version ? <Button key="reset" type="primary" onClick={this.reset}>閲嶆柊鎵ц</Button> : null,
<Button key="close" onClick={this.stop}>鍏抽棴</Button>,
]}
destroyOnClose
>
<Timeline>
{versions && versions.map(item => {
- let icon = <Icon type="clock-circle-o" style={{ fontSize: '16px' }} />
+ let icon = <ClockCircleOutlined style={{ fontSize: '16px' }} />
if (item.status === 'loading') {
- icon = <Icon type="sync" spin style={{ fontSize: '16px' }} />
+ icon = <SyncOutlined spin style={{ fontSize: '16px' }} />
} else if (item.status === 'done') {
if (item.warning) {
- icon = <Icon type="warning" style={{ fontSize: '16px', color: 'orange' }}/>
+ icon = <WarningOutlined style={{ fontSize: '16px', color: 'orange' }}/>
} else {
- icon = <Icon type="check-circle" style={{ fontSize: '16px', color: '#52c41a' }} />
+ icon = <CheckCircleOutlined style={{ fontSize: '16px', color: '#52c41a' }} />
}
}
return (
--
Gitblit v1.8.0