z

src/pages/device/productmanage/index.jsx

@@ -91,7 +91,6 @@ const bomtechnology = (props) => {
     tabActiveKey: props.location.query.tabStatus ? props.location.query.tabStatus : 'basis',
   });
   useEffect(() => {
-    console.log("props.location",props.location)
     SetCurrTabKey(tabStatus.tabActiveKey);
     if(!props.location.query.values.id){
       history.push({
@@ -326,29 +325,19 @@ const bomtechnology = (props) => {
   ]
   const topicsmrcolumns=[
     {
-      title: '主键',
-      dataIndex: 'id',
-      tip: '规则名称是唯一的 key',
-      hideInSearch: true,
-      hideInTable: true,
-      render: (dom, entity) => {
-        return (
-          <a
-            onClick={() => {
-              setCurrentRow(entity);
-              setShowDetail(true);
-            }}
-          >
-            {dom}
-          </a>
-        );
-      },
+      title: '功能',
+      dataIndex: 'name',
+      with:'10%',
+      onCell: (_, index) => {
+        return  {rowSpan: index % 2==0?2:0}
+      }
     },
     {
       title: 'Topics类',
       dataIndex: 'topics',
       valueType: 'textarea',
-      with:500,
+      with:'40%',
+      
       render: (text) => <Paragraph style={{display:'inline'}} copyable>{text}</Paragraph>,
     },
     {
@@ -357,6 +346,7 @@ const bomtechnology = (props) => {
       valueType: 'select',
       ellipsis: true,
       search: true,
+      with:'10%',
       valueEnum: {
         0: {
           text: '发布',
@@ -375,7 +365,7 @@ const bomtechnology = (props) => {
       valueType: 'textarea',
       ellipsis: true,
       search: false,
-      with:350,
+      with:'40%',
     },
   ]
   const operationTabList = [
@@ -491,7 +481,12 @@ const handleRemove = async (ids) => {
   };
   const LoadtopisData= async(params)=>{
     await getproducttopicspage(params).then((r) => {
+      // var datasoure = r.data.data.groupBy(x => {
+      //   return x.name;
+      // });
+      // console.log("datasoure",datasoure)
       setdataSource( r.data.data)
+
       settotal( r.data.total)
     });
   }
@@ -593,6 +588,7 @@ const handleRemove = async (ids) => {
       pagination={{ defaultPageSize: 10}}
       columns={topicsmrcolumns}
       toolBarRender={false}
+      scroll={{x:'100%'}}
       //数据绑定
       // dataSource={dataSource}
       request={async (params) => {
@@ -602,7 +598,11 @@ const handleRemove = async (ids) => {
         params.productVesionId=props.location.query.values.id
         params.isDefault=true;
         await getproducttopicspage(params).then((r) => {
-          setdataSource( r.data.data)
+          // var datasoure = r.data.data.groupBy(x => {
+          //   return x.name;
+          // });
+          // console.log("datasoure",datasoure)
+          setdataSource(r.data.data)
           data = r.data.data;
           total = r.data.total;
         });