Merge branch 'feature_1.0'

quanyawei

2024-08-28 247dacca9784396eeaf17ef3e85c7ae646b786e4

Merge branch 'feature_1.0'

 src/views/list/road.vue

@@ -28,9 +28,6 @@
        <a-button type="primary" style="margin-left: 10px" @click="selectCheck"

          >校验</a-button

        >

        <a-button type="primary" style="margin-left: 10px" @click="reosurce"

          >添加路段信息</a-button

        >

      </div>

      <div class="left-five">

        <a-input

@@ -44,12 +41,6 @@
        <a-button type="primary" style="margin-left: 10px" @click="clearPolygon"

          >清除绘制</a-button

        >

        <a-button

          type="primary"

          style="margin-left: 10px"

          @click="showAllPolygon"

          >显示所有矩形</a-button

        >

      </div>

      <div class="left-two">

        <a-table

@@ -62,6 +53,15 @@
        ></a-table>

      </div>

      <div class="left-three" style="margin-top: 20px">

        <a-button type="primary" style="margin-left: 10px" @click="reosurce"

          >添加路段信息</a-button

        >

        <a-button

          type="primary"

          style="margin-left: 10px"

          @click="showAllPolygon"

          >显示所有矩形</a-button

        >

        <a-button

          v-show="upa === ''"

          type="primary"

@@ -317,16 +317,10 @@


  private opRender(text: string, record: any, index: number) {

    return (

      <div style="width:180px">

      <div style="width:180px;text-align:left">

        <a onClick={() => this.handleEditModalVisible(record)}> 编辑 </a>

        <a-divider type="vertical" />

        <a onClick={() => this.handleEditbatch(record)}> 批量添加 </a>

        <a-divider type="vertical" />

        <a onClick={() => this.canvasbatch(record)}> 绘制批量添加 </a>

        <a-divider type="vertical" />

        <a onClick={() => this.handleEditCanves(record)}> 添加矩形 </a>

        <a-divider type="vertical" />

        <a onClick={() => this.handleShowPolygon(record)}> 显示矩形 </a>

        <a-divider type="vertical" />

        <a-popconfirm

          title="确认删除吗？"

@@ -336,6 +330,12 @@
        >

          <a href="#">删除</a>

        </a-popconfirm>

        <br></br>

        <a onClick={() => this.canvasbatch(record)}> 绘制批量添加 </a>

        <a-divider type="vertical" />

        <a onClick={() => this.handleEditCanves(record)}> 添加矩形 </a>

        <br></br>

        <a onClick={() => this.handleShowPolygon(record)}> 显示矩形 </a>

      </div>

    );

  }