Skip to content

Commit 87fd273

Browse files
Lind-proLind-pro
committed
2 parents 42e48df + d0d7843 commit 87fd273

25 files changed

Lines changed: 1429 additions & 203 deletions

File tree

‎config/proxy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ export default {
2323
test: {
2424
'/jetlinks': {
2525
// target: 'http://192.168.3.89:8848/',
26-
target: 'http://2.jetlinks.org:9010/',
26+
target: 'http://192.168.3.89:9010/',
2727
changeOrigin: true,
2828
pathRewrite: { '^/jetlinks': '' },
2929
},
3030
},
3131
pre: {
3232
'/jetlinks': {
3333
// target: 'http://192.168.3.89:8848/',
34-
target: 'http://2.jetlinks.org:9010/',
34+
target: 'http://192.168.3.89:9010/',
3535
changeOrigin: true,
3636
pathRewrite: { '^/jetlinks': '' },
3737
},

‎config/routes.ts‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -479,37 +479,37 @@ export const routes = [
479479
name: '云云对接',
480480
icon: 'cloud',
481481
version: 'pro',
482-
authority: ['dueros-product', 'aliyun-bridge', 'onenet-product', 'ctwing-product', 'admin'],
482+
authority: ['dueros-product', 'aliyun-bridge', 'onenet-product', 'ctwing-product'],
483483
routes: [
484484
{
485485
path: '/cloud/duer',
486486
name: 'DuerOS',
487487
version: 'pro',
488-
authority: ['dueros-product', 'admin'],
488+
authority: ['dueros-product'],
489489
icon: 'cloud',
490490
component: './cloud/dueros',
491491
},
492492
{
493493
path: '/cloud/aliyun',
494494
name: '阿里云',
495495
version: 'pro',
496-
authority: ['aliyun-bridge', 'admin'],
496+
authority: ['aliyun-bridge'],
497497
icon: 'aliyun',
498498
component: './cloud/aliyun',
499499
},
500500
{
501501
path: '/cloud/onenet',
502502
name: '移动OneNet',
503503
version: 'pro',
504-
authority: ['onenet-product', 'admin'],
504+
authority: ['onenet-product'],
505505
icon: 'mobile',
506506
component: './cloud/onenet',
507507
},
508508
{
509509
path: '/cloud/ctwing',
510510
name: '电信CTWing',
511511
version: 'pro',
512-
authority: ['ctwing-product', 'admin'],
512+
authority: ['ctwing-product'],
513513
icon: 'phone',
514514
component: './cloud/ctwing',
515515
}
@@ -520,13 +520,13 @@ export const routes = [
520520
name: '国标网关',
521521
icon: 'youtube',
522522
version: 'pro',
523-
authority: ['gb28181-gateway','media-channel','media-server','media-stream','admin'],
523+
authority: ['gb28181-gateway','media-channel','media-server','media-stream','gb28181-cascade'],
524524
routes: [
525525
{
526526
path: '/media/basic',
527527
name: '基本配置',
528528
version: 'pro',
529-
authority: ['gb28181-gateway','media-server','admin'],
529+
authority: ['gb28181-gateway','media-server'],
530530
icon: 'video-camera',
531531
component: './media/basic',
532532
},
@@ -550,7 +550,7 @@ export const routes = [
550550
path: '/media/device',
551551
name: '国标设备',
552552
version: 'pro',
553-
authority: ['media-device','media-stream','admin'],
553+
authority: ['media-device'],
554554
icon: 'gateway',
555555
component: './media/device',
556556
},
@@ -567,10 +567,18 @@ export const routes = [
567567
path: '/media/reveal',
568568
name: '分屏展示',
569569
version: 'pro',
570-
authority: ['media-stream','admin'],
570+
authority: ['media-stream'],
571571
icon: 'appstore',
572572
component: './media/reveal',
573573
},
574+
{
575+
path: '/media/cascade',
576+
name: '国标级联',
577+
version: 'pro',
578+
authority: ['gb28181-cascade'],
579+
icon: 'cloud-upload',
580+
component: './media/cascade',
581+
},
574582
]
575583
},
576584
{

‎src/pages/device/instance/Search/index.tsx‎

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import React, { useEffect, useState } from 'react';
22
import Form, { FormComponentProps } from 'antd/lib/form';
33
import { Button, Col, Input, Row, Select, TreeSelect } from 'antd';
44
import apis from '@/services';
5+
import { router } from 'umi';
56
import SearchTags from "@/pages/device/instance/Search/tags/tags";
7+
import { getPageQuery } from '@/utils/utils';
68

79
interface Props extends FormComponentProps {
810
search: Function;
11+
location: Location
912
}
1013

1114
interface State {
@@ -34,9 +37,41 @@ const Search: React.FC<Props> = props => {
3437
const [categoryList, setCategoryList] = useState([]);
3538
const [bindList, setBindList] = useState([]);
3639

40+
const mapType = new Map();
41+
mapType.set('id$like', 'id');
42+
mapType.set('name$like', 'name');
43+
mapType.set('orgId$in', 'orgId');
44+
mapType.set('id$dev-tag', 'devTag');
45+
mapType.set('id$dev-bind$any', 'devBind');
46+
mapType.set('productId$dev-prod-cat', 'devProd');
47+
3748
useEffect(() => {
3849
setParameterType('id$like');
39-
form.setFieldsValue({ parameter: 'id$like' });
50+
const query: any = getPageQuery();
51+
if (query && query !== {}) {
52+
mapType.forEach((value, key) => {
53+
let k = Object.keys(query)[0]
54+
if(value === k){
55+
form.setFieldsValue({ parameter: key });
56+
if (key === 'orgId$in') {
57+
form.setFieldsValue({value: query[k].split(",")})
58+
} else if (key === 'id$dev-tag') {
59+
let v = JSON.parse(query[k])
60+
let displayData: any[] = [];
61+
v.map((item: any) => {
62+
displayData.push(`${item.key}=${item.value}`);
63+
});
64+
setFieldsValue({ 'value': displayData.join('；') });
65+
}else if (key === 'id$dev-bind$any') {
66+
form.setFieldsValue({value: query[k].split(",")})
67+
}else{
68+
form.setFieldsValue({ value: query[k] });
69+
}
70+
}
71+
});
72+
}else{
73+
form.setFieldsValue({ parameter: 'id$like' });
74+
}
4075

4176
apis.deviceProdcut.queryOrganization()
4277
.then(res => {
@@ -82,8 +117,16 @@ const Search: React.FC<Props> = props => {
82117
} else if (data.parameter === 'id$dev-tag') {
83118
data.value = tagsData.length > 0 ? JSON.stringify(tagsData) : undefined;
84119
} else if (data.parameter === 'id$dev-bind$any') {
85-
data.value = JSON.stringify(data.value).replace(/[\[\]"]/g, '')
120+
data.value = JSON.stringify(data.value).replace(/[\[\]"]/g, '')
121+
}
122+
let params = {}
123+
params[mapType.get(data.parameter)] = data.value
124+
params['productId'] = getPageQuery().productId
125+
if(getPageQuery().productId){
126+
params['productId'] = getPageQuery().productId
127+
map['productId'] = getPageQuery().productId
86128
}
129+
router.push({ pathname: `/device/instance`, query: params })
87130
map[data.parameter] = data.value;
88131
props.search(map);
89132
};

0 commit comments

Comments
 (0)