Browse Source

z

kitchenmanage
zhaoy 8 months ago
parent
commit
e63471bcfd
8 changed files with 13 additions and 13 deletions
  1. +2
    -2
      config/proxy.js
  2. +2
    -2
      src/pages/device/deviceInfo/services.js
  3. +1
    -1
      src/pages/push/batchingpush/index.jsx
  4. +2
    -2
      src/pages/push/batchingpush/services.js
  5. +1
    -1
      src/pages/push/goodspush/index.jsx
  6. +2
    -2
      src/pages/push/goodspush/services.js
  7. +1
    -1
      src/pages/push/technologypush/index.jsx
  8. +2
    -2
      src/pages/push/technologypush/services.js

+ 2
- 2
config/proxy.js View File

@@ -9,7 +9,7 @@
export default {
dev: {
'/saasbase/': {
target: 'http://localhost:5006/',
target: 'http://192.168.1.19:5006/',
changeOrigin: true,
secure: false, //关闭证书验证
pathRewrite: {
@@ -17,7 +17,7 @@
},
},
'/kitchbase/': {
target: 'http://localhost:5008/',
target: 'http://192.168.1.19:5007/',
changeOrigin: true,
secure: false, //关闭证书验证
pathRewrite: {


+ 2
- 2
src/pages/device/deviceInfo/services.js View File

@@ -1,5 +1,5 @@
import { request } from 'umi';
import { getDataBaseUrl } from '@/global_data';
import { getDataBaseUrl,GetkitchbaseUrl } from '@/global_data';
/** 获取设备列表 */
export async function GetDeviceInfoPage(data) {
return request(getDataBaseUrl()+`/api/device/page`, {
@@ -214,7 +214,7 @@ export async function TechnologyTemplateExport(data) {
});
}
export async function GetStop() {
return request(getDataBaseUrl()+`/api/stop/getstop`, {
return request(GetkitchbaseUrl()+`/api/store/getstorelist`, {
method: 'Get',
});
}


+ 1
- 1
src/pages/push/batchingpush/index.jsx View File

@@ -268,7 +268,7 @@ const HandleOk= async(values)=>{
<ProDescriptions.Item label="下发设备" valueType="text">
{currentRow?.deviceName}
</ProDescriptions.Item>
<ProDescriptions.Item label="消息id" valueType="text">
<ProDescriptions.Item label="消息id" copyable valueType="text">
{currentRow?.messageId}
</ProDescriptions.Item>
<ProDescriptions.Item>


+ 2
- 2
src/pages/push/batchingpush/services.js View File

@@ -1,5 +1,5 @@
import { request } from 'umi';
import { getDataBaseUrl } from '@/global_data';
import { getDataBaseUrl,GetkitchbaseUrl } from '@/global_data';
export async function GetDevicePushRecodePage(data) {
return request(`/kitchbase/api/devicepushrecode/page`, {
method: 'POST',
@@ -46,7 +46,7 @@ export async function GetDevicePushRecodePage(data) {
});
}
export async function GetStop() {
return request(getDataBaseUrl()+`/api/stop/getstop`, {
return request(GetkitchbaseUrl()+`/api/store/getstorelist`, {
method: 'Get',
});
}


+ 1
- 1
src/pages/push/goodspush/index.jsx View File

@@ -266,7 +266,7 @@ const HandleOk= async(data)=>{
<ProDescriptions.Item label="下发设备" valueType="text">
{currentRow?.deviceName}
</ProDescriptions.Item>
<ProDescriptions.Item label="消息id" valueType="text">
<ProDescriptions.Item label="消息id" copyable valueType="text">
{currentRow?.messageId}
</ProDescriptions.Item>
<ProDescriptions.Item>


+ 2
- 2
src/pages/push/goodspush/services.js View File

@@ -1,5 +1,5 @@
import { request } from 'umi';
import { getDataBaseUrl } from '@/global_data';
import { getDataBaseUrl,GetkitchbaseUrl } from '@/global_data';
export async function GetDevicePushRecodePage(data) {
return request(`/kitchbase/api/devicepushrecode/page`, {
method: 'POST',
@@ -53,7 +53,7 @@ export async function GetDevicePushRecodePage(data) {
});
}
export async function GetStop() {
return request(getDataBaseUrl()+`/api/stop/getstop`, {
return request(GetkitchbaseUrl()+`/api/store/getstorelist`, {
method: 'Get',
});
}


+ 1
- 1
src/pages/push/technologypush/index.jsx View File

@@ -266,7 +266,7 @@ const HandleOk= async(data)=>{
<ProDescriptions.Item label="下发设备" valueType="text">
{currentRow?.deviceName}
</ProDescriptions.Item>
<ProDescriptions.Item label="消息id" valueType="text">
<ProDescriptions.Item label="消息id" copyable valueType="text">
{currentRow?.messageId}
</ProDescriptions.Item>
<ProDescriptions.Item>


+ 2
- 2
src/pages/push/technologypush/services.js View File

@@ -1,5 +1,5 @@
import { request } from 'umi';
import { getDataBaseUrl } from '@/global_data';
import { getDataBaseUrl,GetkitchbaseUrl } from '@/global_data';
export async function GetDevicePushRecodePage(data) {
return request(`/kitchbase/api/devicepushrecode/page`, {
method: 'POST',
@@ -53,7 +53,7 @@ export async function GetDevicePushRecodePage(data) {
});
}
export async function GetStop() {
return request(getDataBaseUrl()+`/api/stop/getstop`, {
return request(GetkitchbaseUrl()+`/api/store/getstorelist`, {
method: 'Get',
});
}


Loading…
Cancel
Save