数据下发

src/pages/push/batchingpush/index.jsx

@@ -76,14 +76,18 @@ const goodspush = () => {
     },
 
     {
-      title: '下发数据',
-      dataIndex: 'type',
+      title: '下发状态',
+      dataIndex: 'status',
       ellipsis: true,
       valueEnum: {
-        2: {
-          text: '物料',
+        0: {
+            text: '成功',
+            status: 'Success',
         },
-       
+        1: {
+          text: '失败',
+          status: 'Processing',
+      },
       },
     },
     {

src/pages/push/batchingpush/services.js

@@ -1,4 +1,5 @@
 import { request } from 'umi';
+import { getDataBaseUrl } from '@/global_data';
 export async function GetDevicePushRecodePage(data) {
     return request(`/saasstore/api/devicepushrecode/page`, {
       method: 'POST',
@@ -24,13 +25,13 @@ export async function GetDevicePushRecodePage(data) {
       });
     } 
     export async function GetDeviceList() {
-      return request(`/saasbase/api/device/list`, {
+      return request(getDataBaseUrl()+`/api/device/list`, {
         method: 'GET',
       });
     }
 
     export async function GetBatchingPage(data) {
-        return request(`/saasbase/api/batching/getpage`, {
+        return request(getDataBaseUrl()+`/api/batching/getpage`, {
           method: 'Post',
           data: data,
           // params: { ...params },

src/pages/push/goodspush/index.jsx

@@ -76,14 +76,18 @@ const goodspush = () => {
     },
 
     {
-      title: '下发数据',
-      dataIndex: 'type',
+      title: '下发状态',
+      dataIndex: 'status',
       ellipsis: true,
       valueEnum: {
-        1: {
-          text: '商品',
+        0: {
+            text: '成功',
+            status: 'Success',
         },
-        
+        1: {
+          text: '失败',
+          status: 'Processing',
+      },
       },
     },
     {

src/pages/push/goodspush/services.js

@@ -1,4 +1,5 @@
 import { request } from 'umi';
+import { getDataBaseUrl } from '@/global_data';
 export async function GetDevicePushRecodePage(data) {
     return request(`/saasstore/api/devicepushrecode/page`, {
       method: 'POST',
@@ -24,12 +25,12 @@ export async function GetDevicePushRecodePage(data) {
       });
     } 
     export async function GetDeviceList() {
-      return request(`/saasbase/api/device/list`, {
+      return request(getDataBaseUrl()+`/api/device/list`, {
         method: 'GET',
       });
     }
     export async function GetGoodsTypeTree(params) {
-        return request('​/saasbase/api​/goodstype/tree', {
+        return request(getDataBaseUrl()+'​/api​/goodstype/tree', {
           method: 'GET',
           data: {
             ...params,
@@ -37,7 +38,7 @@ export async function GetDevicePushRecodePage(data) {
         });
       }
     export async function GetGoodsPage(data) {
-        return request(`/saasbase/api/goods/page`, {
+        return request(getDataBaseUrl()+`/api/goods/page`, {
           method: 'Post',
           data: data,
           // params: { ...params },

src/pages/push/technologypush/components/PushFrom.jsx

@@ -19,10 +19,13 @@ const PushFrom = (props) => {
     console.log(props.values)
     GetDeviceList().then((r)=>{
       setDeviceInfo(r.data)
+      if(r.data.length>0){
         var data=r.data.map(x=>{
-            return {value:x.id,label:x.name}
+          return {value:x.id,label:x.name}
         })
         setdeviceData(data)
+      }
+        
     })
     GetGoodsTypeTree().then((r) => {
         setTreeData(r.data);

src/pages/push/technologypush/index.jsx

@@ -76,13 +76,18 @@ const goodspush = () => {
     },
 
     {
-      title: '下发数据',
-      dataIndex: 'type',
+      title: '下发状态',
+      dataIndex: 'status',
       ellipsis: true,
       valueEnum: {
-        4: {
-            text: '工艺',
+        0: {
+            text: '成功',
+            status: 'Success',
         },
+        1: {
+          text: '失败',
+          status: 'Processing',
+      },
       },
     },
     {

src/pages/push/technologypush/services.js

@@ -1,4 +1,5 @@
 import { request } from 'umi';
+import { getDataBaseUrl } from '@/global_data';
 export async function GetDevicePushRecodePage(data) {
     return request(`/saasstore/api/devicepushrecode/page`, {
       method: 'POST',
@@ -24,12 +25,12 @@ export async function GetDevicePushRecodePage(data) {
       });
     } 
     export async function GetDeviceList() {
-      return request(`/saasbase/api/device/list`, {
+      return request(getDataBaseUrl()+`/api/device/list`, {
         method: 'GET',
       });
     }
     export async function GetGoodsTypeTree(params) {
-        return request('​/saasbase/api​/goodstype/tree', {
+        return request(getDataBaseUrl()+'​/api​/goodstype/tree', {
           method: 'GET',
           data: {
             ...params,
@@ -37,7 +38,7 @@ export async function GetDevicePushRecodePage(data) {
         });
       }
     export async function GetGoodsPage(data) {
-        return request(`/saasbase/api/goods/page`, {
+        return request(getDataBaseUrl()+`/api/goods/page`, {
           method: 'Post',
           data: data,
           // params: { ...params },