+
+
查询条件
+
+
+
+ setFormData({...formData, keyword: v.target.value})}
+ />
-
-
-
-
*接收人群:
-
item.text}
+
+
+ {
+ if (TimeChange().str == "week") {
+ setFormData({
+ ...formData,
+ start_time: date
+ ? moment(date).day(1).format("YYYY-MM-DD")
+ : null,
+ });
+ } else if (TimeChange().str == "day") {
+ if (date > moment(formData.end_time)) {
+ setFormData({
+ ...formData,
+ end_time: dateString,
+ start_time: formData.end_time,
+ });
+ } else {
+ setFormData({
+ ...formData,
+ start_time: dateString,
+ });
+ }
+ } else {
+ setFormData({ ...formData, start_time: dateString });
+ }
+ }}
+ disabledDate={(current) => current > moment(formData.end_time)}
/>
+
-
-
-
-
*消息内容:
- {/*
{ this.reactQuillRef = el }}
- //defaultValue={postRichText}
- key="1"
- id="textDiv1" theme="snow"
- // modules={textModules}
- /> */}
+
+
+ {
+ if (TimeChange().str == "week") {
+ setFormData({
+ ...formData,
+ end_time: date
+ ? moment(date).day(7).format("YYYY-MM-DD")
+ : null,
+ });
+ } else if (TimeChange().str == "day") {
+ if (date < moment(formData.start_time)) {
+ setFormData({
+ ...formData,
+ start_time: dateString,
+ end_time: formData.start_time,
+ });
+ } else {
+ setFormData({
+ ...formData,
+ end_time: dateString,
+ });
+ }
+ } else {
+ setFormData({ ...formData, end_time: dateString });
+ }
+ }}
+ disabledDate={(current) =>
+ current < moment(formData.start_time)
+ }
+ />
+
+
+ toDeftime(v)} />
+
+
+
+
+
-
- >
- );
+
+
+
+
+ )
}
export default ConfMes;
\ No newline at end of file
diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable2.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable2.jsx
new file mode 100644
index 0000000..feea232
--- /dev/null
+++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable2.jsx
@@ -0,0 +1,284 @@
+import React, { useState, useRef, useEffect } from "react";
+import {
+ message,
+ Pagination,
+ Table,
+ Input,
+ Space,
+ Modal,
+ Button,
+ Select,
+ Tabs,
+ Descriptions,
+ Transfer,
+} from "antd";
+import moment from "moment";
+import ajax from '@/services'
+import { TableModule } from "@/components";
+import { dictionary } from "@/config/common.js";
+import "./index.scss";
+//import ReactQuill, { Quill } from 'react-quill';
+//import "react-quill/dist/quill.snow.css";
+
+function ConfMes() {
+ const [resultData, setResultData] = useState([])
+ const [sendData, setSendData] = useState({})
+ const [total, setTotal] = useState(0);
+ const [detailVisible, setDetailVisible] = useState(true);
+ const [tabKey, setTabKey] = useState("1");
+ // 已选择平台商户
+ const [targetKeys, setTargetKeys] = useState([]);
+ // 勾选平台商户
+ const [selectedKeys, setSelectedKeys] = useState([]);
+ // 选项在两栏之间转移时的回调
+ const onTransferChange = (nextTargetKeys) => {
+ setTargetKeys(nextTargetKeys);
+ };
+
+ // 选中项发生改变时的回调
+ const onTransferSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
+ setSelectedKeys([...sourceSelectedKeys, ...targetSelectedKeys]);
+ };
+ const columns = [
+ {
+ title: "序号",
+ dataIndex: "index",
+ key: "index",
+ align: "center",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ },
+ {
+ title: "标题",
+ dataIndex: "a",
+ key: "a",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "操作人",
+ dataIndex: "me",
+ key: "me",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "所属路段",
+ dataIndex: "s",
+ key: "s",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "发送时间",
+ dataIndex: "d",
+ key: "de",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "状态",
+ dataIndex: "d",
+ key: "r",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "操作",
+ dataIndex: "operation",
+ key: "operation",
+ align: "center",
+ fixed: "right",
+ render: (_, record) => {
+ return (
+
+ );
+ },
+ },
+ ];
+ //检索条件
+ const formSearch = [
+ {
+ name: "status",
+ type: "Select",
+ label: "状态",
+ options: [
+ {
+ label: "全部",
+ value: -1,
+ },
+ {
+ label: "已发送",
+ value: 0,
+ },
+ {
+ label: "未发送",
+ value: 1,
+ },
+ ],
+ },
+
+ ];
+
+ //列表数据
+ function search(e) {
+ console.log(e)
+ ajax.getConfMesList(e).then((res) => {
+ let { status, data, total } = res
+ if (status == 20000) {
+ if (data.list) {
+ setResultData(data.list)
+ setTotal(data.total)
+ } else {
+ setResultData(data)
+ setTotal(total)
+ }
+ } else {
+ setResultData([])
+ message.error(res.message)
+ }
+ })
+ }
+ const textModules = {
+ toolbar: {
+ container: [
+ [{ 'size': ['small', false, 'large', 'huge'] }], //字体设置
+ // [{ 'header': [1, 2, 3, 4, 5, 6, false] }], //标题字号,不能设置单个字大小
+ ['bold', 'italic', 'underline', 'strike'],
+ [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'indent': '-1' }, { 'indent': '+1' }],
+ ['link', 'image'], // a链接和图片的显示
+ [{ 'align': [] }],
+ [{
+ 'background': ['rgb( 0, 0, 0)', 'rgb(230, 0, 0)', 'rgb(255, 153, 0)',
+ 'rgb(255, 255, 0)', 'rgb( 0, 138, 0)', 'rgb( 0, 102, 204)',
+ 'rgb(153, 51, 255)', 'rgb(255, 255, 255)', 'rgb(250, 204, 204)',
+ 'rgb(255, 235, 204)', 'rgb(255, 255, 204)', 'rgb(204, 232, 204)',
+ 'rgb(204, 224, 245)', 'rgb(235, 214, 255)', 'rgb(187, 187, 187)',
+ 'rgb(240, 102, 102)', 'rgb(255, 194, 102)', 'rgb(255, 255, 102)',
+ 'rgb(102, 185, 102)', 'rgb(102, 163, 224)', 'rgb(194, 133, 255)',
+ 'rgb(136, 136, 136)', 'rgb(161, 0, 0)', 'rgb(178, 107, 0)',
+ 'rgb(178, 178, 0)', 'rgb( 0, 97, 0)', 'rgb( 0, 71, 178)',
+ 'rgb(107, 36, 178)', 'rgb( 68, 68, 68)', 'rgb( 92, 0, 0)',
+ 'rgb(102, 61, 0)', 'rgb(102, 102, 0)', 'rgb( 0, 55, 0)',
+ 'rgb( 0, 41, 102)', 'rgb( 61, 20, 10)']
+ }],
+ [{
+ 'color': ['rgb( 0, 0, 0)', 'rgb(230, 0, 0)', 'rgb(255, 153, 0)',
+ 'rgb(255, 255, 0)', 'rgb( 0, 138, 0)', 'rgb( 0, 102, 204)',
+ 'rgb(153, 51, 255)', 'rgb(255, 255, 255)', 'rgb(250, 204, 204)',
+ 'rgb(255, 235, 204)', 'rgb(255, 255, 204)', 'rgb(204, 232, 204)',
+ 'rgb(204, 224, 245)', 'rgb(235, 214, 255)', 'rgb(187, 187, 187)',
+ 'rgb(240, 102, 102)', 'rgb(255, 194, 102)', 'rgb(255, 255, 102)',
+ 'rgb(102, 185, 102)', 'rgb(102, 163, 224)', 'rgb(194, 133, 255)',
+ 'rgb(136, 136, 136)', 'rgb(161, 0, 0)', 'rgb(178, 107, 0)',
+ 'rgb(178, 178, 0)', 'rgb( 0, 97, 0)', 'rgb( 0, 71, 178)',
+ 'rgb(107, 36, 178)', 'rgb( 68, 68, 68)', 'rgb( 92, 0, 0)',
+ 'rgb(102, 61, 0)', 'rgb(102, 102, 0)', 'rgb( 0, 55, 0)',
+ 'rgb( 0, 41, 102)', 'rgb( 61, 20, 10)']
+ }],
+ ['clean'], //清空
+ ['emoji'], //emoji表情,设置了才能显示
+ ['video2'], //我自定义的视频图标,和插件提供的不一样,所以设置为video2
+ ],
+ // handlers: {
+ // 'image': this.imageHandler.bind(this), //点击图片标志会调用的方法
+ // 'video2': this.showVideoModal.bind(this),
+ // },
+ },
+ // ImageExtend: {
+ // loading: true,
+ // name: 'img',
+ // action: RES_URL + "connector?isRelativePath=true",
+ // response: res => FILE_URL + res.info.url
+ // },
+ ImageDrop: true,
+ 'emoji-toolbar': true, //是否展示出来
+ "emoji-textarea": false, //我不需要emoji展示在文本框所以设置为false
+ "emoji-shortname": true,
+ }
+ return (
+ <>
+
{ setDetailVisible(true) }}
+ style={{ width: '100px' }}
+ >
+ 配置消息
+
+ }
+ isExport={false} //是否显示导出按钮
+ //initFormData={initFormData}
+ //pageName={'geomagneticSignalMgm'}
+ //exportUrl=""
+ />
+ {
+ setDetailVisible(false);
+ }}
+ footer={[
+ ]}
+ >
+
+
+
+
*消息标题:
+
+ { console.log(e.target.value) }} />
+
+
+
+
+
+
*接收人群:
+
item.text}
+ />
+
+
+
+
+
*消息内容:
+ {/*
{ this.reactQuillRef = el }}
+ //defaultValue={postRichText}
+ key="1"
+ id="textDiv1" theme="snow"
+ // modules={textModules}
+ /> */}
+
+
+
+
+ >
+ );
+}
+
+export default ConfMes;
\ No newline at end of file
diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
index 51fb193..32db69b 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
+++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
@@ -101,6 +101,7 @@ function OrgnizationMgm() {
name: '',
level: Number(level) + 1
})
+ getDepartTree()
setOrgModalVisible(true)
setOrgEditStatus(false)
@@ -329,7 +330,7 @@ function OrgnizationMgm() {
ajaxOrgDetailSave(Object.assign({}, baseForm.getFieldsValue(), {
id: activeOrg.id,
role: roleCheckedKeys.join(','),
- control_area: baseForm.getFieldValue('control_area').join(',')
+ control_area: baseForm.getFieldValue('control_area')
})).then((msg) => {
message.success(msg)
setEditStatus(false)
@@ -434,7 +435,7 @@ function OrgnizationMgm() {
{
+ return ajax({
+ url: "/api/msg/conf/list",
+ type: "get",
+ data: params,
+ })
+};
+
+const getUserTreeData = (data) => {
+ return ajax({
+ url: '/api/v1/admin/user/get_user_tree_list',
+ type: 'get'
+ })
+}
+
+const msgConfUpdate = (data) => {
+ return ajax({
+ url: "/api/msg/conf/update",
+ type: "post",
+ data: data,
+ })
+}
+
+const msgConfDel = (data) => {
+ return ajax({
+ url: "/api/msg/conf/del",
+ type: "post",
+ data: data,
+ })
+}
+
+
+export default {
+ getMsgConfList,
+ getUserTreeData,
+ msgConfUpdate,
+ msgConfDel
+}
\ No newline at end of file
diff --git a/src/services/SystemMgm/index.js b/src/services/SystemMgm/index.js
index 7b3813f..c667515 100644
--- a/src/services/SystemMgm/index.js
+++ b/src/services/SystemMgm/index.js
@@ -2,9 +2,11 @@ import AdminMgm from "./AdminMgm";
import RoleMgm from "./RoleMgm";
import BusinessConf from "./BusinessConf";
import SystemLog from "./SystemLog";
+import MsgMgm from "./MsgMgm";
export default {
...AdminMgm,
...RoleMgm,
...BusinessConf,
...SystemLog,
+ ...MsgMgm
};