Skip to content

C
CivManage
Commit 040b17ff authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

fix: '修改视频平台界面样式'

parent 6ed0615d
Pipeline #46599 skipped with stages
          Show whitespace changes
          Inline Side-by-side
          Showing with 282 additions and 185 deletions
          src/components/ExpendableTree/index.jsx
          View file @ 040b17ff
          ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
          * @Description: * @Description:
          * @Author: leizhe * @Author: leizhe
          * @Date: 2022-03-04 18:33:24 * @Date: 2022-03-04 18:33:24
          * @LastEditTime: 2022-03-22 10:11:21 * @LastEditTime: 2022-03-24 17:41:25
          * @LastEditors: leizhe * @LastEditors: leizhe
          */ */
          import { Tree } from 'antd'; import { Tree } from 'antd';
          ...@@ -23,10 +23,6 @@ export default props => { ...@@ -23,10 +23,6 @@ export default props => {
          }, [expandedKeys]); }, [expandedKeys]);
          const handleExpand = (keys, { expanded, node }) => { const handleExpand = (keys, { expanded, node }) => {
          console.log(keys);
          console.log(expanded);
          console.log(node);
          console.log(keepTree);
          if (keepTree && keepTree.indexOf(node.key) != -1 && epKeys.indexOf(node.key) == -1) { if (keepTree && keepTree.indexOf(node.key) != -1 && epKeys.indexOf(node.key) == -1) {
          setEpKeys([node.key]); setEpKeys([node.key]);
          } else { } else {
          ...@@ -39,10 +35,6 @@ export default props => { ...@@ -39,10 +35,6 @@ export default props => {
          }; };
          const handleSelect = (keys, e) => { const handleSelect = (keys, e) => {
          console.log(keys);
          console.log(e);
          console.log(epKeys);
          console.log(keepTree);
          if (keepTree && keepTree.indexOf(keys[0]) != -1 && epKeys.indexOf(keys[0]) == -1) { if (keepTree && keepTree.indexOf(keys[0]) != -1 && epKeys.indexOf(keys[0]) == -1) {
          setEpKeys(keys); setEpKeys(keys);
          } else { } else {
          ......
          src/pages/platformCenter/hostmanager/proxyConfig/ProxyConfig.jsx
          View file @ 040b17ff
          ...@@ -58,7 +58,7 @@ const ProxyConfig = () => { ...@@ -58,7 +58,7 @@ const ProxyConfig = () => {
          if (res.code === 0) { if (res.code === 0) {
          message.success('保存成功'); message.success('保存成功');
          } else { } else {
          message.error('保存失败'); message.error(res.msg);
          } }
          }); });
          }; };
          ...@@ -78,20 +78,10 @@ const ProxyConfig = () => { ...@@ -78,20 +78,10 @@ const ProxyConfig = () => {
          StartNginx().then(res => { StartNginx().then(res => {
          setLoading(false); setLoading(false);
          if (res.code === 0) { if (res.code === 0) {
          // message.success('开启成功'); message.success('开启成功');
          notification.success({
          message: '提示',
          duration: 15,
          description: '开启成功',
          });
          setFlag(flag + 1); setFlag(flag + 1);
          } else { } else {
          // message.error('开启失败'); message.error(res.msg);
          notification.error({
          message: '提示',
          duration: 15,
          description: res.msg,
          });
          } }
          }); });
          }; };
          ...@@ -101,18 +91,10 @@ const ProxyConfig = () => { ...@@ -101,18 +91,10 @@ const ProxyConfig = () => {
          StopNginx().then(res => { StopNginx().then(res => {
          setLoading(false); setLoading(false);
          if (res.code === 0) { if (res.code === 0) {
          notification.success({ message.success('关闭成功');
          message: '提示',
          duration: 15,
          description: '关闭成功',
          });
          setFlag(flag + 1); setFlag(flag + 1);
          } else { } else {
          notification.error({ message.error(res.msg);
          message: '提示',
          duration: 15,
          description: res.msg,
          });
          } }
          }); });
          }; };
          ......
          src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
          View file @ 040b17ff
          ...@@ -99,7 +99,7 @@ const ProjectManage = props => { ...@@ -99,7 +99,7 @@ const ProjectManage = props => {
          dataIndex: 'type', dataIndex: 'type',
          align: 'center', align: 'center',
          key: 'type', key: 'type',
          render: (text, record) => <div>{text === null ? '-' : text}</div>, render: (text, record) => <div>{text === null || !text ? '-' : text}</div>,
          }, },
          { {
          title: '推送方式', title: '推送方式',
          ...@@ -117,7 +117,7 @@ const ProjectManage = props => { ...@@ -117,7 +117,7 @@ const ProjectManage = props => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ...@@ -144,7 +144,7 @@ const ProjectManage = props => { ...@@ -144,7 +144,7 @@ const ProjectManage = props => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ......
          src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx
          View file @ 040b17ff
          ...@@ -135,14 +135,14 @@ const TemplateManage = () => { ...@@ -135,14 +135,14 @@ const TemplateManage = () => {
          dataIndex: 'type', dataIndex: 'type',
          key: 'type', key: 'type',
          align: 'center', align: 'center',
          render: text => <span>{text == null ? '-' : text}</span>, render: text => <span>{text == null || !text ? '-' : text}</span>,
          }, },
          { {
          title: '第三方模板名称', title: '第三方模板名称',
          dataIndex: 'third_name', dataIndex: 'third_name',
          key: 'third_name', key: 'third_name',
          align: 'center', align: 'center',
          render: text => <span>{text == null ? '-' : text}</span>, render: text => <span>{text == null || !text ? '-' : text}</span>,
          }, },
          { {
          title: '企业微信ID', title: '企业微信ID',
          ...@@ -160,7 +160,7 @@ const TemplateManage = () => { ...@@ -160,7 +160,7 @@ const TemplateManage = () => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ...@@ -187,7 +187,7 @@ const TemplateManage = () => { ...@@ -187,7 +187,7 @@ const TemplateManage = () => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ...@@ -213,7 +213,7 @@ const TemplateManage = () => { ...@@ -213,7 +213,7 @@ const TemplateManage = () => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ...@@ -239,7 +239,7 @@ const TemplateManage = () => { ...@@ -239,7 +239,7 @@ const TemplateManage = () => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ...@@ -265,7 +265,7 @@ const TemplateManage = () => { ...@@ -265,7 +265,7 @@ const TemplateManage = () => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ...@@ -292,7 +292,7 @@ const TemplateManage = () => { ...@@ -292,7 +292,7 @@ const TemplateManage = () => {
          }), }),
          render: (text, record) => ( render: (text, record) => (
          <span> <span>
          {text === null ? ( {text === null || !text ? (
          '-' '-'
          ) : ( ) : (
          <Tooltip placement="topLeft" title={text}> <Tooltip placement="topLeft" title={text}>
          ......
          src/pages/platformCenter/messageManage/templateManage/components/AddModal.jsx
          View file @ 040b17ff
          ...@@ -60,10 +60,21 @@ const AddModal = props => { ...@@ -60,10 +60,21 @@ const AddModal = props => {
          return ( return (
          <SiteModal <SiteModal
          {...props} {...props}
          title="模板添加" title={
          <span>
          <span style={{ marginRight: '20px' }}>
          <span>模板添加</span>
          </span>
          <span style={{ fontSize: '14px' }}>当前解析版本规则</span>
          <span style={{ color: 'rgb(24, 144, 255)' }}>{messageVersion}</span>
          </span>
          }
          style={{ top: 200, borderRadius: '20px' }} style={{ top: 200, borderRadius: '20px' }}
          width="820px" width="820px"
          destroyOnClose destroyOnClose
          afterClose={() => {
          form.resetFields();
          }}
          cancelText="取消" cancelText="取消"
          okText="确认" okText="确认"
          onOk={() => onSubmit()} onOk={() => onSubmit()}
          ...@@ -116,7 +127,7 @@ const AddModal = props => { ...@@ -116,7 +127,7 @@ const AddModal = props => {
          <Row> <Row>
          <Col span={12}> <Col span={12}>
          <Item <Item
          label="请选择第三方模板名称" label="第三方模板名称"
          name="third_name" name="third_name"
          wrapperCol={{ span: 12 }} wrapperCol={{ span: 12 }}
          labelCol={{ span: 12 }} labelCol={{ span: 12 }}
          ...@@ -166,7 +177,7 @@ const AddModal = props => { ...@@ -166,7 +177,7 @@ const AddModal = props => {
          <Row> <Row>
          <Col span={12}> <Col span={12}>
          <Item <Item
          label="请选择第三方模板名称" label="第三方模板名称"
          wrapperCol={{ span: 12 }} wrapperCol={{ span: 12 }}
          labelCol={{ span: 12 }} labelCol={{ span: 12 }}
          name="third_name" name="third_name"
          ...@@ -222,16 +233,7 @@ const AddModal = props => { ...@@ -222,16 +233,7 @@ const AddModal = props => {
          placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息" placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息"
          /> />
          </Item> </Item>
          <Item <Item label="解析规则版本(仅针对1.0规则)" name="analysis_params" labelCol={{ span: 6 }}>
          label={
          <>
          <span>当前解析规则版本</span>
          <span>{messageVersion}</span>
          </>
          }
          name="analysis_params"
          labelCol={{ span: 6 }}
          >
          <TextArea rows={2} style={{ width: '95%' }} placeholder="param1|param2|param3|param4" /> <TextArea rows={2} style={{ width: '95%' }} placeholder="param1|param2|param3|param4" />
          </Item> </Item>
          </Form> </Form>
          ......
          src/pages/platformCenter/messageManage/templateManage/components/EditModal.jsx
          View file @ 040b17ff
          ...@@ -39,7 +39,7 @@ const EditModal = props => { ...@@ -39,7 +39,7 @@ const EditModal = props => {
          if (option) { if (option) {
          setTemplateName(option.filter(item => item.Type === props.template.type)); setTemplateName(option.filter(item => item.Type === props.template.type));
          } }
          }, [props.template]); }, [props.template, visible]);
          const layout = { const layout = {
          layout: 'horizontal', layout: 'horizontal',
          ...@@ -71,11 +71,22 @@ const EditModal = props => { ...@@ -71,11 +71,22 @@ const EditModal = props => {
          return ( return (
          <SiteModal <SiteModal
          {...props} {...props}
          title="模板编辑" title={
          <span>
          <span style={{ marginRight: '20px' }}>
          <span>模板编辑</span>
          </span>
          <span style={{ fontSize: '14px' }}>当前解析版本规则</span>
          <span style={{ color: 'rgb(24, 144, 255)' }}>{messageVersion}</span>
          </span>
          }
          bodyStyle={{ width: '100%', minHeight: '100px' }} bodyStyle={{ width: '100%', minHeight: '100px' }}
          style={{ top: 200, borderRadius: '20px' }} style={{ top: 200, borderRadius: '20px' }}
          width="820px" width="820px"
          destroyOnClose destroyOnClose
          afterClose={() => {
          form.resetFields();
          }}
          cancelText="取消" cancelText="取消"
          okText="确认" okText="确认"
          onOk={() => onSubmit()} onOk={() => onSubmit()}
          ...@@ -239,12 +250,7 @@ const EditModal = props => { ...@@ -239,12 +250,7 @@ const EditModal = props => {
          /> />
          </Item> </Item>
          <Item <Item
          label={ label="当前解析规则版本(仅针对1.0规则)"
          <>
          <span>当前解析规则版本</span>
          <span>{messageVersion}</span>
          </>
          }
          labelCol={{ span: 6 }} labelCol={{ span: 6 }}
          name="analysis_params" name="analysis_params"
          > >
          ......
          src/pages/platformCenter/videoManager/AddModal.jsx
          View file @ 040b17ff
          ...@@ -3,50 +3,50 @@ import { Form, Modal, Row, Col, Input, Select, notification } from 'antd'; ...@@ -3,50 +3,50 @@ import { Form, Modal, Row, Col, Input, Select, notification } from 'antd';
          import { addInsertVideoConfig, editInsertVideoConfig } from '@/services/videoManger/videoManger'; import { addInsertVideoConfig, editInsertVideoConfig } from '@/services/videoManger/videoManger';
          const AddModal = props => { const AddModal = props => {
          const { callBackSubmit = () => { }, visible, onCancel, type, type1, kind, obj } = props; const { callBackSubmit = () => {}, visible, onCancel, type, type1, kind, obj } = props;
          const [form] = Form.useForm(); const [form] = Form.useForm();
          const { Item } = Form; const { Item } = Form;
          const { TextArea } = Input; const { TextArea } = Input;
          const [selectChange, setSelectChange] = useState('轻应用') const [selectChange, setSelectChange] = useState('轻应用');
          const [selectChange1, setSelectChange1] = useState('否') const [selectChange1, setSelectChange1] = useState('否');
          const [selectChange2, setSelectChange2] = useState('主码流') const [selectChange2, setSelectChange2] = useState('主码流');
          const onChange = value => { const onChange = value => {
          setSelectChange(value) setSelectChange(value);
          } };
          const onChange1 = value => { const onChange1 = value => {
          setSelectChange1(value) setSelectChange1(value);
          } };
          const onChange2 = value => { const onChange2 = value => {
          setSelectChange2(value) setSelectChange2(value);
          } };
          useEffect(() => { useEffect(() => {
          if (kind === 'add') { if (kind === 'add') {
          form.resetFields(); form.resetFields();
          } else { } else {
          form.setFieldsValue({ ...obj }) form.setFieldsValue({ ...obj });
          } }
          }, [visible]) }, [visible]);
          const onSubmit = () => { const onSubmit = () => {
          form.validateFields().then(validate => { form.validateFields().then(validate => {
          if (validate) { if (validate) {
          let getValue = form.getFieldsValue(); let getValue = form.getFieldsValue();
          console.log(getValue) console.log(getValue);
          if (getValue.PlayModel === undefined) { if (getValue.PlayModel === undefined) {
          getValue.PlayModel = '轻应用' getValue.PlayModel = '轻应用';
          } }
          if (getValue.PlayZeroChannel === undefined) { if (getValue.PlayZeroChannel === undefined) {
          getValue.PlayZeroChannel = '否' getValue.PlayZeroChannel = '否';
          } }
          if (getValue.StreamType === undefined) { if (getValue.StreamType === undefined) {
          getValue.StreamType = '主码流' getValue.StreamType = '主码流';
          } }
          getValue.VideoManufacturer = type getValue.VideoManufacturer = type;
          if (kind === 'add') { if (kind === 'add') {
          addInsertVideoConfig(getValue).then(res => { addInsertVideoConfig(getValue).then(res => {
          if (res.msg === 'Ok') { if (res.msg === 'Ok') {
          ...@@ -64,12 +64,12 @@ const AddModal = props => { ...@@ -64,12 +64,12 @@ const AddModal = props => {
          description: res.msg, description: res.msg,
          }); });
          } }
          }) });
          } }
          if(kind === 'edit'){ if (kind === 'edit') {
          editInsertVideoConfig({ editInsertVideoConfig({
          ...getValue, ...getValue,
          Id:obj.Id Id: obj.Id,
          }).then(res => { }).then(res => {
          if (res.msg === 'Ok') { if (res.msg === 'Ok') {
          form.resetFields(); form.resetFields();
          ...@@ -86,21 +86,22 @@ const AddModal = props => { ...@@ -86,21 +86,22 @@ const AddModal = props => {
          description: res.msg, description: res.msg,
          }); });
          } }
          }) });
          } }
          } }
          }); });
          };
          }
          if (type1 == 'aa') { if (type1 == 'aa') {
          return ( return (
          <Modal <Modal
          visible={visible} visible={visible}
          title={ title={
          kind === 'add' ? <span style={{ fontSize: '18px' }}>新增配置</span> : <span style={{ fontSize: '18px' }}>编辑配置</span> kind === 'add' ? (
          <span style={{ fontSize: '18px' }}>新增配置</span>
          ) : (
          <span style={{ fontSize: '18px' }}>编辑配置</span>
          )
          } }
          width="1000px" width="1000px"
          destroyOnClose destroyOnClose
          ...@@ -109,7 +110,12 @@ const AddModal = props => { ...@@ -109,7 +110,12 @@ const AddModal = props => {
          onOk={onSubmit} onOk={onSubmit}
          > >
          <p style={{ fontSize: '16px', marginLeft: '16px' }}>基本信息</p> <p style={{ fontSize: '16px', marginLeft: '16px' }}>基本信息</p>
          <Form form={form} labelCol={{ span: 7 }} style={{ height: '25rem', overflowY: 'scroll' }} autocomplete='off'> <Form
          form={form}
          labelCol={{ span: 7 }}
          style={{ height: '25rem', overflowY: 'scroll' }}
          autocomplete="off"
          >
          <Row> <Row>
          <Col span={11}> <Col span={11}>
          <Item <Item
          ...@@ -128,29 +134,47 @@ const AddModal = props => { ...@@ -128,29 +134,47 @@ const AddModal = props => {
          {(() => { {(() => {
          switch (type) { switch (type) {
          case '海康1.2': case '海康1.2':
          return <> return (
          <>
          <Col span={12}> <Col span={12}>
          <span style={{ position: 'absolute', left: '12%', top: '9%', color: 'red', fontSize: '16px' }}>*</span> <span
          <Item style={{
          label="视频厂商" position: 'absolute',
          name="VideoManufacturer" left: '12%',
          > top: '9%',
          color: 'red',
          fontSize: '16px',
          }}
          >
          *
          </span>
          <Item label="视频厂商" name="VideoManufacturer">
          <Input placeholder="海康1.2" disabled /> <Input placeholder="海康1.2" disabled />
          </Item> </Item>
          </Col> </Col>
          </> </>
          );
          case '海康NVR': case '海康NVR':
          return <> return (
          <>
          <Col span={12}> <Col span={12}>
          <span style={{ position: 'absolute', left: '12%', top: '9%', color: 'red', fontSize: '16px' }}>*</span> <span
          <Item style={{
          label="视频厂商" position: 'absolute',
          name="VideoManufacturer" left: '12%',
          > top: '9%',
          color: 'red',
          fontSize: '16px',
          }}
          >
          *
          </span>
          <Item label="视频厂商" name="VideoManufacturer">
          <Input placeholder="海康NVR" disabled /> <Input placeholder="海康NVR" disabled />
          </Item> </Item>
          </Col> </Col>
          </> </>
          );
          } }
          })()} })()}
          <Col span={11}> <Col span={11}>
          ...@@ -187,7 +211,8 @@ const AddModal = props => { ...@@ -187,7 +211,8 @@ const AddModal = props => {
          {(() => { {(() => {
          switch (type) { switch (type) {
          case '海康1.2': case '海康1.2':
          return <> return (
          <>
          <Col span={11}> <Col span={11}>
          <Item <Item
          label="设备序列号" label="设备序列号"
          ...@@ -203,8 +228,10 @@ const AddModal = props => { ...@@ -203,8 +228,10 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          </> </>
          );
          case '海康NVR': case '海康NVR':
          return <> return (
          <>
          <Col span={11}> <Col span={11}>
          <Item <Item
          label="视频流地址" label="视频流地址"
          ...@@ -220,14 +247,12 @@ const AddModal = props => { ...@@ -220,14 +247,12 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          </> </>
          );
          } }
          })()} })()}
          <Col span={12}> <Col span={12}>
          <Item <Item label="刻录机名称" name="RecorderName">
          label="刻录机名称"
          name="RecorderName"
          >
          <Input placeholder="刻录机名称" /> <Input placeholder="刻录机名称" />
          </Item> </Item>
          </Col> </Col>
          ...@@ -246,10 +271,7 @@ const AddModal = props => { ...@@ -246,10 +271,7 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={12}>
          <Item <Item label="默认通道ID" name="DefaultPassageId">
          label="默认通道ID"
          name="DefaultPassageId"
          >
          <TextArea placeholder="默认视频监控点ID，请用英文逗好分隔" /> <TextArea placeholder="默认视频监控点ID，请用英文逗好分隔" />
          </Item> </Item>
          </Col> </Col>
          ...@@ -270,13 +292,17 @@ const AddModal = props => { ...@@ -270,13 +292,17 @@ const AddModal = props => {
          </Row> </Row>
          </Form> </Form>
          </Modal> </Modal>
          ) );
          } else { } else {
          return ( return (
          <Modal <Modal
          visible={visible} visible={visible}
          title={ title={
          kind === 'add' ? <span style={{ fontSize: '18px' }}>新增配置</span> : <span style={{ fontSize: '18px' }}>编辑配置</span> kind === 'add' ? (
          <span style={{ fontSize: '18px' }}>新增配置</span>
          ) : (
          <span style={{ fontSize: '18px' }}>编辑配置</span>
          )
          } }
          width="1000px" width="1000px"
          destroyOnClose destroyOnClose
          ...@@ -285,7 +311,12 @@ const AddModal = props => { ...@@ -285,7 +311,12 @@ const AddModal = props => {
          onOk={onSubmit} onOk={onSubmit}
          > >
          <p style={{ fontSize: '16px', marginLeft: '16px' }}>基本信息</p> <p style={{ fontSize: '16px', marginLeft: '16px' }}>基本信息</p>
          <Form form={form} labelCol={{ span: 7 }} style={{ height: '27rem', overflowY: 'scroll' }} autocomplete='off'> <Form
          form={form}
          labelCol={{ span: 7 }}
          style={{ height: '27rem', overflowY: 'scroll' }}
          autocomplete="off"
          >
          <Row> <Row>
          <Col span={11}> <Col span={11}>
          <Item <Item
          ...@@ -304,29 +335,47 @@ const AddModal = props => { ...@@ -304,29 +335,47 @@ const AddModal = props => {
          {(() => { {(() => {
          switch (type) { switch (type) {
          case '萤石云': case '萤石云':
          return <> return (
          <>
          <Col span={12}> <Col span={12}>
          <span style={{ position: 'absolute', left: '12%', top: '9%', color: 'red', fontSize: '16px' }}>*</span> <span
          <Item style={{
          label="视频厂商" position: 'absolute',
          name="VideoManufacturer" left: '12%',
          > top: '9%',
          color: 'red',
          fontSize: '16px',
          }}
          >
          *
          </span>
          <Item label="视频厂商" name="VideoManufacturer">
          <Input placeholder="萤石云" disabled /> <Input placeholder="萤石云" disabled />
          </Item> </Item>
          </Col> </Col>
          </> </>
          );
          case '海康': case '海康':
          return <> return (
          <>
          <Col span={12}> <Col span={12}>
          <span style={{ position: 'absolute', left: '12%', top: '9%', color: 'red', fontSize: '16px' }}>*</span> <span
          <Item style={{
          label="视频厂商" position: 'absolute',
          name="VideoManufacturer" left: '12%',
          > top: '9%',
          color: 'red',
          fontSize: '16px',
          }}
          >
          *
          </span>
          <Item label="视频厂商" name="VideoManufacturer">
          <Input placeholder="海康" disabled /> <Input placeholder="海康" disabled />
          </Item> </Item>
          </Col> </Col>
          </> </>
          );
          } }
          })()} })()}
          ...@@ -355,7 +404,7 @@ const AddModal = props => { ...@@ -355,7 +404,7 @@ const AddModal = props => {
          }, },
          ]} ]}
          > >
          <Input placeholder="请输入登录密码" /> <Input.Password placeholder="请输入登录密码" />
          </Item> </Item>
          </Col> </Col>
          <Col span={11}> <Col span={11}>
          ...@@ -392,7 +441,8 @@ const AddModal = props => { ...@@ -392,7 +441,8 @@ const AddModal = props => {
          {(() => { {(() => {
          switch (type) { switch (type) {
          case '萤石云': case '萤石云':
          return <> return (
          <>
          <Row> <Row>
          <Col span={11}> <Col span={11}>
          <Item <Item
          ...@@ -437,40 +487,29 @@ const AddModal = props => { ...@@ -437,40 +487,29 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={12}>
          <Item <Item label="刻录机名称" name="RecorderName">
          label="刻录机名称"
          name="RecorderName"
          >
          <Input placeholder="刻录机名称" /> <Input placeholder="刻录机名称" />
          </Item> </Item>
          </Col> </Col>
          <Col span={11}> <Col span={11}>
          <Item <Item label="默认播放方式" name="PlayModel">
          label="默认播放方式" <Select defaultValue="轻应用" value={selectChange} onChange={onChange}>
          name="PlayModel"
          >
          <Select
          defaultValue="轻应用"
          value={selectChange}
          onChange={onChange}
          >
          <Option value="轻应用">轻应用</Option> <Option value="轻应用">轻应用</Option>
          <Option value="直播流">直播流</Option> <Option value="直播流">直播流</Option>
          </Select> </Select>
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={12}>
          <Item <Item label="默认通道ID" name="DefaultPassageId">
          label="默认通道ID"
          name="DefaultPassageId"
          >
          <Input placeholder="默认通道ID" /> <Input placeholder="默认通道ID" />
          </Item> </Item>
          </Col> </Col>
          </Row> </Row>
          </> </>
          );
          case '海康': case '海康':
          return <> return (
          <>
          <Row> <Row>
          <Col span={11}> <Col span={11}>
          <Item <Item
          ...@@ -487,7 +526,17 @@ const AddModal = props => { ...@@ -487,7 +526,17 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={12}>
          <span style={{ position: 'absolute', left: '9%', top: '9%', color: 'red', fontSize: '16px' }}>*</span> <span
          style={{
          position: 'absolute',
          left: '9%',
          top: '9%',
          color: 'red',
          fontSize: '16px',
          }}
          >
          *
          </span>
          <Item <Item
          label="播放零通道" label="播放零通道"
          name="PlayZeroChannel" name="PlayZeroChannel"
          ...@@ -495,18 +544,14 @@ const AddModal = props => { ...@@ -495,18 +544,14 @@ const AddModal = props => {
          { {
          validator: (rule, value) => { validator: (rule, value) => {
          if (form.getFieldsValue().PlayZeroChannel == '') { if (form.getFieldsValue().PlayZeroChannel == '') {
          return Promise.reject('请输入设备端口') return Promise.reject('请输入设备端口');
          } }
          return Promise.resolve(); return Promise.resolve();
          } },
          } },
          ]} ]}
          > >
          <Select <Select defaultValue="否" value={selectChange1} onChange={onChange1}>
          defaultValue="否"
          value={selectChange1}
          onChange={onChange1}
          >
          <Option value="否">否</Option> <Option value="否">否</Option>
          <Option value="是">是</Option> <Option value="是">是</Option>
          </Select> </Select>
          ...@@ -555,7 +600,17 @@ const AddModal = props => { ...@@ -555,7 +600,17 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={12}>
          <span style={{ position: 'absolute', left: '12%', top: '9%', color: 'red', fontSize: '16px' }}>*</span> <span
          style={{
          position: 'absolute',
          left: '12%',
          top: '9%',
          color: 'red',
          fontSize: '16px',
          }}
          >
          *
          </span>
          <Item <Item
          label="码流类型" label="码流类型"
          name="StreamType" name="StreamType"
          ...@@ -563,11 +618,11 @@ const AddModal = props => { ...@@ -563,11 +618,11 @@ const AddModal = props => {
          { {
          validator: (rule, value) => { validator: (rule, value) => {
          if (form.getFieldsValue().StreamType == '') { if (form.getFieldsValue().StreamType == '') {
          return Promise.reject('请选择码流类型') return Promise.reject('请选择码流类型');
          } }
          return Promise.resolve(); return Promise.resolve();
          } },
          } },
          ]} ]}
          > >
          <Select <Select
          ...@@ -595,31 +650,24 @@ const AddModal = props => { ...@@ -595,31 +650,24 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={12}>
          <Item <Item label="刻录机名称" name="RecorderName">
          label="刻录机名称"
          name="RecorderName"
          >
          <Input placeholder="刻录机名称" /> <Input placeholder="刻录机名称" />
          </Item> </Item>
          </Col> </Col>
          <Col span={11}> <Col span={11}>
          <Item <Item label="默认通道ID" name="DefaultPassageId">
          label="默认通道ID"
          name="DefaultPassageId"
          >
          <Input placeholder="默认通道ID" /> <Input placeholder="默认通道ID" />
          </Item> </Item>
          </Col> </Col>
          </Row> </Row>
          </> </>
          );
          } }
          } })()}
          )()}
          </Row> </Row>
          </Form> </Form>
          </Modal> </Modal>
          ) );
          } }
          };
          }
          export default AddModal; export default AddModal;
          src/pages/platformCenter/videoManager/index.jsx
          View file @ 040b17ff
          ...@@ -58,7 +58,20 @@ const videoManager = () => { ...@@ -58,7 +58,20 @@ const videoManager = () => {
          key: 'Name', key: 'Name',
          width: 200, width: 200,
          align: 'center', align: 'center',
          render: item => searchStyle(item), onCell: () => ({
          style: {
          maxWidth: 200,
          overflow: 'hidden',
          whiteSpace: 'nowrap',
          textOverflow: 'ellipsis',
          cursor: 'pointer',
          },
          }),
          render: item => (
          <Tooltip placement="topLeft" title={item}>
          {searchStyle(item)}
          </Tooltip>
          ),
          }, },
          { {
          title: '视频厂商', title: '视频厂商',
          ...@@ -75,18 +88,18 @@ const videoManager = () => { ...@@ -75,18 +88,18 @@ const videoManager = () => {
          align: 'center', align: 'center',
          render: item => searchStyle(item), render: item => searchStyle(item),
          }, },
          { // {
          title: '登录密码', // title: '登录密码',
          dataIndex: 'LoginPwd', // dataIndex: 'LoginPwd',
          key: 'LoginPwd', // key: 'LoginPwd',
          width: 350, // width: 350,
          align: 'center', // align: 'center',
          }, // },
          { {
          title: '设备编码', title: '设备编码',
          dataIndex: 'EquipmentCode', dataIndex: 'EquipmentCode',
          key: 'EquipmentCode', key: 'EquipmentCode',
          width: 150, width: 200,
          align: 'center', align: 'center',
          render: item => searchStyle(item), render: item => searchStyle(item),
          }, },
          ...@@ -94,15 +107,43 @@ const videoManager = () => { ...@@ -94,15 +107,43 @@ const videoManager = () => {
          title: '通道ID', title: '通道ID',
          dataIndex: 'PassageId', dataIndex: 'PassageId',
          key: 'PassageId', key: 'PassageId',
          width: 100, width: 150,
          align: 'center', align: 'center',
          onCell: () => ({
          style: {
          maxWidth: 150,
          overflow: 'hidden',
          whiteSpace: 'nowrap',
          textOverflow: 'ellipsis',
          cursor: 'pointer',
          },
          }),
          render: item => (
          <Tooltip placement="topLeft" title={item}>
          {item}
          </Tooltip>
          ),
          }, },
          { {
          title: '刻录机名称', title: '刻录机名称',
          dataIndex: 'RecorderName', dataIndex: 'RecorderName',
          key: 'RecorderName', key: 'RecorderName',
          width: 100, width: 150,
          align: 'center', align: 'center',
          onCell: () => ({
          style: {
          maxWidth: 150,
          overflow: 'hidden',
          whiteSpace: 'nowrap',
          textOverflow: 'ellipsis',
          cursor: 'pointer',
          },
          }),
          render: item => (
          <Tooltip placement="topLeft" title={item}>
          {item}
          </Tooltip>
          ),
          }, },
          { {
          // title: '录入时间', // title: '录入时间',
          ...@@ -272,6 +313,7 @@ const videoManager = () => { ...@@ -272,6 +313,7 @@ const videoManager = () => {
          VideoType: type, VideoType: type,
          pageIndex: 1, pageIndex: 1,
          pageSize: 1000, pageSize: 1000,
          QueryWhere: searchWord,
          }).then(res => { }).then(res => {
          setLoading(false); setLoading(false);
          if (res.msg === 'Ok') { if (res.msg === 'Ok') {
          ...@@ -389,6 +431,7 @@ const videoManager = () => { ...@@ -389,6 +431,7 @@ const videoManager = () => {
          </Row> </Row>
          <Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
          <div className={styles.table}> <div className={styles.table}>
          {tableData.length > 0 ? (
          <Table <Table
          size="small" size="small"
          bordered bordered
          ...@@ -410,6 +453,29 @@ const videoManager = () => { ...@@ -410,6 +453,29 @@ const videoManager = () => {
          showSizeChanger: true, showSizeChanger: true,
          }} }}
          /> />
          ) : (
          <Table
          size="small"
          bordered
          rowKey={record => record.Id}
          columns={columns}
          dataSource={tableData}
          scroll={{ y: 'calc(100vh - 116px)', x: 'max-content' }}
          onRow={record => ({
          onDoubleClick: event => {
          event.stopPropagation();
          edit(record);
          }, // 双击
          })}
          pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 20,
          showQuickJumper: true,
          showSizeChanger: true,
          }}
          />
          )}
          </div> </div>
          </Spin> </Spin>
          <AddModal <AddModal
          ......
          src/pages/userCenter/userManage/UserManage.jsx
          View file @ 040b17ff
          ...@@ -532,6 +532,7 @@ const UserManage = () => { ...@@ -532,6 +532,7 @@ const UserManage = () => {
          // 点击树节点，获取当前机构下所有用户 // 点击树节点，获取当前机构下所有用户
          const onSelect = (props, e) => { const onSelect = (props, e) => {
          console.log(props);
          if (e) { if (e) {
          props[0] = e.node.key; props[0] = e.node.key;
          } else { } else {
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment