1

frontend/config/routes.ts

@@ -40,7 +40,8 @@
     { path: '/base/materials', name: '原料管理', component: './materials/index' },
     { path: '/base/bucket', name: '桶管理', component: './bucket/index' },
     { path: '/base/final', name: '成品管理', component: './final/index' },
-    { path: '/base/dict',name:'数据字典',component:'./dict/index'}
+    { path: '/base/dict',name:'数据字典',component:'./dict/index'},
+    { path: '/base/manufacturing', name: '产线设备管理', component: './manufacturing/index' },
     ]
   },
   

frontend/src/api/dictType/dto.d.ts

@@ -120,6 +120,9 @@ declare namespace dictData {
           * 名称
           */
         name?: null | string;
+        typeId?: null|string,
+        typeCode?: null | string ,
+        id?: null | string
     }
     /**
         * 查询分页输入参数

frontend/src/pages/dict/index.tsx

@@ -362,7 +362,7 @@ export default () => {
           ]}
         />
       </ProCard>
-      <Modal title="设置子项"  open={isModalOpen}   onCancel={() => {
+      <Modal title="设置子项"  open={isModalOpen} footer={false}   onCancel={() => {
        
         setIsModalOpen(false);
         
@@ -478,12 +478,13 @@ export default () => {
           <Form.Item
             label="外键id"
             name="typeId"
+            hidden
             // rules={[{ required: true, message: '此项为必填项!' }]}
             // hidden
           >
             <Input />
           </Form.Item>
-          <Form.Item label="状态" name="value" rules={[{ required: true, message: '此项为必填项!' }]} >
+          <Form.Item label="名称" name="value" rules={[{ required: true, message: '此项为必填项!' }]} >
             <Input />
           </Form.Item>
           <Form.Item label="编码" name="code" rules={[{ required: true, message: '此项为必填项!' }]} >

frontend/src/pages/manufacturing/index.tsx

@@ -8,7 +8,7 @@ import { Button, Modal, Form, Input, message, Popconfirm, Upload, UploadProps, S
 import { useEffect, useRef, useState } from 'react';
 import RecipeInfoAPI from '@/api/recipeService'
 // import MaterialsInfoAPI from '@/api/materialService'
-import GroupInfoAPI from '@/api/groupService'
+import {dictDataApi} from '@/api/dictType/service'
 import DeviceInfoAPI from '@/api/DeviceInfo'
 // 料仓接口
 import StockInfoAPI from '@/api/StockService';
@@ -424,9 +424,17 @@ const Index = () => {
     useEffect(() => {
 
         const areList = async () => {
-            const data = await GroupInfoAPI.selectlist()
+            const jsonData: dictData.queryParms = {
+                typeCode: "cxfz",
+            }
+            const data:MyResponse.Content = await dictDataApi.List(jsonData)
             // console.log(data);
-
+            if (data.statusCode===200) {
+                const list:any[] = data.data
+                list.map((res)=>{
+                    res.title = res.id
+                })
+            }
             setare(data.data)
         }
         areList();
@@ -807,7 +815,7 @@ const Index = () => {
                         //   setIsModalGroupFormOpen(false)
                         // }}
                         >
-                            删除分组
+                            删除产线
                         </Button>
                     </Popconfirm>,
                     <Button key="submit2" form="ProductlineEditForm" type="primary" htmlType="submit">

frontend/src/pages/productLine/index.tsx

@@ -425,12 +425,15 @@
              <Divider />
              <div className={styles.tag}>
                {GroupList.map((item, index) => (
+              
                  <div key={index} onClick={() => {
                    setSelectGroup(index);
                  }} className={`${styles.tag_item} ${index === selectGroup ? styles.tag_item_activeItem : ''}`}>
                    <Space size="middle">
                    <div title={item.des}>{item.name}</div>
-                   {item.id==="-1"?'': <div className={styles.tag_item_editicon}><EditOutlined style={{fontSize:'20px'}} title='修改名称' onClick={(e)=>{ 
+                   {
+                    
+                   item.id==="-1"?'1111111': <div className={styles.tag_item_editicon}><EditOutlined style={{fontSize:'20px'}} title='修改名称' onClick={(e)=>{ 
                      e.stopPropagation();
                      const copyFormData = JSON.parse(JSON.stringify(GroupList[index]));
                      GroupEditForm.setFieldsValue(copyFormData);

frontend/src/pages/system/role/index.tsx

@@ -270,6 +270,8 @@ const onFetchModuleList = async () => {
                             selectedRowKeys: selectedTempRowKeys,
                             onChange: (selectedRowKeys, selectedRows) => {
                                  let myselectedRows:any[] = selectedRows;
+                                 console.log(selectedRows);
+                                 console.log(selectedRowKeys);
                                  myselectedRows.map((v:any)=>(
                                     // if (!v.parentId) {
                                     //    if (v.children.length>0) {