diff --git a/src/pages/OrgChart.tsx b/src/pages/OrgChart.tsx
index 5225078..69cd1f8 100644
--- a/src/pages/OrgChart.tsx
+++ b/src/pages/OrgChart.tsx
@@ -8,10 +8,7 @@ const OrgChartSelf = (props: Store) => {
const { depStore } = props;
const [detail, setDetail] = useState(false);
useEffect(() => {
- depStore.getOrg().then((res) => {
- // setOrgData(res.data.record)
- // setOrgData(orgData);
- });
+ depStore.getOrg();
}, [depStore]);
const getArrayDepth = (arr) => {
@@ -113,7 +110,7 @@ const OrgChartSelf = (props: Store) => {
backgroundColor: "#fff",
}}
width={50}
- src="https://pic.aigexing.net/uploads/5/1253/3721116011/92968290915/8785297.jpg"
+ src={v.head_img}
alt=""
/>
{v1.user_name}
diff --git a/src/pages/home/homeLeft/orgin.tsx b/src/pages/home/homeLeft/orgin.tsx
index 29ad941..87f9b4d 100644
--- a/src/pages/home/homeLeft/orgin.tsx
+++ b/src/pages/home/homeLeft/orgin.tsx
@@ -31,7 +31,7 @@ const Orgin = (props: Store) => {
}}>
{homeStore.ogMap?.count ?? 0}
-
党组织数量
+ 武装力量
{
setIsSelf(false)
@@ -39,7 +39,7 @@ const Orgin = (props: Store) => {
}}>
{homeStore.ogMap?.member_count ?? 0}

-
党员数量
+
党组织结构
{
-
+
{
// 获取视频推流连接
async getVideoUrlList() {
try {
- let data = await baseHttp.gets(Config.videoApi+HomeConfig.deviceList, {
+ let data = await baseHttp.gets(HomeConfig.deviceList, {
start: 0,
limit: 30
})
return data
} catch (error) {
- console.log(error)
return false
}
}
// 通道列表
async getChannerUrlList(deviceId) {
try {
- let data = await baseHttp.gets(Config.videoApi+HomeConfig.channerList, {
+ let data = await baseHttp.gets(HomeConfig.channerList, {
start: 0,
limit: 30,
device: deviceId
@@ -94,7 +93,7 @@ class HomeStore extends BaseStore {
// 获取通道流
async getChannerStrem(deviceId, channel) {
try {
- let data = await baseHttp.gets(Config.videoApi+HomeConfig.channelstream, {
+ let data = await baseHttp.gets(HomeConfig.channelstream, {
device: deviceId,
channel: channel,
protocol: "fmp4"
@@ -138,7 +137,6 @@ class HomeStore extends BaseStore {
}
showVideoHandler(status) {
this.showVideo = status
- console.log("homeStore.showVideo",this.showVideo,status)
}
ogMap!: Object;
showVideo!: boolean;
diff --git a/src/store/user.ts b/src/store/user.ts
index a8894cf..0d0271c 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -4,7 +4,6 @@ import baseHttp from "@/service/base";
import BaseStore from "./baseStore";
import { UserDataType, UserInfos } from "@/model/userModel";
import { message } from "antd";
-import Config from "@/util/config";
class UserConfig {
static LOGINURI: string = "/v1/anth/login/pc"
static LIST: string = "/v1/user/list"
@@ -19,10 +18,6 @@ class UserConfig {
static videoLogin: string = "/api/v1/login"
static siteList: string = "/v1/user/site"
static reSetPwd: string = "/v1/user/reSetPwd"
-
-
-
-
}
class UserStore extends BaseStore {
_userinfo: UserInfos = {}; // 用户信息
@@ -114,7 +109,7 @@ class UserStore extends BaseStore {
async loginVideo() {
try {
- let data = await baseHttp.get(Config.videoApi + UserConfig.videoLogin, {
+ let data = await baseHttp.get(UserConfig.videoLogin, {
username: "easycvr",
password: "4092c09db0af030641a977d76044de4f",
})
diff --git a/src/util/config.ts b/src/util/config.ts
index bee7cf8..e7e2fe5 100644
--- a/src/util/config.ts
+++ b/src/util/config.ts
@@ -1,6 +1,8 @@
class Config {
static baseUrl = "https://www.hswzct.cn:12016/";
+ // static baseUrl = "http://47.108.78.174:12214/";
static ws = "wss://www.hswzct.cn:12016/wsadmin?id=admin";
+ // static ws = "wss://rw.quwanya.cn/wsadmin?id=admin";
static userStatic = "https://www.hswzct.cn:12016/api/uploads/user/";
static videoApi = "https://sprh.hswzct.cn:4443"; //
static videoApis = "https://sprh.hswzct.cn:4443"; //