Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

.gitignore

@@ -8,6 +8,7 @@ _roadhog-api-doc
 
 # production
 /dist
+/static
 
 # misc
 .DS_Store

src/components/InitForm/EditTable/index.jsx

@@ -164,6 +164,7 @@ const EditTable = (props) => {
       }}
       search={{
         filterType: 'light', //轻量模式
+        placement: 'bottomLeft'
       }}
     />
   );

src/pages/check/plan/columns.js

@@ -248,6 +248,7 @@ function getcolumns(setdrawer) {
                     path: '/asset/equipment/list/user/shop',
                     columns,
                     hideInDescriptions: true,
+                    rowName: "equipmentNo"
                 },
             ],
             pathconfig: {

src/pages/check/task/columns.js

@@ -219,6 +219,7 @@ function getcolumns(setdrawer) {
                     dataIndex: 'checkStartTime',
                     key: 'checkStartTime',
                     hideInForm: true,
+                    hideInSearch: true,
                 },
                 {
                     title: '点检人员',
@@ -232,8 +233,9 @@ function getcolumns(setdrawer) {
                         params: {},
                     },
                     fieldProps: {
-                        dropdownMatchSelectWidth: 100
-                    }
+                        placeholder: '请选择',
+                        showSearch: true,
+                    },
                 },
                 {
                     title: '状态',
@@ -370,6 +372,7 @@ function getcolumns(setdrawer) {
                     dataIndex: 'checkStartTime',
                     key: 'checkStartTime',
                     hideInForm: true,
+                    hideInSearch: true,
                 },
                 {
                     title: '关单时间',
@@ -392,8 +395,9 @@ function getcolumns(setdrawer) {
                         params: {},
                     },
                     fieldProps: {
-                        dropdownMatchSelectWidth: 100
-                    }
+                        placeholder: '请选择',
+                        showSearch: true,
+                    },
                 },
                 {
                     title: '状态',

src/pages/check/task/index.jsx

@@ -461,6 +461,9 @@ function Task(props) {
                       dataIndex: 'result',
                       key: 'result',
                       hideInForm: true,
+                      render: (text, row, _, action) => {
+                        return <span>{row.judgeType == 1 ? row.result == 1 ? "正常" : "异常" : row.result}</span>
+                      }
                     },
                     {
                       title: '下限值',

src/pages/maintain/plan/index.jsx

@@ -596,7 +596,6 @@ function Plan(props) {
         }}
         {...drawer}
         onFinish={async (vals) => {
-          console.log(vals);
           let params = JSON.parse(JSON.stringify(vals));
           params.equipmentList = vals?.paramList?.map((it) => {
             return {
@@ -610,7 +609,6 @@ function Plan(props) {
             message.warning('下次保养日期必填！');
             return;
           }
-          console.log(params);
           if (drawer?.val == 'add') {
             await runAsync({ url: pathconfig?.add || '/add', params: { ...params } });
           } else if (drawer?.val == 'edit') {