zhoulisen 5 年前
父节点
当前提交
9176dde770
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 1
    1
      config/config.js
  2. 4
    6
      src/pages/resource/openScreen/edit.jsx

+ 1
- 1
config/config.js 查看文件

133
 
133
 
134
   proxy: {
134
   proxy: {
135
     '/api': {
135
     '/api': {
136
-      target: 'http://192.168.2.49:8080/',
136
+      target: 'http://192.168.2.51:8080/',
137
       changeOrigin: true,
137
       changeOrigin: true,
138
       // pathRewrite: { '^/server': '' },
138
       // pathRewrite: { '^/server': '' },
139
     },
139
     },

+ 4
- 6
src/pages/resource/openScreen/edit.jsx 查看文件

245
     }
245
     }
246
 
246
 
247
     function disabledDate(current) {
247
     function disabledDate(current) {
248
-        // Can not select days before today and today
249
-        // console.log(current && current < moment().endOf('day'))
250
-        // console.log(current)
248
+        
251
         return current && current < moment().startOf('day');
249
         return current && current < moment().startOf('day');
252
     }
250
     }
253
 
251
 
295
         },
293
         },
296
         {
294
         {
297
             label: '关联业务',
295
             label: '关联业务',
298
-            name: 'targetName',
296
+            name: 'sampleName',
299
             // value: data.targetId,
297
             // value: data.targetId,
300
             //   type: FieldTypes.Text,
298
             //   type: FieldTypes.Text,
301
             render: <div style={{ color: 'blue' }} onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample, '13')}</div>,
299
             render: <div style={{ color: 'blue' }} onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample, '13')}</div>,
345
                 // </div>, 
343
                 // </div>, 
346
                 // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
344
                 // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
347
                 <DatePicker
345
                 <DatePicker
348
-                    showToday = {false}
346
+                    // showToday = {false}showTime={{ format: 'HH:mm' }}
349
                     disabledDate={disabledDate}
347
                     disabledDate={disabledDate}
350
                     disabledTime={disabledDateTime}
348
                     disabledTime={disabledDateTime}
351
-                    showTime={{ defaultValue: moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') }}
349
+                    showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
352
 
350
 
353
                 />,
351
                 />,
354
             //         < DatePicker
352
             //         < DatePicker