H5/smartBuilding.git

parent: ab6de8cd | 补丁 | 提交 | ignore whitespace

hejianhao

2026-02-02 f19196c99d6b1e42f65cd445e905496f88f8ce75

fix: 统一吊篮危险类型名称并调整表单布局

- 将“高处作业吊篮”统一改为“吊篮”以保持术语一致性
- 在项目危险类型映射中添加缺失的吊篮超危工程类型
- 移除表单中多余的样式属性，改用网格间距控制布局

4个文件已修改

	estate-frontend-v2024/src/views/business/static/general.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	estate-frontend-v2024/src/views/common/constants.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	estate-frontend-v2024/src/views/screenSetting/forms/edit-accidentMessage-form.jsx	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen/src/utils/riskSourceMap.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 estate-frontend-v2024/src/views/business/static/general.js

@@ -9,6 +9,7 @@
        'GROUND_STEEL_PIPE_SCAFFOLD': '落地式钢管脚手架工程',
        'SUSPENDED_ASCENDING_SCAFFOLD': '附着式升降脚手架工程',
        'CANTILEVER_SCAFFOLD': '悬挑式脚手架工程',
        'HIGH_ALTITUDE_OPERATION_GONDOLA': '吊篮',
        'DEMOLITION': '拆除工程',
        'MINING_UNDERGROUND': '矿山法暗挖',
        'SHIELD_TUNNELING': '盾构',
@@ -30,7 +31,7 @@
        'GROUND_PIPE_SCAFFOLD': '落地式钢管脚手架工程',
        'SUSPENDED_SCAFFOLD': '附着式升降脚手架工程',
        'CANTILEVER_SCAFFOLD': '悬挑式脚手架工程',
        'HIGH_ALTITUDE_OPERATION_GONDOLA': '高处作业吊篮',
        'HIGH_ALTITUDE_OPERATION_GONDOLA': '吊篮',
        'UNLOADING_PLATFORM_OPERATION_PLATFORM': '卸料平台操作平台工程',
        'IRREGULAR_SCAFFOLD': '异型脚手架工程',
        'DEMOLITION': '拆除工程',

 estate-frontend-v2024/src/views/common/constants.js

@@ -240,6 +240,7 @@
    GROUND_STEEL_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
    SUSPENDED_ASCENDING_SCAFFOLD: '附着式升降脚手架工程',
    CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
    HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
    DEMOLITION: '拆除工程',
    MINING_UNDERGROUND: '矿山法暗挖',
    SHIELD_TUNNELING: '盾构',
@@ -262,7 +263,7 @@
    GROUND_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
    SUSPENDED_SCAFFOLD: '附着式升降脚手架工程',
    CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
    HIGH_ALTITUDE_OPERATION_GONDOLA: '高处作业吊篮',
    HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
    UNLOADING_PLATFORM_OPERATION_PLATFORM: '卸料平台操作平台工程',
    IRREGULAR_SCAFFOLD: '异型脚手架工程',
    DEMOLITION: '拆除工程',

 estate-frontend-v2024/src/views/screenSetting/forms/edit-accidentMessage-form.jsx

@@ -287,13 +287,13 @@
          labelCol={{ style: { width: "100%", height: "30px" } }}
          labelAlign="left"
        >
          <div className="grid grid-1-1-1">
          <div className="grid grid-1-1-1" style={{ gap: "10px" }}>
            <Form.Item label="标题">
              {getFieldDecorator("title", {
                rules: [{ required: true, message: "请输入标题!" }],
                initialValue: title,
                onChange: this.handleFieldChange("title"),
              })(<Input style={inputLongStyle} placeholder="请输入标题" />)}
              })(<Input  placeholder="请输入标题" />)}
            </Form.Item>

            <Form.Item label="类别">
@@ -302,7 +302,7 @@
                initialValue: classifyId,
                onChange: this.handleFieldChange("classifyId"),
              })(
                <Select style={inputLongStyle} placeholder="请选择类别">
                <Select  placeholder="请选择类别">
                  {this.state.classificationOptions.map(option => (
                    <Option key={option.id} value={option.id}>{option.name}</Option>
                  ))}
@@ -321,7 +321,7 @@
                  loadData={this.onLoadData}
                  changeOnSelect
                  placeholder="请选择发生城市"
                  style={inputLongStyle}
                  
                />
              )}
            </Form.Item>
@@ -333,7 +333,7 @@
                onChange: this.handleFieldChange("casualties"),
              })(
                <Input
                  style={inputLongStyle}
                  
                  placeholder="请输入伤亡情况"
                />,
              )}
@@ -380,7 +380,7 @@
                rules: [{ required: true, message: "请输入情况简述!" }],
                initialValue: content,
                onChange: this.handleFieldChange("content"),
              })(<Input style={inputLongStyle} placeholder="请输入情况简述" />)}
              })(<Input  placeholder="请输入情况简述" />)}
            </Form.Item>

            <Form.Item label="发生时间">

 screen/src/utils/riskSourceMap.js

@@ -14,6 +14,7 @@
  GROUND_STEEL_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
  SUSPENDED_ASCENDING_SCAFFOLD: '附着式升降脚手架工程',
  CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
  HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
  DEMOLITION: '拆除工程',
  MINING_UNDERGROUND: '矿山法暗挖',
  SHIELD_TUNNELING: '盾构',
@@ -37,7 +38,7 @@
  GROUND_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
  SUSPENDED_SCAFFOLD: '附着式升降脚手架工程',
  CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
  HIGH_ALTITUDE_OPERATION_GONDOLA: '高处作业吊篮',
  HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
  UNLOADING_PLATFORM_OPERATION_PLATFORM: '卸料平台操作平台工程',
  IRREGULAR_SCAFFOLD: '异型脚手架工程',
  DEMOLITION: '拆除工程',

			@@ -9,6 +9,7 @@
			'GROUND_STEEL_PIPE_SCAFFOLD': '落地式钢管脚手架工程',
			'SUSPENDED_ASCENDING_SCAFFOLD': '附着式升降脚手架工程',
			'CANTILEVER_SCAFFOLD': '悬挑式脚手架工程',
			'HIGH_ALTITUDE_OPERATION_GONDOLA': '吊篮',
			'DEMOLITION': '拆除工程',
			'MINING_UNDERGROUND': '矿山法暗挖',
			'SHIELD_TUNNELING': '盾构',
			@@ -30,7 +31,7 @@
			'GROUND_PIPE_SCAFFOLD': '落地式钢管脚手架工程',
			'SUSPENDED_SCAFFOLD': '附着式升降脚手架工程',
			'CANTILEVER_SCAFFOLD': '悬挑式脚手架工程',
			'HIGH_ALTITUDE_OPERATION_GONDOLA': '高处作业吊篮',
			'HIGH_ALTITUDE_OPERATION_GONDOLA': '吊篮',
			'UNLOADING_PLATFORM_OPERATION_PLATFORM': '卸料平台操作平台工程',
			'IRREGULAR_SCAFFOLD': '异型脚手架工程',
			'DEMOLITION': '拆除工程',

			@@ -240,6 +240,7 @@
			GROUND_STEEL_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
			SUSPENDED_ASCENDING_SCAFFOLD: '附着式升降脚手架工程',
			CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
			HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
			DEMOLITION: '拆除工程',
			MINING_UNDERGROUND: '矿山法暗挖',
			SHIELD_TUNNELING: '盾构',
			@@ -262,7 +263,7 @@
			GROUND_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
			SUSPENDED_SCAFFOLD: '附着式升降脚手架工程',
			CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
			HIGH_ALTITUDE_OPERATION_GONDOLA: '高处作业吊篮',
			HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
			UNLOADING_PLATFORM_OPERATION_PLATFORM: '卸料平台操作平台工程',
			IRREGULAR_SCAFFOLD: '异型脚手架工程',
			DEMOLITION: '拆除工程',

			@@ -287,13 +287,13 @@
			labelCol={{ style: { width: "100%", height: "30px" } }}
			labelAlign="left"
			>
			<div className="grid grid-1-1-1">
			<div className="grid grid-1-1-1" style={{ gap: "10px" }}>
			<Form.Item label="标题">
			{getFieldDecorator("title", {
			rules: [{ required: true, message: "请输入标题!" }],
			initialValue: title,
			onChange: this.handleFieldChange("title"),
			})(<Input style={inputLongStyle} placeholder="请输入标题" />)}
			})(<Input placeholder="请输入标题" />)}
			</Form.Item>

			<Form.Item label="类别">
			@@ -302,7 +302,7 @@
			initialValue: classifyId,
			onChange: this.handleFieldChange("classifyId"),
			})(
			<Select style={inputLongStyle} placeholder="请选择类别">
			<Select placeholder="请选择类别">
			{this.state.classificationOptions.map(option => (
			<Option key={option.id} value={option.id}>{option.name}</Option>
			))}
			@@ -321,7 +321,7 @@
			loadData={this.onLoadData}
			changeOnSelect
			placeholder="请选择发生城市"
			style={inputLongStyle}

			/>
			)}
			</Form.Item>
			@@ -333,7 +333,7 @@
			onChange: this.handleFieldChange("casualties"),
			})(
			<Input
			style={inputLongStyle}

			placeholder="请输入伤亡情况"
			/>,
			)}
			@@ -380,7 +380,7 @@
			rules: [{ required: true, message: "请输入情况简述!" }],
			initialValue: content,
			onChange: this.handleFieldChange("content"),
			})(<Input style={inputLongStyle} placeholder="请输入情况简述" />)}
			})(<Input placeholder="请输入情况简述" />)}
			</Form.Item>

			<Form.Item label="发生时间">

			@@ -14,6 +14,7 @@
			GROUND_STEEL_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
			SUSPENDED_ASCENDING_SCAFFOLD: '附着式升降脚手架工程',
			CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
			HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
			DEMOLITION: '拆除工程',
			MINING_UNDERGROUND: '矿山法暗挖',
			SHIELD_TUNNELING: '盾构',
			@@ -37,7 +38,7 @@
			GROUND_PIPE_SCAFFOLD: '落地式钢管脚手架工程',
			SUSPENDED_SCAFFOLD: '附着式升降脚手架工程',
			CANTILEVER_SCAFFOLD: '悬挑式脚手架工程',
			HIGH_ALTITUDE_OPERATION_GONDOLA: '高处作业吊篮',
			HIGH_ALTITUDE_OPERATION_GONDOLA: '吊篮',
			UNLOADING_PLATFORM_OPERATION_PLATFORM: '卸料平台操作平台工程',
			IRREGULAR_SCAFFOLD: '异型脚手架工程',
			DEMOLITION: '拆除工程',