浏览代码

修复bug

魏熙美 5 年前
父节点
当前提交
952f15c544

+ 4
- 0
src/components/SelectButton/BuildSelect.jsx 查看文件

35
   const getCityList = (e) => {
35
   const getCityList = (e) => {
36
     request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
36
     request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
37
         setData(data.records)
37
         setData(data.records)
38
+        // 默认选中第一个
39
+        if ((!preProps || !preProps.one) && props.one === 'true') {
40
+          setValue(data.records[0].buildingId)
41
+        }
38
     })
42
     })
39
   }
43
   }
40
 
44
 

+ 7
- 7
src/pages/building/list/add/components/base.jsx 查看文件

120
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
120
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
121
           </Form.Item>
121
           </Form.Item>
122
           <Form.Item label="电话" hasFeedback>
122
           <Form.Item label="电话" hasFeedback>
123
-            {getFieldDecorator('tel',{
124
-              initialValue:'',
125
-              rules:[
123
+            {getFieldDecorator('tel', {
124
+              initialValue: '',
125
+              rules: [
126
                   {
126
                   {
127
-                      pattern:new RegExp('^1[0-9]{10}$'),
128
-                      message:'请输入正确的电话号码'
129
-                  }
130
-              ]
127
+                      pattern: new RegExp('^1[0-9]{10}$'),
128
+                      message: '请输入正确的电话号码',
129
+                  },
130
+              ],
131
             })(<Input />)}
131
             })(<Input />)}
132
           </Form.Item>
132
           </Form.Item>
133
           <Form.Item label="项目动态" hasFeedback>
133
           <Form.Item label="项目动态" hasFeedback>

+ 5
- 5
src/pages/building/type/index.jsx 查看文件

35
       dataIndex: 'row',
35
       dataIndex: 'row',
36
       key: 'row',
36
       key: 'row',
37
       render: (_, record) => (
37
       render: (_, record) => (
38
-        <span onClick={() => deleteType(record)}>
39
-          <span style={{
38
+        <span >
39
+          <Button type="link" style={{
40
             color: '#FF4A4A', right: '0',
40
             color: '#FF4A4A', right: '0',
41
-          }} >
41
+          }} onClick={() => deleteType(record)}>
42
             删除
42
             删除
43
-          <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
44
-          </span>
43
+            <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
44
+          </Button>
45
         </span>
45
         </span>
46
       ),
46
       ),
47
     },
47
     },

+ 1
- 1
src/pages/indexEcharts/components/UserBehavior.jsx 查看文件

265
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
265
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
266
         </p>
266
         </p>
267
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
267
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
268
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
268
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} one="true"></BuildSelect>}
269
         </div>
269
         </div>
270
         <EChart options={options} style={style} />
270
         <EChart options={options} style={style} />
271
         {props.tableShow &&
271
         {props.tableShow &&