Merge remote-tracking branch 'origin/master'

zhangherong

2025-06-02 d0223045d2dd1cccc26c995c972e80e60bd19b26

 src/views/system/WorkshopSignageManagement.vue

@@ -9,7 +9,7 @@
            <a-row :gutter="24">
              <a-col :md="8" :sm="8">
                <a-form-item label="车间名称" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19}">
                  <a-input placeholder="" v-model="queryParam.workshopName"></a-input>
                  <a-input placeholder="请输入车间名称" v-model="queryParam.workshopName"></a-input>
                </a-form-item>
              </a-col>
              <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -85,7 +85,7 @@
            <a-row :gutter="24">
              <a-col :md="12" :sm="12">
                <a-form-item label="统一编码">
                  <a-input placeholder="" v-model="queryParam2.equipmentId"></a-input>
                  <a-input placeholder="请输入统一编码" v-model="queryParam2.equipmentId"></a-input>
                </a-form-item>
              </a-col>
              <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -252,7 +252,7 @@
          width: 120,
        },
        {
          title: '设备名称',
          title: '安装位置',
          align: 'center',
          width: 100,
          dataIndex: 'equipmentName',