Selaa lähdekoodia

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

Renxy 1 vuosi sitten
vanhempi
commit
649b44e12e

+ 4 - 2
src/pages/Center/MyTask/Detail/TaskDetail.js

@@ -39,10 +39,12 @@ function TaskDetail(props) {
       title: '详情',
       title: '详情',
       dataIndex: 'detail',
       dataIndex: 'detail',
       key: 'key',
       key: 'key',
-      render: (value, record) => {
+      render: (value, _record, index) => {
         return (
         return (
           <div style={{ display: 'flex', alignItems: 'center' }}>
           <div style={{ display: 'flex', alignItems: 'center' }}>
-            <div style={{ width: '100%' }}>{value.text}</div>
+            <div style={{ width: '100%' }}>
+              {index + 1}、{value.text}
+            </div>
           </div>
           </div>
         );
         );
       },
       },

+ 1 - 1
src/pages/SmartOps/index.js

@@ -171,7 +171,7 @@ function SmartOps(props) {
           data.environment_list?.filter((item) => item.status)?.length || 0;
           data.environment_list?.filter((item) => item.status)?.length || 0;
         // const count3 =
         // const count3 =
         //   data.fluid_level_list?.filter((item) => item.status)?.length || 0;
         //   data.fluid_level_list?.filter((item) => item.status)?.length || 0;
-        setVideoNum(count1 + count2 + count3);
+        setVideoNum(count1 + count2);
         const Cam =
         const Cam =
           data.dumu_list?.map((item) => {
           data.dumu_list?.map((item) => {
             item.key = `dumu_${item.id}`;
             item.key = `dumu_${item.id}`;

+ 4 - 2
src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -74,10 +74,12 @@ function TaskDetail(props: IPropsType) {
       title: '详情',
       title: '详情',
       dataIndex: 'detail',
       dataIndex: 'detail',
       key: 'key',
       key: 'key',
-      render: (value, record) => {
+      render: (value, _record, index) => {
         return (
         return (
           <div style={{ display: 'flex', alignItems: 'center' }}>
           <div style={{ display: 'flex', alignItems: 'center' }}>
-            <div style={{ width: '100%' }}>{value.text}</div>
+            <div style={{ width: '100%' }}>
+              {index + 1}、{value.text}
+            </div>
           </div>
           </div>
         );
         );
       },
       },

+ 7 - 0
src/pages/TaskManage/components/MandateDetail.js

@@ -61,6 +61,13 @@ const MandateDetail = (props) => {
   const [dispatchModalOpen, setDispatchModalOpen] = useState(false);
   const [dispatchModalOpen, setDispatchModalOpen] = useState(false);
 
 
   const columns = [
   const columns = [
+    {
+      title: '序号',
+      key: 'index',
+      render: (_text, _record, index) => {
+        return index + 1 + '、';
+      },
+    },
     {
     {
       title: '参数',
       title: '参数',
       dataIndex: 'Title',
       dataIndex: 'Title',