fix:测试bug修复

src/components/FileUploadInspec/index.vue

@@ -6,6 +6,7 @@
       :before-upload="handleBeforeUpload"
       :data="data"
       :limit="limit"
+      :file-list="fileList"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
@@ -45,37 +46,6 @@
         的文件
       </div>
     </el-upload>
-
-    <!-- 文件列表 -->
-    <!-- <transition-group
-      ref="uploadFileList"
-      class="upload-file-list el-upload-list el-upload-list--text"
-      name="el-fade-in-linear"
-      tag="ul"
-    >
-      <li
-        :key="file.url"
-        class="el-upload-list__item ele-upload-list__item-content"
-        v-for="(file, index) in fileList"
-      >
-        <el-link
-          :href="`${baseUrl}${file.url}`"
-          :underline="false"
-          target="_blank"
-        >
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
-        <div class="ele-upload-list__item-content-action">
-          <el-link
-            :underline="false"
-            @click="handleDelete(index)"
-            type="danger"
-            v-if="!disabled"
-            >删除</el-link
-          >
-        </div>
-      </li>
-        </transition-group>-->
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <img :src="dialogImageUrl" alt />
     </el-dialog>
@@ -149,35 +119,28 @@ export default {
     if (this.drag && !this.disabled) {
       this.$nextTick(() => {
         const element = this.$refs.uploadFileList?.$el || this.$refs.uploadFileList
-        Sortable.create(element, {
-          ghostClass: 'file-upload-darg',
-          onEnd: (evt) => {
-            const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
-            this.fileList.splice(evt.newIndex, 0, movedItem)
-            this.$emit('input', this.listToString(this.fileList))
-          },
-        })
+        element &&
+          Sortable.create(element, {
+            ghostClass: 'file-upload-darg',
+            onEnd: (evt) => {
+              const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
+              this.fileList.splice(evt.newIndex, 0, movedItem)
+              this.$emit('input', this.listToString(this.fileList))
+            },
+          })
       })
     }
   },
   watch: {
     value: {
       handler(val) {
+        this.fileList = []
         if (val) {
-          let temp = 1
-          // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',')
-          // 然后将数组转为对象数组
-          this.fileList = list.map((item) => {
-            if (typeof item === 'string') {
-              item = { name: item, url: item }
-            }
-            item.uid = item.uid || new Date().getTime() + temp++
-            return item
+          this.$nextTick(() => {
+            val.split(',').forEach((url) => {
+              this.fileList.push({ url })
+            })
           })
-        } else {
-          this.fileList = []
-          return []
         }
       },
       deep: true,
@@ -249,10 +212,11 @@ export default {
       }
     },
     handleRemove(file) {
-      this.fileList.forEach((item, index) => {
+      this.uploadList.forEach((item, index) => {
         if (item.url === file.url) {
-          this.fileList.splice(index, 1)
-          this.$emit('handleRemove', this.listToString(this.fileList))
+          const updatedFile = this.$refs.fileUpload.uploadFiles
+          updatedFile.splice(index, 1)
+          this.$emit('handleRemove', this.listToString(this.uploadList))
         }
       })
     },
@@ -270,13 +234,9 @@ export default {
     },
     // 上传结束处理
     uploadedSuccessfully() {
-      if (this.number > 0 && this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList)
-        this.uploadList = []
-        this.number = 0
-        this.$emit('input', this.listToString(this.fileList))
-        this.$modal.closeLoading()
-      }
+      this.number = 0
+      this.$emit('input', this.listToString(this.fileList))
+      this.$modal.closeLoading()
     },
     // 获取文件名称
     getFileName(name) {

src/views/equipment/equipmentMag/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="设备类型" prop="deviceType">
-        <el-select v-model="queryParams.deviceType" placeholder="">
+        <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型">
           <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id"> </el-option>
         </el-select>
       </el-form-item>
@@ -53,7 +53,7 @@
           <el-input v-model="form.location" placeholder="请输入设备位置描述" />
         </el-form-item>
         <el-form-item label="设备类型" prop="deviceType">
-          <el-select v-model="form.deviceType" placeholder="">
+          <el-select v-model="form.deviceType" placeholder="请选择设备类型">
             <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
@@ -159,7 +159,7 @@ export default {
     // 新增下载二维码方法
     async handleDownloadQrCode(row) {
       // 使用示例
-      const fileurl = 'http://192.168.2.13:8080' + row.qrCode
+      const fileurl = 'http://192.168.2.16:9091' + row.qrCode
       this.downloadOnlineImage(fileurl, 'qr_code.png')
     },
     /** 查询设备类型列表 */
@@ -248,7 +248,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids
       this.$modal
-        .confirm('是否确认删除设备类型编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除设备类型编号为"' + row.deviceNo + '"的数据项？')
         .then(function () {
           return delDevice(ids)
         })

src/views/equipment/equipmentTypeMag/index.vue

@@ -94,7 +94,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        typeName: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }],
+        typeDeptIds: [{ required: true, message: '设备管理部门不能为空', trigger: 'blur' }],
+      },
     }
   },
   created() {

src/views/inspection/patrol/patrolProject/index.vue

@@ -67,11 +67,6 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="巡检人" prop="inspectionUserId">
-          <!-- <el-input
-            v-model="form.inspectionUserId"
-            placeholder="请输入巡检人"
-                    />-->
-          <!--远程搜索-->
           <el-select
             v-model="form.inspectionUserId"
             filterable
@@ -89,7 +84,7 @@
             <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.deviceType" label="设备名称" prop="deviceName">
+        <el-form-item v-if="form.deviceType" label="设备名称" prop="deviceId">
           <el-select v-model="form.deviceId" placeholder="请选择设备" clearable>
             <el-option v-for="item in deviceList" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
@@ -207,6 +202,7 @@ export default {
 
     //根据设备类型查询设备列表
     getDeviceList() {
+      this.form.deviceId = null
       listDevice({
         deviceType: this.form.deviceType,
       }).then((response) => {

src/views/inspection/repair/repairLog/index.vue

@@ -89,10 +89,10 @@
           <span>{{ parseTime(scope.row.maintainDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="维修状态" align="center" prop="orderStates">
+      <el-table-column label="维修状态" align="center" prop="maintainState">
         <template slot-scope="scope">
           <span>{{
-            selectDictLabels(orderStatesList, scope.row.orderStates)
+            selectDictLabels(orderStatesList, scope.row.maintainState)
           }}</span>
         </template>
       </el-table-column>
@@ -230,6 +230,11 @@ export default {
         maintainType: null,
         deviceType: null,
       },
+      orderStatesList: [
+        { label: '派单中', value: 0 },
+        { label: '维修中', value: 1 },
+        { label: '已完成', value: 2 },
+      ],
       deviceTypeList: [],
       // 表单参数
       form: {},

src/views/inspection/repair/repairProject/index.vue

@@ -26,6 +26,7 @@
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备编码" align="center" prop="deviceNo" />
       <el-table-column label="巡检人" align="center" prop="inspectionUserName" />
+      <el-table-column label="维修人" align="center" prop="maintainUserName" />
       <el-table-column label="设备故障描述" align="center" prop="deviceErrorDetail" />
       <el-table-column label="故障日期" align="center" prop="erroDate" width="180">
         <template slot-scope="scope">
@@ -43,6 +44,7 @@
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['workOrder:workOrder:edit']" v-if="scope.row.orderStates == 0"
             >派单</el-button
           >
+          <el-button size="mini" type="text" @click="handleView(scope.row)" v-hasPermi="['workOrder:workOrder:view']" v-if="false">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -58,7 +60,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="设备名称" prop="deviceName">
-          <el-select v-model="form.deviceName" placeholder="请选择设备名称" @change="getDeviceNo">
+          <el-select v-model="form._deviceName" placeholder="请选择设备名称" value-key="id" @change="getDeviceNo">
             <el-option v-for="item in deviceNameList" :key="item.id" :label="item.deviceName" :value="item"> </el-option>
           </el-select>
         </el-form-item>
@@ -69,8 +71,8 @@
         <el-form-item label="设备故障描述" prop="deviceErrorDetail">
           <el-input v-model="form.deviceErrorDetail" placeholder="请输入设备故障描述" />
         </el-form-item>
-        <el-form-item label="设备故障图片" prop="deviceErroPhotos">
-          <FileUploadInspec v-model="form.deviceErroPhotos" @input="fileSuccess" @handleRemove="handleRemove" :fileType="['jpg', 'jpeg', 'png']" />
+        <el-form-item label="设备故障图片" prop="deviceErrorPhotos">
+          <FileUploadInspec :value="form.deviceErrorPhotos" @input="fileSuccess" @handleRemove="handleRemove" :fileType="['jpg', 'jpeg', 'png']" />
         </el-form-item>
         <el-form-item label="故障日期" prop="erroDate">
           <el-date-picker clearable v-model="form.erroDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择故障日期"> </el-date-picker>
@@ -286,7 +288,6 @@ export default {
     },
     /** 派单 */
     handleUpdate(row) {
-      this.reset()
       const id = row.id || this.ids
       listDept().then((response) => {
         this.deptOptions = this.handleTree(response.data, 'deptId')
@@ -297,6 +298,19 @@ export default {
         this.title = '派遣'
       })
     },
+    // 查看
+    handleView(row) {
+      const id = row.id || this.ids
+      listDept().then((response) => {
+        this.deptOptions = this.handleTree(response.data, 'deptId')
+      })
+      getWorkOrder(id).then((response) => {
+        this.form = response.data
+        this.open = true
+        this.title = '查看'
+        console.log(this.form)
+      })
+    },
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
@@ -327,6 +341,9 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          if (this.form._deviceName) {
+            delete this.form._deviceName
+          }
           addWorkOrder(this.form).then((response) => {
             this.$modal.msgSuccess('新增成功')
             this.open = false
@@ -337,10 +354,14 @@ export default {
     },
     // 派单提交
     submitFormOrder() {
-      updateWorkOrder({ ...this.form, ...this.formpd }).then((response) => {
-        this.$modal.msgSuccess('派单成功')
-        this.openpd = false
-        this.getList()
+      this.$refs['formpd'].validate((valid) => {
+        if (valid) {
+          updateWorkOrder({ ...this.form, ...this.formpd }).then((response) => {
+            this.$modal.msgSuccess('派单成功')
+            this.openpd = false
+            this.getList()
+          })
+        }
       })
     },