Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/smartBuilding

董国庆

2026-04-01 e9b0ca9a24dc7f0a93183ef9596b738c9dcb0b91

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/smartBuilding

 estate-frontend-v2024/src/views/business/check.jsx

@@ -23,6 +23,9 @@
  }

  getEntityList(pageInfo, listBody) {
    if (listBody.startDate) {
      listBody.time = listBody.startDate + " - " + listBody.endDate;
    }
    return getCheckList(pageInfo, listBody);
  }

@@ -41,6 +44,10 @@
    })
  }

  getRangePickerShowTime() {
    return true
  }

  handleImagePreviewClose = () => {
    this.setState({
      imagePreviewVisible: false

 estate-frontend-v2024/src/views/business/correctPractice.jsx

@@ -32,6 +32,10 @@
        }
    }

    getRangePickerShowTime() {
        return false
    }

    getEntityList(pageInfo, listBody) {
        return getCorrectPracticeList(pageInfo, listBody)
    }
@@ -114,6 +118,7 @@
    }

    getTitle() {
        const showTime = this.getRangePickerShowTime && this.getRangePickerShowTime()
        return (
            <div className="title flex">
                <div>
@@ -174,7 +179,7 @@
                    &nbsp;
                    &nbsp;
                    <LocaleProvider locale={zh_CN}>
                        <RangePicker onChange={(date, dateString) => {
                        <RangePicker {...(showTime ? { showTime: true } : {})} onChange={(date, dateString) => {
                            this.handleListBodyDateRangeChange(dateString[0], dateString[1])
                        }} />
                    </LocaleProvider>

 estate-frontend-v2024/src/views/business/forms/edit-project-form.jsx

@@ -390,7 +390,7 @@
    }

    render() {
        const { visible, onCancel, onOk, form, currentRowData } = this.props;
        const { visible, onCancel, onOk, form, currentRowData, confirmLoading } = this.props;
        const { getFieldDecorator } = form;
        const { name, type, usageType, departmentPath, client, constructionLicense, itemCode, branchCompany, constructionCompanyInfo, supervisorCompanyInfo, developmentCompanyInfo, addressInfo, projectCost, scale } = this.state.editableData;
        return (
@@ -399,6 +399,7 @@
                visible={visible}
                onCancel={onCancel}
                onOk={onOk}
                confirmLoading={confirmLoading}
                width={900}
                destroyOnClose
            >
@@ -680,15 +681,16 @@
                    </div>
                    <div style={{ padding: '0 10px' }}>
                        <div style={{ marginBottom: 10, display: 'flex' }}>
                            <Input
                                placeholder="请输入搜索关键字"
                                value={this.state.keyword}
                                onChange={(e) => this.setState({ keyword: e.target.value })}
                                style={{ marginRight: 10 }}
                            />
                            <div style={{ flex: 1, marginRight: 10 }}>
                                <Input
                                    placeholder="请输入搜索关键字"
                                    value={this.state.keyword}
                                    onChange={(e) => this.setState({ keyword: e.target.value })}
                                />
                                <div id="mapContainer" className="mapBox" style={{ height: '400px', width: '100%', border: '1px solid #d9d9d9', marginTop: 10 }}></div>
                            </div>
                            <Button type="primary" onClick={this.handleSearch}>搜索</Button>
                        </div>
                        <div id="mapContainer" className="mapBox" style={{ height: '400px', width: '100%', border: '1px solid #d9d9d9' }}></div>
                    </div>
                </Form>
            </Modal>

 estate-frontend-v2024/src/views/business/onDuty.jsx

@@ -24,7 +24,14 @@
    }
  }

  getRangePickerShowTime() {
    return true
  }

  getEntityList(pageInfo, listBody) {
    if (listBody.startDate) {
      listBody.time = listBody.startDate + " - " + listBody.endDate;
    }
    return getDuty(pageInfo, listBody);
  }


 screen/src/view/projectHome/index.vue

@@ -661,7 +661,8 @@
      // 项目风险趋势数据
      riskTrendData: {
        xAxisData: [],
        seriesData: []
        seriesData: [],
        statusData: [],
      },
      // 9各分项隐患趋势 10隐患数量 11设备数量 12查看报告入口 13人员在岗率 14重大风险源 15 项目风险趋势
      permissionProject:
@@ -1982,8 +1983,9 @@
          this.riskTrendData.seriesData = res.map((item) => {
            const value = this.levelToValue(item.level)

            return value
          })
            return value;
          });
          this.riskTrendData.statusData = res.map((item) => item.status);

          // 更新图表
          this.updateRiskChart()
@@ -1991,8 +1993,9 @@
      } catch (error) {
        console.error('获取项目风险趋势失败:', error)
        // 设置默认值，确保图表可以正常显示
        this.riskTrendData.xAxisData = []
        this.riskTrendData.seriesData = []
        this.riskTrendData.xAxisData = [];
        this.riskTrendData.seriesData = [];
        this.riskTrendData.statusData = [];
      }
    },
    // 更新风险趋势图表
@@ -2064,7 +2067,14 @@
            }
          },
          axisLabel: {
            color: '#fff',
            color: function (value, index) {
              const status =
                Array.isArray(self.riskTrendData.statusData) &&
                typeof index === "number"
                  ? self.riskTrendData.statusData[index]
                  : undefined;
              return Number(status) === 2 ? "#999" : "#fff";
            },
            fontSize: 12,
            interval: 0,
            rotate: 0,
@@ -2204,7 +2214,14 @@
            }
          },
          axisLabel: {
            color: '#fff',
            color: function (value, index) {
              const status =
                Array.isArray(this.riskTrendData.statusData) &&
                typeof index === "number"
                  ? this.riskTrendData.statusData[index]
                  : undefined;
              return Number(status) === 2 ? "#999" : "#fff";
            },
            fontSize: 12,
            interval: 0, // 强制显示所有标签
            rotate: 0, // 不旋转