fix: '修改视频平台添加功能'

src/pages/bsmanager/maintenance/maintenance.jsx

@@ -20,10 +20,10 @@ const maintenance = () => {
       title: '业务名称',
       dataIndex: 'businessName',
       key: 'businessName',
-      width: 100,
+      width: 200,
       onCell: () => ({
         style: {
-          maxWidth: 100,
+          maxWidth: 200,
           overflow: 'hidden',
           whiteSpace: 'nowrap',
           textOverflow: 'ellipsis',
@@ -99,10 +99,10 @@ const maintenance = () => {
       title: '反馈名称',
       dataIndex: 'feedbackName',
       key: 'feedbackName',
-      width: 100,
+      width: 200,
       onCell: () => ({
         style: {
-          maxWidth: 100,
+          maxWidth: 200,
           overflow: 'hidden',
           whiteSpace: 'nowrap',
           textOverflow: 'ellipsis',
@@ -120,7 +120,7 @@ const maintenance = () => {
       title: '台账过滤条件',
       dataIndex: 'filterCondition',
       key: 'filterCondition',
-      width: 200,
+      width: 150,
       onCell: () => ({
         style: {
           maxWidth: 200,
@@ -157,10 +157,10 @@ const maintenance = () => {
       title: '执行角色',
       dataIndex: 'doRole',
       key: 'doRole',
-      width: 300,
+      width: 350,
       onCell: () => ({
         style: {
-          maxWidth: 300,
+          maxWidth: 350,
           overflow: 'hidden',
           whiteSpace: 'nowrap',
           textOverflow: 'ellipsis',

src/pages/platformCenter/baseFrameContainer/drawBoardManage/DrawBoardManage.jsx

@@ -3,7 +3,7 @@
  * @Description:
  * @Author: leizhe
  * @Date: 2022-04-06 11:38:46
- * @LastEditTime: 2022-04-15 09:56:38
+ * @LastEditTime: 2022-04-15 16:45:47
  * @LastEditors: leizhe
  */
 import React, { useState, useEffect } from 'react';
@@ -33,6 +33,7 @@ import {
   DownLoadModelType,
   GetBasicInfo,
   DownLoadModelTypeSingle,
+  Export,
 } from '@/services/drawBoardManage/api';
 import {
   FormOutlined,
@@ -83,12 +84,14 @@ const DrawBoardManage = () => {
   const { Search } = Input;
   const [keepId, setKeepId] = useState('');
   const [total, setTotal] = useState('');
+  const [page, setPage] = useState(1);
   const setRowClassName = record => (record.id === selectColor.id ? styles.clickRowStyle : '');
 
   useEffect(() => {
     if (pickItem) {
       updateTableData(pickItem.name, searchWord);
     }
+    setPage(1);
   }, [pickItem]);
 
   useEffect(() => {
@@ -362,7 +365,7 @@ const DrawBoardManage = () => {
             <Tooltip title="删除">
               <DeleteOutlined
                 onClick={() => ondelete(record)}
-                style={{ fontSize: '16px', color: '#1890FF' }}
+                style={{ fontSize: '16px', color: '#e86060' }}
               />
             </Tooltip>
           </Space>
@@ -600,6 +603,7 @@ const DrawBoardManage = () => {
       message.warning('请先选择导出的数据');
     } else {
       window.location.href = DownLoadModelType({ modelList: selectedRowKeys.toString() });
+      // window.location.href = Export({ Ids: selectedRowKeys.toString() });
     }
   };
 
@@ -716,10 +720,8 @@ const DrawBoardManage = () => {
             >
               <div>
                 <span style={{ width: '200px', display: 'inline-block' }}>
-                  {pickItem.name}（已选{selectedRowKeys.length}/共{total}条）
+                  {pickItem ? pickItem.name : '全部类型'}（已选{selectedRowKeys.length}条）
                 </span>
-              </div>
-              <div>
                 <span style={{ lineHeight: '32px' }}>模型检索：</span>
                 <Search
                   style={{ width: 260 }}
@@ -729,6 +731,8 @@ const DrawBoardManage = () => {
                   enterButton
                   value={searchWord}
                 />
+              </div>
+              <div>
                 <Button
                   type="primary"
                   icon={<PlusOutlined />}
@@ -745,7 +749,7 @@ const DrawBoardManage = () => {
                 >
                   删除
                 </Button>
-                {/* <Button
+                <Button
                   type="primary"
                   icon={<UploadOutlined />}
                   onClick={importFile}
@@ -760,7 +764,7 @@ const DrawBoardManage = () => {
                   style={{ marginLeft: '20px' }}
                 >
                   导出
-                </Button> */}
+                </Button>
               </div>
             </div>
             <Table
@@ -794,6 +798,10 @@ const DrawBoardManage = () => {
                 defaultPageSize: 10,
                 showQuickJumper: true,
                 showSizeChanger: true,
+                current: page,
+                onChange: (page, pageSize) => {
+                  setPage(page);
+                },
               }}
             />
           </div>

src/pages/platformCenter/baseFrameContainer/modelFileManage/EditModal.jsx

@@ -3,7 +3,7 @@
  * @Description:
  * @Author: leizhe
  * @Date: 2022-04-07 10:23:26
- * @LastEditTime: 2022-04-14 14:23:42
+ * @LastEditTime: 2022-04-15 14:44:54
  * @LastEditors: leizhe
  */
 import React, { useEffect, useState } from 'react';
@@ -31,7 +31,7 @@ const EditModal = props => {
   const submitEdit = () => {
     console.log(addForm.getFieldValue('name'));
     console.log(addForm.getFieldValue('type'));
-    if (addForm.getFieldValue('name')) {
+    if (addForm.getFieldValue('name') && addForm.getFieldValue('type')) {
       Edit({
         id: pickItem.id,
         Name: addForm.getFieldValue('name'),
@@ -57,9 +57,14 @@ const EditModal = props => {
         .catch(err => {
           message.error(err);
         });
-    } else {
+    } else if (!addForm.getFieldValue('name')) {
       notification.warning({
-        message: '模板类型名称不能为空',
+        message: '画板名称不能为空',
+        duration: 2,
+      });
+    } else if (!addForm.getFieldValue('type')) {
+      notification.warning({
+        message: '画板类型不能为空',
         duration: 2,
       });
     }

src/pages/platformCenter/baseFrameContainer/modelFileManage/ModelFileManage.jsx

@@ -3,7 +3,7 @@
  * @Description:
  * @Author: leizhe
  * @Date: 2022-04-06 11:39:53
- * @LastEditTime: 2022-04-14 17:26:54
+ * @LastEditTime: 2022-04-15 15:35:27
  * @LastEditors: leizhe
  */
 import React, { useState, useEffect } from 'react';
@@ -396,10 +396,8 @@ const ModelFileManage = () => {
         >
           <div>
             <span style={{ width: '200px', display: 'inline-block' }}>
-              （已选{selectedRowKeys.length}/共{total}条）
+              （已选{selectedRowKeys.length}条/共{total}条）
             </span>
-          </div>
-          <div>
             <span style={{ lineHeight: '32px' }}>画板检索：</span>
             <Search
               style={{ width: 260 }}
@@ -417,6 +415,8 @@ const ModelFileManage = () => {
             >
               重置
             </Button>
+          </div>
+          <div>
             <Button
               type="primary"
               icon={<DeleteOutlined />}

src/pages/platformCenter/videoManager/index.jsx

@@ -34,6 +34,7 @@ import CheckModal from './CheckModal';
 import VideoModal from './VideoModal';
 import DHModal from './DHModal';
 import HKModal from './HKModal';
+import AddAllModal from './AddAllModal';
 
 const videoManager = () => {
   const [configurationType, setConfigurationType] = useState('1');
@@ -54,6 +55,7 @@ const videoManager = () => {
   const [addDHVisible, setAddDHVisible] = useState(false);
   const [addHKVisible, setAddHKVisible] = useState(false);
   const [showSearchStyle, setShowSearchStyle] = useState(false); // 是否显示模糊查询样式
+  const [addAllVisible, setAddAllVisible] = useState(false);
 
   const columns = [
     {
@@ -398,11 +400,15 @@ const videoManager = () => {
     } else {
       setAddVisible(true);
     }
-
     setKind('add');
   };
 
+  const addAll = () => {
+    setAddAllVisible(true);
+  };
+
   const onSubmit = () => {
+    setAddAllVisible(false);
     setAddDHVisible(false);
     setAddHKVisible(false);
     setAddVisible(false);
@@ -446,7 +452,7 @@ const videoManager = () => {
           >
             重置
           </Button>
-          <Button
+          {/* <Button
             icon={<PlusOutlined className={styles.icon} />}
             onClick={addVideo}
             style={{
@@ -456,6 +462,17 @@ const videoManager = () => {
             }}
           >
             新增
+          </Button> */}
+          <Button
+            icon={<PlusOutlined className={styles.icon} />}
+            onClick={addAll}
+            style={{
+              float: 'right',
+              verticalAlign: 'middle',
+              // marginTop: '-3px',
+            }}
+          >
+            新增
           </Button>
         </Col>
       </Row>
@@ -521,6 +538,19 @@ const videoManager = () => {
         obj={obj}
         callBackSubmit={onSubmit}
       />
+      <AddAllModal
+        visible={addAllVisible}
+        onCancel={() => {
+          setAddAllVisible(false);
+        }}
+        okText="确认"
+        cancelText="取消"
+        type={type}
+        type1={type1}
+        kind={kind}
+        obj={obj}
+        callBackSubmit={onSubmit}
+      />
       <CheckModal
         visible={checkVisible}
         onCancel={() => {

src/services/drawBoardManage/api.js

@@ -2,7 +2,7 @@
  * @Description:
  * @Author: leizhe
  * @Date: 2022-04-06 17:28:30
- * @LastEditTime: 2022-04-15 09:56:47
+ * @LastEditTime: 2022-04-15 15:08:11
  * @LastEditors: leizhe
  */
 import { get, post, postForm, PUBLISH_SERVICE, WebSERVICE } from '@/services/index';
@@ -42,3 +42,5 @@ export const GetBasicInfo = param => get(`${PUBLISH_SERVICE}/HostManager/GetBasi
 
 export const DownLoadModelTypeSingle = query =>
   `${PUBLISH_SERVICE}/ModelType/DownLoadModelTypeSingle?modeId=${query.modeId}`;
+
+export const Export = query => `${WebSERVICE}/Models/Models/Export?Ids=${query.Ids}`;