Merge remote-tracking branch 'origin/master'

CZT

2023-11-03 2d036d97788c6a489d573386da4a1534e20bed99

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml

@@ -32,10 +32,66 @@
      <PropertyDef name="yglx">
        <Property></Property>
        <Property name="label">油灌类型</Property>
        <Property name="mapping">
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">501</Property>
                <Property name="value">立式油罐</Property>
              </Entity>
              <Entity>
                <Property name="key">502</Property>
                <Property name="value">卧式油罐</Property>
              </Entity>
              <Entity>
                <Property name="key">503</Property>
                <Property name="value">油槽（池）</Property>
              </Entity>
              <Entity>
                <Property name="key">504</Property>
                <Property name="value">地下油罐</Property>
              </Entity>
              <Entity>
                <Property name="key">505</Property>
                <Property name="value">其他</Property>
              </Entity>
            </Collection>
          </Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="ykdj">
        <Property></Property>
        <Property name="label">油灌等级</Property>
        <Property name="mapping">
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">一级</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">二级</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">三级</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">四级</Property>
              </Entity>
              <Entity>
                <Property name="key">5</Property>
                <Property name="value">五级</Property>
              </Entity>
            </Collection>
          </Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="ygor">
        <Property name="dataType">Double</Property>
@@ -64,10 +120,82 @@
      <PropertyDef name="ygzt">
        <Property></Property>
        <Property name="label">油罐状态</Property>
        <Property name="mapping">
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">完好</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">需小修</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">需大修</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">待报废</Property>
              </Entity>
              <Entity>
                <Property name="key">5</Property>
                <Property name="value">待拆除</Property>
              </Entity>
              <Entity>
                <Property name="key">6</Property>
                <Property name="value">长期闲置</Property>
              </Entity>
              <Entity>
                <Property name="key">9</Property>
                <Property name="value">其他</Property>
              </Entity>
            </Collection>
          </Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="ygsyzt">
        <Property></Property>
        <Property name="label">油罐使用状态</Property>
        <Property name="mapping">
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">空仓</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">占用</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">满仓</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">入库中</Property>
              </Entity>
              <Entity>
                <Property name="key">5</Property>
                <Property name="value">出库中</Property>
              </Entity>
              <Entity>
                <Property name="key">6</Property>
                <Property name="value">维修</Property>
              </Entity>
              <Entity>
                <Property name="key">9</Property>
                <Property name="value">其他</Property>
              </Entity>
            </Collection>
          </Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
        <Property></Property>
@@ -367,6 +495,7 @@
          <AutoFormElement>
            <Property name="name">sfyx</Property>
            <Property name="property">sfyx</Property>
            <Property name="trigger">listDropYN</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>