From ee635de6fc758c044db0761faa003d0db1e82563 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 八月 2023 20:32:35 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/pcdesign/index.jsx |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index a8dcca3..3e034d3 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -48,8 +48,6 @@
 const StyleCombControlButton = asyncComponent(() => import('@/menu/stylecombcontrolbutton'))
 const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
 
-sessionStorage.setItem('isEditState', 'true')
-
 sessionStorage.setItem('appType', 'pc')        // 搴旂敤绫诲瀷
 sessionStorage.setItem('typename', 'pc')
 document.body.className = ''
@@ -84,7 +82,6 @@
     }
     
     if (!sessionStorage.getItem('UserID')) {
-      sessionStorage.removeItem('isEditState')
       sessionStorage.removeItem('appType')
       this.props.history.replace('/login')
       return
@@ -262,7 +259,7 @@
   }
 
   getAppMessage = (MenuID) => {
-    Api.getSystemConfig({
+    Api.getCloudConfig({
       func: 's_get_keyids',
       bid: sessionStorage.getItem('appId')
     }).then(res => {
@@ -312,7 +309,7 @@
         param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
         param.secretkey = Utils.encrypt('', param.timestamp)
 
-        Api.getSystemConfig(param).then(result => {
+        Api.getCloudConfig(param).then(result => {
           if (!result.status) {
             notification.warning({
               top: 92,
@@ -343,19 +340,19 @@
     }
     deffers = [new Promise(resolve => {
       setTimeout(() => {
-        Api.getSystemConfig({...param, typecharone: 'image'}).then(res => {
+        Api.getCloudConfig({...param, typecharone: 'image'}).then(res => {
           resolve(res.data)
         })
       }, 500)
     }), new Promise(resolve => {
       setTimeout(() => {
-        Api.getSystemConfig({...param, typecharone: 'video'}).then(res => {
+        Api.getCloudConfig({...param, typecharone: 'video'}).then(res => {
           resolve(res.data)
         })
       }, 1000)
     }), new Promise(resolve => {
       setTimeout(() => {
-        Api.getSystemConfig({...param, typecharone: 'color'}).then(res => {
+        Api.getCloudConfig({...param, typecharone: 'color'}).then(res => {
           resolve(res.data)
         })
       }, 1500)
@@ -532,7 +529,7 @@
       MenuID: MenuId
     }
 
-    Api.getSystemConfig(param).then(result => {
+    Api.getCloudConfig(param).then(result => {
       if (!result.status) {
         notification.warning({
           top: 92,
@@ -679,7 +676,7 @@
 
     _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
 
-    Api.getSystemConfig(_param).then(res => {
+    Api.getCloudConfig(_param).then(res => {
       if (!res.status) {
         notification.warning({
           top: 92,
@@ -718,7 +715,7 @@
       MenuID: urlParam.copyMenuId
     }
 
-    Api.getSystemConfig(param).then(result => {
+    Api.getCloudConfig(param).then(result => {
       if (!result.status) {
         notification.warning({
           top: 92,
@@ -804,7 +801,7 @@
   }
 
   jointComponents = (config, navItem) => {
-    Api.getSystemConfig({
+    Api.getCloudConfig({
       func: 'sPC_Get_LongParam',
       TypeCharOne: sessionStorage.getItem('kei_no'),
       typename: 'pc',
@@ -1355,7 +1352,7 @@
             _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
             _param.secretkey = Utils.encrypt('', _param.timestamp)
 
-            Api.getSystemConfig(_param).then(res => {
+            Api.getCloudConfig(_param).then(res => {
               if (res.status) {
                 NavBar.open_edition = res.open_edition || ''
                 window.GLOB.CacheIndependent.set(NavBar.uuid, fromJS(NavBar).toJS())
@@ -1400,7 +1397,7 @@
                   kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
                   kparam.secretkey = Utils.encrypt('', kparam.timestamp)
         
-                  Api.getSystemConfig(kparam).then(result => {
+                  Api.getCloudConfig(kparam).then(result => {
                     if (result.status) {
                       sessionStorage.setItem('appViewList', viewList)
                     }
@@ -1419,7 +1416,7 @@
       }).then(res => { // 椤甸潰淇濆瓨
         if (!res || !res.status) return res
 
-        return Api.getSystemConfig(param)
+        return Api.getCloudConfig(param)
       }).then(res => {
         this.setState({
           menuloading: false
@@ -1471,7 +1468,7 @@
 
   getRoleFields = () => {
     if (sessionStorage.getItem('sysRoles') || sessionStorage.getItem('permFuncField')) return
-    Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
+    Api.getCloudConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
       if (res.status) {
         let _permFuncField = []
         let _sysRoles = []
@@ -1655,7 +1652,7 @@
       title: '纭畾璁剧疆鏈〉闈负棣栭〉鍚楋紵',
       content: '',
       onOk() {
-        Api.getSystemConfig(param).then(result => {
+        Api.getCloudConfig(param).then(result => {
           if (!result.status) {
             notification.warning({
               top: 92,
@@ -1716,7 +1713,7 @@
       title: '纭畾璁剧疆鏈〉闈负鐧诲綍椤靛悧锛�',
       content: hasLogin ? '' : '褰撳墠椤甸潰灏氭湭娣诲姞鐧诲綍缁勪欢銆�',
       onOk() {
-        Api.getSystemConfig(param).then(result => {
+        Api.getCloudConfig(param).then(result => {
           if (!result.status) {
             notification.warning({
               top: 92,

--
Gitblit v1.8.0