flx：修复bug

2025-06-04 11:28:25 +08:00 · 2025-06-04 11:28:25 +08:00 · 0720cc409a
commit 0720cc409a
parent 0079017e4d
37 changed files with 60 additions and 55 deletions
--- a/src/views/projectFront/asphaltMixStation/productData.vue
+++ b/src/views/projectFront/asphaltMixStation/productData.vue
@ -420,8 +420,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/concreteMixStation/productData.vue
+++ b/src/views/projectFront/concreteMixStation/productData.vue
@ -409,8 +409,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/crimpingTestMachine/productData.vue
+++ b/src/views/projectFront/crimpingTestMachine/productData.vue
@ -575,8 +575,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/intelligentGrout/productData.vue
+++ b/src/views/projectFront/intelligentGrout/productData.vue
@ -641,8 +641,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/intelligentTension/productData.vue
+++ b/src/views/projectFront/intelligentTension/productData.vue
@ -677,8 +677,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/operationManagement/bridgingChance.vue
+++ b/src/views/projectFront/operationManagement/bridgingChance.vue
@ -98,7 +98,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <template v-if="activeIndex == 0">
                  <el-table-column label="设备名称" align="center" prop="devName" />
                  <el-table-column label="上报时间" align="center" prop="createDate" />
@ -1941,7 +1941,7 @@ export default {
  .el-input-number {
    width: 70px;
  }
-  > div {
+  > div:nth-child(n + 3) {
    margin-top: 12px;
  }
 }
--- a/src/views/projectFront/operationManagement/dstributionBoxMonitoring.vue
+++ b/src/views/projectFront/operationManagement/dstributionBoxMonitoring.vue
@ -93,7 +93,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName" />
                <el-table-column label="上传时间" align="center" prop="uploadTime">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/edgeProtectionInspection.vue
+++ b/src/views/projectFront/operationManagement/edgeProtectionInspection.vue
@ -109,7 +109,7 @@
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
                  <el-table-column
-                    type="selection"
+                    type="selection" align="center"
                    width="55"
                  ></el-table-column>
                  <el-table-column
--- a/src/views/projectFront/operationManagement/edgeProtectionSystem.vue
+++ b/src/views/projectFront/operationManagement/edgeProtectionSystem.vue
@ -109,7 +109,7 @@
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
                  <el-table-column
-                    type="selection"
+                    type="selection" align="center"
                    width="55"
                  ></el-table-column>
                  <el-table-column
--- a/src/views/projectFront/operationManagement/electricityMeterMonitoring.vue
+++ b/src/views/projectFront/operationManagement/electricityMeterMonitoring.vue
@ -93,7 +93,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="ammeterName" />
                <el-table-column label="抄表时间" align="center" prop="addTime">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/elevatorMonitoring.vue
+++ b/src/views/projectFront/operationManagement/elevatorMonitoring.vue
@ -99,7 +99,7 @@
                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <template v-if="activeIndex == 0">
                  <el-table-column
                    width="100"
--- a/src/views/projectFront/operationManagement/environmentalMonitoring.vue
+++ b/src/views/projectFront/operationManagement/environmentalMonitoring.vue
@ -98,7 +98,7 @@
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
                  <el-table-column
-                    type="selection"
+                    type="selection" align="center"
                    width="55"
                  ></el-table-column>
                  <el-table-column
--- a/src/views/projectFront/operationManagement/foundationMonitoring.vue
+++ b/src/views/projectFront/operationManagement/foundationMonitoring.vue
@ -112,7 +112,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column
                  label="基坑名称"
                  align="center"
--- a/src/views/projectFront/operationManagement/gantryCraneMonitoring.vue
+++ b/src/views/projectFront/operationManagement/gantryCraneMonitoring.vue
@ -98,7 +98,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <template v-if="activeIndex == 0">
                  <el-table-column
                    width="100"
--- a/src/views/projectFront/operationManagement/hangingBasketMonitoring.vue
+++ b/src/views/projectFront/operationManagement/hangingBasketMonitoring.vue
@ -98,7 +98,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <template v-if="activeIndex == 0">
                  <el-table-column
                    width="100"
--- a/src/views/projectFront/operationManagement/massConcreteMonitoring.vue
+++ b/src/views/projectFront/operationManagement/massConcreteMonitoring.vue
@ -97,7 +97,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName" />
                <el-table-column label="监测点点位号" align="center" prop="pointNo">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/mechanicalEquipmentPositioning.vue
+++ b/src/views/projectFront/operationManagement/mechanicalEquipmentPositioning.vue
@ -101,7 +101,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="equipmentName">
                  <template #default="{ row }">
                    <span>{{ row.equipmentName }}</span>
--- a/src/views/projectFront/operationManagement/roadSurfaceCompaction.vue
+++ b/src/views/projectFront/operationManagement/roadSurfaceCompaction.vue
@ -98,7 +98,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName">
                  <template #default="{ row }">
                    <span>{{ row.devName }}</span>
@ -1790,8 +1790,8 @@ export default {
          ...this.selectionAreaInfo,
          ...resultScope,
          devSn: this.ruleConfigForm.devSn.join(","),
-          alarmTypes: this.ruleConfigForm.alarmTypes.join(","),
-          workStatuses: this.ruleConfigForm.workStatuses.join(","),
+          // alarmTypes: this.ruleConfigForm.alarmTypes.join(","),
+          // workStatuses: this.ruleConfigForm.workStatuses.join(","),
          projectSn: this.projectSn,
        };
        const objFn = {
--- a/src/views/projectFront/operationManagement/roadSurfacePaving.vue
+++ b/src/views/projectFront/operationManagement/roadSurfacePaving.vue
@ -100,7 +100,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName">
                  <template #default="{ row }">
                    <span>{{ row.devName }}</span>
--- a/src/views/projectFront/operationManagement/sewageMonitoring.vue
+++ b/src/views/projectFront/operationManagement/sewageMonitoring.vue
@ -97,7 +97,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName" />
                <el-table-column label="上传时间" align="center" prop="createDate">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/smartSafetyHelmet.vue
+++ b/src/views/projectFront/operationManagement/smartSafetyHelmet.vue
@ -104,7 +104,7 @@
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
                  <el-table-column
-                    type="selection"
+                    type="selection" align="center"
                    width="55"
                  ></el-table-column>
                  <el-table-column label="设备序号" align="center" prop="devSn">
--- a/src/views/projectFront/operationManagement/smokeDetectorAlarmMonitoring.vue
+++ b/src/views/projectFront/operationManagement/smokeDetectorAlarmMonitoring.vue
@ -93,7 +93,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName" />
                <el-table-column label="报警时间" align="center" prop="alarmTime">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/staffAttendance.vue
+++ b/src/views/projectFront/operationManagement/staffAttendance.vue
@ -125,6 +125,7 @@
                </template>
                  <el-table-column
                    type="selection"
+                    align="center"
                    width="55"
                  ></el-table-column>
                  <el-table-column
--- a/src/views/projectFront/operationManagement/staffVehiclePositioning.vue
+++ b/src/views/projectFront/operationManagement/staffVehiclePositioning.vue
@ -99,7 +99,7 @@
                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                  <el-table-column type="selection" width="55"></el-table-column>
+                  <el-table-column type="selection" align="center" width="55"></el-table-column>
                  <el-table-column label="车辆/人员名称" align="center" prop="type">
                    <template #default="{ row }">
                      <div v-if="row.type === 1">
--- a/src/views/projectFront/operationManagement/standardCuringRoomMonitoring.vue
+++ b/src/views/projectFront/operationManagement/standardCuringRoomMonitoring.vue
@ -93,7 +93,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="laboratoryName" />
                <el-table-column label="上传时间" align="center" prop="receiveTime">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/toolManagement.vue
+++ b/src/views/projectFront/operationManagement/toolManagement.vue
@ -97,7 +97,7 @@
                    description="暂无数据"
                  ></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="toolName" />
                <el-table-column label="上报时间" align="center" prop="entryTime" />
                <el-table-column label="设备状态" align="center" prop="toolStatus">
--- a/src/views/projectFront/operationManagement/towerCraneMonitoring.vue
+++ b/src/views/projectFront/operationManagement/towerCraneMonitoring.vue
@ -99,7 +99,7 @@
              <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <template v-if="activeIndex == 0">
                  <el-table-column
                    width="100"
--- a/src/views/projectFront/operationManagement/toxicGasMonitoring.vue
+++ b/src/views/projectFront/operationManagement/toxicGasMonitoring.vue
@ -93,7 +93,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName" />
                <el-table-column label="上报时间" align="center" prop="uploadTime">
                  <template #default="{ row }">
--- a/src/views/projectFront/operationManagement/tunnelPositioning.vue
+++ b/src/views/projectFront/operationManagement/tunnelPositioning.vue
@ -98,7 +98,7 @@
                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                  <el-table-column type="selection" width="55"></el-table-column>
+                  <el-table-column type="selection" align="center" width="55"></el-table-column>
                  <el-table-column label="标签类型" align="center" prop="cardType">
                    <template #default="{ row }">
                      <span>{{ cardTypeUp(row.cardType) }}</span>
--- a/src/views/projectFront/operationManagement/unloadingPlatformMonitoring.vue
+++ b/src/views/projectFront/operationManagement/unloadingPlatformMonitoring.vue
@ -94,7 +94,7 @@
                                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="devName" />
                <template v-if="activeIndex == 1">
                  <!-- <el-table-column label="是否有报警" align="center" prop="isAlarm">
--- a/src/views/projectFront/operationManagement/waterMeterMonitoring.vue
+++ b/src/views/projectFront/operationManagement/waterMeterMonitoring.vue
@ -93,7 +93,7 @@
                <template slot="empty">
                    <el-empty :image="require('@/assets/images/noData4.png')" :image-size="100" description="暂无数据"></el-empty>
                </template>
-                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="selection" align="center" width="55"></el-table-column>
                <el-table-column label="设备名称" align="center" prop="waterMeterName" />
                <el-table-column label="抄表时间" align="center" prop="addTime">
                  <template #default="{ row }">
--- a/src/views/projectFront/pressureTestMachine/productData.vue
+++ b/src/views/projectFront/pressureTestMachine/productData.vue
@ -499,8 +499,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/quality/inspectionLedger.vue
+++ b/src/views/projectFront/quality/inspectionLedger.vue
@ -2172,13 +2172,14 @@
            </el-form-item>
            <el-form-item label="检查人" prop="inspectManId">
              <el-select
+              @change="dealForm.verifyManId = dealForm.inspectManId"
                v-model="dealForm.inspectManId"
                filterable
                clearable
                :placeholder="$t('message.quality.pleaseSelect')"
              >
-                <el-option
-                  v-for="item in crewUpdateList"
+              <el-option
+                  v-for="item in crewList"
                  :key="item.userId + ''"
                  :label="item.realName"
                  :value="item.userId + ''"
@ -2328,6 +2329,7 @@
                v-model="dealForm.verifyManId"
                filterable
                clearable
+                disabled
                :placeholder="$t('message.quality.pleaseSelect')"
              >
                <el-option
@ -2571,13 +2573,13 @@
              clearable
              :placeholder="$t('message.quality.pleaseSelect')"
            >
-              <el-option
-                v-for="item in crewUpdateList"
-                :key="item.userId + ''"
-                :label="item.realName"
-                :value="item.userId + ''"
-              >
-              </el-option>
+            <el-option
+                  v-for="item in crewList"
+                  :key="item.userId + ''"
+                  :label="item.realName"
+                  :value="item.userId + ''"
+                >
+                </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="检查时间" prop="inspectTime">
--- a/src/views/projectFront/safeSame/inspectionLedger.vue
+++ b/src/views/projectFront/safeSame/inspectionLedger.vue
@ -2168,13 +2168,14 @@
            </el-form-item>
            <el-form-item label="检查人" prop="inspectManId">
              <el-select
+                @change="dealForm.verifyManId = dealForm.inspectManId"
                v-model="dealForm.inspectManId"
                filterable
                clearable
                :placeholder="$t('message.quality.pleaseSelect')"
              >
-                <el-option
-                  v-for="item in crewUpdateList"
+              <el-option
+                  v-for="item in crewList"
                  :key="item.userId + ''"
                  :label="item.realName"
                  :value="item.userId + ''"
@ -2324,6 +2325,7 @@
                v-model="dealForm.verifyManId"
                filterable
                clearable
+                disabled
                :placeholder="$t('message.quality.pleaseSelect')"
              >
                <el-option
@ -2567,13 +2569,13 @@
              clearable
              :placeholder="$t('message.quality.pleaseSelect')"
            >
-              <el-option
-                v-for="item in crewUpdateList"
-                :key="item.userId + ''"
-                :label="item.realName"
-                :value="item.userId + ''"
-              >
-              </el-option>
+            <el-option
+                  v-for="item in crewList"
+                  :key="item.userId + ''"
+                  :label="item.realName"
+                  :value="item.userId + ''"
+                >
+                </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="检查时间" prop="inspectTime">
--- a/src/views/projectFront/towerCrane/wireRopeMonitoring.vue
+++ b/src/views/projectFront/towerCrane/wireRopeMonitoring.vue
@ -259,8 +259,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/universalTestMachine/productData.vue
+++ b/src/views/projectFront/universalTestMachine/productData.vue
@ -619,8 +619,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/projectFront/waterMixStation/productData.vue
+++ b/src/views/projectFront/waterMixStation/productData.vue
@ -787,8 +787,8 @@
        </template>
      </el-form>
      <div slot="footer" style="text-align: center">
-        <el-button type="primary" @click="submitDealForm">确认</el-button>
        <el-button @click="dealFormCancel">取消</el-button>
+        <el-button type="primary" @click="submitDealForm">保存</el-button>
      </div>
    </el-dialog>
  </div>