1230

config/proxy.js

@@ -13,7 +13,7 @@ export default {
   dev: {
     [defaultSetting.proxypath]: {
       // 要代理的地址
-      target: 'http://192.168.40.64:28000', //jf哥
+      target: 'http://192.168.40.64:28001', //jf哥
       // target: 'http://192.168.40.203:8000', //dj哥
       changeOrigin: true,
     },

src/components/DrawerPro/index.jsx

@@ -8,6 +8,7 @@ function DrawerPro(props) {
   let pushSettingFlag = props.pushSettingFlag;
   let newProps = { ...props };
   delete newProps.children;
+  delete newProps.style;
   const detailprops = {
     ...newProps,
     detailpath: props.detailpath,

src/components/PermissionTree/Permissiontree.jsx

@@ -79,6 +79,10 @@ const Permissiontree = (props) => {
       daauthTree,
     } = state;
 
+  console.log('tree', props);
+  useEffect(() => {
+    resetData();
+  }, []);
   const loop = (data) => {
       return data.map((item) => {
         if (item.children) {
@@ -110,15 +114,12 @@ const Permissiontree = (props) => {
       },
     });
 
-  useEffect(() => {
-    resetData();
-  }, []);
-
   function resetData() {
     if (!id) {
       return;
     }
     if (treeType == 'auth') {
+      console.log(1);
       roleTree({ roleId: id }).then((res) => {
         if (res.code == '0000') {
           let data = res?.data || {};

src/pages/repair/fault/columns.js

@@ -14,7 +14,7 @@ function getcolumns(setdrawer) {
       },
     },
     {
-      title: '故障代码',
+      title: '故障类型代码',
       dataIndex: 'faultCode',
       key: 'faultCode',
     },

src/pages/repair/fault/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-07 11:19:30
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-09 16:47:36
+ * @Last Modified time: 2022-12-30 13:56:38
  */
 
 import * as React from 'react';
@@ -225,7 +225,7 @@ function Fault(props) {
           },
         },
         {
-          title: '故障代码',
+          title: '故障名称代码',
           dataIndex: 'faultDetailCode',
           key: 'faultDetailCode',
         },
@@ -274,7 +274,7 @@ function Fault(props) {
               },
             },
             {
-              title: '故障代码',
+              title: '故障类型代码',
               dataIndex: 'faultCode',
               key: 'faultCode',
             },
@@ -291,6 +291,7 @@ function Fault(props) {
           path="/repair/umFaultSettingDetail/queryList"
           extraparams={{ faultSettingId: drawer?.item.id }}
           pageextra={'add'}
+          resizeable={false}
           addconfig={{
             // access: 'sysDepartment_save',
             btn: {
@@ -330,7 +331,6 @@ function Fault(props) {
           fields={columns}
           actionRef={gzmcref}
           style={{ transform: 'translateX(180px)' }}
-          width={'100%'}
           defaultFormValue={drawergz?.item}
           onClose={() => {
             setdrawergz((s) => ({

src/pages/repair/platform/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-05 10:13:42
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-22 17:16:38
+ * @Last Modified time: 2022-12-30 13:18:22
  */
 
 import * as React from 'react';
@@ -372,7 +372,48 @@ function Platform(props) {
             detailpath="/repair/umTrackOperation/queryOperationList"
             params={{ trackOrderId: drawer?.item?.id }}
             baseRow={drawer?.item}
-            basecolumns={basecolumns}
+            basecolumns={[
+              {
+                title: '创建人',
+                dataIndex: 'createUserName',
+                key: 'createUserName',
+              },
+              {
+                title: '创建时间',
+                dataIndex: 'createTime',
+                key: 'createTime',
+              },
+              {
+                title: '工单状态',
+                dataIndex: 'statusName',
+                key: 'statusName',
+              },
+              {
+                title: '来源工单',
+                dataIndex: 'dataSourcesNo',
+                key: 'dataSourcesNo',
+              },
+              {
+                title: '来源类型',
+                dataIndex: 'dataSourcesName',
+                key: 'dataSourcesName',
+              },
+              {
+                title: '最新追踪人员',
+                dataIndex: 'newRepairUserName',
+                key: 'newRepairUserName',
+              },
+              {
+                title: '下次追踪日期',
+                dataIndex: 'nextTrackDate',
+                key: 'nextTrackDate',
+              },
+              {
+                title: '关单时间',
+                dataIndex: 'repairCloseTime',
+                key: 'repairCloseTime',
+              },
+            ]}
             type="zzgd"
           />
         );

src/pages/setting/role/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-15 13:52:19
+ * @Last Modified time: 2022-12-30 14:10:29
  */
 
 import * as React from 'react';
@@ -144,7 +144,7 @@ function Role(props) {
               onFinish: async (vals) => {
                 //console.log(vals);
                 let res = await doFetch({
-                  url: '/auth/sysRolePermission/queryAll',
+                  url: '/auth/sysRolePermission/save',
                   params: { ...vals },
                 });
                 //console.log(res);
@@ -317,6 +317,7 @@ function Role(props) {
           }));
         }}
         open={drawer.authorityOpen}
+        destroyOnClose
       >
         <PermissionTree
           id={drawer?.item?.id}