jgz
/
admin
Seguir 3
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

feats

Yansen hace 2 años
padre
57f785614e
commit
a5b04607d7
Se han modificado 10 ficheros con 67 adiciones y 17 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1
    0
      index.html
  2. 6
    0
      public/config.js
  3. 2
    2
      src/components/evaluateItem/index.jsx
  4. 17
    1
      src/index.less
  5. 1
    1
      src/layouts/AuthLayout/components/Footer.jsx
  6. 1
    1
      src/layouts/AuthLayout/components/SiderBar.jsx
  7. 1
    1
      src/layouts/Container.jsx
  8. 9
    7
      src/pages/evaluate/evaluateList/index.jsx
  9. 4
    1
      src/routes/menus.jsx
  10. 25
    3
      src/routes/routes.jsx

+ 1
- 0
index.html Ver fichero 

@@ -4,6 +4,7 @@
4 4 
     <meta charset="UTF-8" />
5 5 
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
6 6 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
7 
+    <script src="/config.js"></script>
7 8 
     <title>海安军供保障信息管理系统</title>
8 9 
   </head>
9 10 
   <body>

+ 6
- 0
public/config.js Ver fichero 

@@ -0,0 +1,6 @@
1 
+
2 
+// 大华监控
3 
+DH_MONITOR = 'http://192.168.3.2';
4 
+
5 
+// 海康监控
6 
+HK_MONITOR = 'http://192.168.3.2';

+ 2
- 2
src/components/evaluateItem/index.jsx Ver fichero 

@@ -5,8 +5,8 @@ function MyEditor(props) {
5 5 
     // value,
6 6 
     // onChange = (e) => {},
7 7 
     options = [
8 
-      { value: 2, label: "优" },
9 
-      { value: 1, label: "良" },
8 
+      { value: 2, label: "满意" },
9 
+      { value: 1, label: "一般" },
10 10 
       { value: 0, label: "差" },
11 11 
     ],
12 12 
     ...leftProps

+ 17
- 1
src/index.less Ver fichero 

@@ -45,7 +45,23 @@ html, body, #root {
45 45
46 46 
   .ant-menu {
47 47 
     font-size: 16px;
48 
-    background: var(--theme-color);
48 
+    background: #0D267C;
49 
+  }
50 
+
51 
+  .ant-menu-item {
52 
+    overflow: hidden;
53 
+    border-top-right-radius: 20px;
54 
+    border-bottom-right-radius: 20px;
55 
+  }
56 
+
57 
+  .ant-menu-title-content {
58 
+    padding-left: 2em;
59 
+  }
60 
+
61 
+  &.ant-layout-sider-collapsed {
62 
+    .ant-menu-title-content {
63 
+      padding-left: 0;
64 
+    }
49 65 
   }
50 66 
 }
51 67

+ 1
- 1
src/layouts/AuthLayout/components/Footer.jsx Ver fichero 

@@ -11,6 +11,6 @@ export default (props) => {
11 11 
   const copyRight = `${app.company} @ ${year}`
12 12
13 13 
   return (
14 
-    <Footer style={{ textAlign: 'center' }}>{copyRight}</Footer>
14 
+    <Footer style={{ textAlign: 'center', color: 'rgba(0,0,0, 0.3)' }}>{copyRight}</Footer>
15 15 
   )
16 16 
 }

+ 1
- 1
src/layouts/AuthLayout/components/SiderBar.jsx Ver fichero 

@@ -13,7 +13,7 @@ export default (props) => {
13 13 
   }, []);
14 14
15 15 
   return (
16 
-    <Sider className='layout-sidebar' theme={theme} collapsible width={width}>
16 
+    <Sider className='layout-sidebar' theme={theme} width={width}>
17 17 
       <Menus theme={theme} items={menus} location={location} />
18 18 
     </Sider>
19 19 
   );

+ 1
- 1
src/layouts/Container.jsx Ver fichero 

@@ -15,7 +15,7 @@ export default (props) => {
15 15
16 16 
   return (
17 17 
     <div style={style}>
18 
-      {/* { meta.title && !meta.noLayout && <Title level={4} style={{ paddingBottom: '12px' }}>{ meta.title }</Title> } */}
18 
+      { meta.title && !meta.noLayout && <Title level={4} style={{ paddingBottom: '12px' }}>{ meta.title }</Title> }
19 19 
       <Outlet />
20 20 
     </div>
21 21 
   )

+ 9
- 7
src/pages/evaluate/evaluateList/index.jsx Ver fichero 

@@ -18,16 +18,17 @@ const EvaluateList = (props) => {
18 18 
   const formRef = useRef();
19 19
20 20 
   const  valueEnum= {
21 
-    2: { text: "优", status: "Success" },
22 
-    1: { text: "良", status: "Processing" },
23 
-    0: { text: "差", status: "Default" },
21 
+    2: { text: "满意", status: "Success" },
22 
+    1: { text: "一般", status: "Processing" },
23 
+    0: { text: "差", status: "Error" },
24 24 
   }
25 25
26 26 
   const columns = [
27 
-    // {
28 
-    //   title: "任务ID",
29 
-    //   dataIndex: "taskId",
30 
-    // },
27 
+    {
28 
+      title: "日期",
29 
+      dataIndex: "createDate",
30 
+      valueType: 'date',
31 
+    },
31 32
32 33 
     {
33 34 
       title: "服务质量",
 
@@ -75,6 +76,7 @@ const EvaluateList = (props) => {
75 76 
         search={false}
76 77 
         params={{ taskId: id }}
77 78 
         rowKey="id"
79 
+        headerTitle={<Link to={-1}>返回</Link>}
78 80 
         toolBarRender={() => [
79 81 
           <AddeValuate
80 82 
             taskId={id}

+ 4
- 1
src/routes/menus.jsx Ver fichero 

@@ -30,7 +30,10 @@ export const getMenuItems = (routes = [], fullPath = '/') => {
30 30 
     // 坑爹 react-router v6 不支持 hash 路由的 target 跳转
31 31 
     const label = target === '_blank' ?
32 32 
       <a href={`${window.location.pathname}#${path}`} target={target}>{title}</a>
33 
-      : <Link to={path} target={target}>{title}</Link>;
33 
+      : (
34 
+        path.indexOf('http') === 0  ? <a href={path} target="_blank">{title}</a>
35 
+        : <Link to={path} target={target}>{title}</Link>
36 
+      );
34 37
35 38 
     return Object.assign(
36 39 
       {

+ 25
- 3
src/routes/routes.jsx Ver fichero 

@@ -78,7 +78,7 @@ export const authRoutes = [
78 78 
         path: "guaranteeTask",
79 79 
         element: <GuaranteeTaskList />,
80 80 
         meta: {
81 
-          title: "任务通报",
81 
+          title: "军供通报",
82 82 
         },
83 83 
       },
84 84 
       {
 
@@ -186,7 +186,7 @@ export const authRoutes = [
186 186 
         path: "rotationChart/list",
187 187 
         element: <RotationChartList />,
188 188 
         meta: {
189 
-          title: "公告内容",
189 
+          title: "公告管理",
190 190 
         },
191 191 
       },
192 192 
       {
 
@@ -194,6 +194,7 @@ export const authRoutes = [
194 194 
         element: <RotationChartEdit />,
195 195 
         meta: {
196 196 
           title: "公告维护",
197 
+          hideInMenu: true,
197 198 
         },
198 199 
       },
199 200 
       {
 
@@ -337,6 +338,20 @@ export const authRoutes = [
337 338 
         index: true,
338 339 
         element: <Navigate to="stockClassification/list" replace />,
339 340 
       },
341 
+      {
342 
+        path: DH_MONITOR,
343 
+        element: null,
344 
+        meta: {
345 
+          title: "大华监控",
346 
+        },
347 
+      },
348 
+      {
349 
+        path: DH_MONITOR,
350 
+        element: null,
351 
+        meta: {
352 
+          title: "海康监控",
353 
+        },
354 
+      },
340 355 
       {
341 356 
         path: "stockClassification/list",
342 357 
         element: <StockClassificationList />,
 
@@ -356,7 +371,7 @@ export const authRoutes = [
356 371 
         path: "log",
357 372 
         element: <StockLog />,
358 373 
         meta: {
359 
-          title: "操作日志",
374 
+          title: "库存日志",
360 375 
         },
361 376 
       },
362 377 
       {
 
@@ -396,6 +411,13 @@ export const authRoutes = [
396 411 
           hideInMenu: true,
397 412 
         },
398 413 
       },
414 
+      {
415 
+        path: "foo",
416 
+        element: null,
417 
+        meta: {
418 
+          title: "操作手册",
419 
+        },
420 
+      }
399 421 
     ],
400 422 
   },
401 423 
 ];