{v}
)}
+ {stepList.map((item, index) => {
+ return (
+
+ {/* 第一步 */}
+
+
+ )
+ })}
+
+ 
+
+
+
+
+
+ {item.title}
+
+
+ {item.text}
+
+
+
+
+ {/* 第二步 */}
+
+ 敲击回车键后，输入内容将成为标签
+
+
+
-
-
-
-
+
+
+
+ 11111111
} itemKey="1">
+
-
-
- 是否确认创建推送？
+
+ {/* 第三步 */}
+
+ {showstrategyListList.current.map((item, index) => (
+
+
+ {
+ noticeNum==index?(
+ 
+ ):''
+ }
+
+ ))}
+
+ ):''
+ }
+
+
-
+
+
+
+ 策略：
+ {policyList[noticeNum].strategy}
+
+
+ 实例：
+ {policyList[noticeNum].example}
+
+ CameraChooseList(id, items)}
+ />
+
+
+ {/* 第四步 */}
+
+ 
+
);
}
-
function mapStateToProps (state) {
- const { auth, global, members, vender } = state;
+ const { auth, global, members, CameraKind, CameraAbility } = state;
return {
loading: members.isRequesting,
user: auth.user,
actions: global.actions,
- members: members.data,
- vender: vender.data || [], //设备厂家
+ CameraKind: CameraKind.data || [],
+ CameraAbility: CameraAbility.data || [],
};
}
-export default connect(mapStateToProps)(pushModal);
+export default connect(mapStateToProps)(pushModal);
\ No newline at end of file
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.less b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.less
new file mode 100644
index 0000000..b1f80b2
--- /dev/null
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.less
@@ -0,0 +1,44 @@
+.myChoose{
+ background: #F9FBFF;
+ .myChooseButton{
+ height: 4px;
+ background: #0058C8;
+ }
+}
+.components-transfer-demo-selected-item {
+ .semi-icon-close {
+ visibility: hidden;
+ color: var(--semi-color-tertiary);
+ }
+ &:hover {
+ .semi-icon-close {
+ visibility: visible;
+ }
+ }
+}
+
+.components-transfer-demo-selected-item,
+.components-transfer-demo-source-item {
+ height: 52px;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 10px 12px;
+ &:hover {
+ background-color: var(--semi-color-fill-0);
+ }
+ .info {
+ margin-left: 8px;
+ flex-grow: 1;
+ }
+ .name {
+ font-size: 14px;
+ line-height: 20px;
+ }
+ .email {
+ font-size: 12px;
+ line-height: 16px;
+ color: var(--semi-color-text-2);
+ }
+}
\ No newline at end of file
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
new file mode 100644
index 0000000..033ef44
--- /dev/null
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
@@ -0,0 +1,77 @@
+import React, { useState, useRef, useEffect } from "react";
+import { connect } from "react-redux";
+import { Modal, Spin,Input,Collapse ,SideSheet,Tabs, TabPane} from "@douyinfe/semi-ui";
+import moment from "moment";
+import './pushSideSheet.less'
+function pushSideSheet (props) {
+ const {
+ close,
+ actions,
+ pushData,//表格信息
+ journal//日志信息
+ } = props;
+ const { offline } = actions;
+ const [notesValue, setNotesValue] = useState('');//释义
+
+ //初始化
+ useEffect(() => {
+ let timeList = []
+ for (let index = 0; index < journal.length; index++) {
+ timeList.push(
+ {
+ title:getTimeTitle(journal[index].time),
+ time:getTimeData(journal[index].time)
+ }
+ )
+ }
+ console.log('timeList',timeList);
+ }, []);
+ function getTimeTitle(date){
+ let year = moment(date).year()+'年'
+ let month = (moment(date).month()+1)>10?(moment(date).month()+1)+'月':'0'+(moment(date).month()+1)+'月'
+ return year+month
+ }
+ function getTimeData(date){
+ let day=moment(date).date()>10?moment(date).date()+'日':'0'+moment(date).date()+'日';
+ let hour=moment(date).hour()>10?moment(date).hour():'0'+moment(date).hour();
+ let minute=moment(date).minute()>10?moment(date).minute():'0'+moment(date).minute();
+ let second=moment(date).second()>10?moment(date).second():'0'+moment(date).second();
+ return day+' '+hour+':'+minute+':'+second
+ }
+ function sideSheetChange(){
+ close()
+ }
+ return (
+ <>
+
+ 创建完成
+
+ Hi, bytedance dance dance. This is the docsite of Semi UI.
+ + + +
-
+ {row.forbidden ? (
+
+ ) : (
+ {
+ dispatch(
+ offline.putPushBanned(
+ {
+ configId: row.id,
+ forbidden: !row.forbidden,
+ },
+ row.forbidden
+ )
+ ).then(() => {
+ equipmentGetStatusPush();
+ });
+ }}
+ >
+
+
+ )}
{
- dispatch(equipmentWarehouse.delNvr(row.id)).then(() => {
+ dispatch(offline.delPush(row.id)).then(() => {
if (page.current > 0 && limits.current < 2) {
setQuery({ limit: 10, page: page.current - 1 })
} else {
@@ -147,10 +189,21 @@ const Carrierpigeon = (props) => {
>
-
@@ -160,7 +213,7 @@ const Carrierpigeon = (props) => {
];
//获取表格属性设置
- function attribute (data) {
+ function attribute () {
const arr = localStorage.getItem(PIGEON)
? JSON.parse(localStorage.getItem(PIGEON))
: [];
@@ -168,51 +221,41 @@ const Carrierpigeon = (props) => {
const column = [
{
title: "推送机制",
- dataIndex: "venderId",
- key: "PushMechanism",
+ dataIndex: "noticeWay",
+ key: "noticeWay",
render: (_, r, index) => {
- let manufactorName = data.find((item) => item.id == r.venderId);
- return manufactorName ? manufactorName.name : "";
+ let noticeWayValue=[]
+ for (let index = 0; index < r.noticeWay.length; index++) {
+ let val = r.noticeWay[index]
+ noticeWayValue.push(noticeWayObj[val])
+ }
+ let noticeWayString=noticeWayValue.join(';')
+ return noticeWayString;
},
},
{
title: "监听设备数量",
- dataIndex: "DevicesNum",
- key: "DevicesNumber",
+ dataIndex: "logCount",
+ key: "logCount",
render: (_, r, index) => {
- return r.name
+ return r.logCount
},
},
{
title: "累计推送次数",
- dataIndex: "PushNum",
- key: "PushNumber",
+ dataIndex: "monitorCount",
+ key: "monitorCount",
render: (_, r, index) => {
- return (r.name + '次')
+ return (r.monitorCount + '次')
},
},
{
title: "策略类型",
- dataIndex: "size",
- key: "PolicyType",
+ dataIndex: "pushWay",
+ key: "pushWay",
render: (_, r, index) => {
- let status = r.gbNvr;
- return (
-
-
- {status ? "邮件通知" : equipmentStatus(status.email)}
-
- );
+ return r.pushWay=='email' ? '邮件通知' : '短信通知';
},
},
];
@@ -224,32 +267,6 @@ const Carrierpigeon = (props) => {
}
setSetupp(columns);
}
-
- //表格请求数据中station属性数据的展示
- // function station (r, name, projects) {
- // let data = []
- // if (projects == "projects") {
- // r.station.map((v) => {
- // if (v.structure.projects.length > 0) {
- // v.structure.projects.map((item) => data.push(item[name]))
- // }
- // })
- // } else {
- // r.station.map((v, index) => data.push(v.structure[name]))
- // }
- // let dataSet = [...(new Set(data))]
- // return dataSet.length > 0 ? {