Merge branch 'qhse_fix' of shuzhihua/pms-iot-vue into master

src/views/pms/qhse/index.vue

@@ -44,7 +44,7 @@
               ><Icon icon="ep:refresh" class="mr-5px" /> {{ t('devicePerson.reset') }}</el-button
             >
             <el-button @click="handleExport" type="success" plain :loading="exportLoading"
-              ><Icon icon="ep:download" class="mr-5px" /> 导出Excel</el-button
+              ><Icon icon="ep:download" class="mr-5px" /> 导出</el-button
             >
           </el-form-item>
         </el-form>

src/views/pms/qhse/iotmeasuredetect/IotMeasureDetectForm.vue

@@ -193,7 +193,9 @@
 
     <template #footer>
       <el-button @click="confirmSelectMeasure" type="primary">确 定</el-button>
-      <el-button @click="measureDialogVisible = false">取 消</el-button>
+      <el-button @click="((measureDialogVisible = false), (selectedMeasureId = undefined))"
+        >取 消</el-button
+      >
     </template>
   </Dialog>
 </template>
@@ -375,6 +377,7 @@ const confirmSelectMeasure = () => {
 
   // 关闭选择仪器对话框
   measureDialogVisible.value = false
+  selectedMeasureId.value = undefined
 }
 const getList = async () => {
   loading.value = true

src/views/pms/qhse/iotmeasuredetect/index.vue

@@ -72,6 +72,11 @@
           height="calc(85vh - 187px)"
           :show-overflow-tooltip="true"
         >
+          <el-table-column :label="t('monitor.serial')" width="70" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
           <el-table-column label="计量器具名称" align="center" prop="measureName" min-width="160" />
           <el-table-column label="证书编码" align="center" prop="measureCertNo" min-width="160" />
           <el-table-column label="检测/校准日期" align="center" prop="detectDate" width="140">

src/views/pms/qhse/safety/index.vue

@@ -37,7 +37,7 @@
               ><Icon icon="ep:refresh" class="mr-5px" /> {{ t('devicePerson.reset') }}</el-button
             >
             <el-button @click="handleExport" type="success" plain :loading="exportLoading"
-              ><Icon icon="ep:download" class="mr-5px" /> 导出Excel</el-button
+              ><Icon icon="ep:download" class="mr-5px" /> 导出</el-button
             >
           </el-form-item>
         </el-form>