From 368b525db5f3f4f82b13c074341708a46b9a4111 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 11 三月 2025 09:11:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

---
 src/views/CNAS/resourceDemand/device/component/files.vue |   32 +++++++++-----------------------
 1 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index 2ec826d..bd297c4 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -175,7 +175,7 @@
         <el-table-column fixed="right" label="鎿嶄綔" min-width="180">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="handleAttachmentClick(scope.row)">涓嬭浇闄勪欢</el-button>
-            <el-button type="text" size="small" @click="handleViewClick(scope.row)">鏌ョ湅</el-button>
+            <el-button type="text" size="small" @click="handleViewClick(scope.row)">缂栬緫</el-button>
             <el-button type="text" size="small" @click="handleDeleteClick(scope.row)">鍒犻櫎</el-button>
           </template>
         </el-table-column>
@@ -264,7 +264,7 @@
         <el-col :span="7">
           <el-form :model="editData" label-width="140px" ref="ruleForm" :rules="rules1">
             <!-- 瀹為獙瀹ゅ垪琛� -->
-            <el-form-item label="鎵�灞為儴闂�:">
+            <el-form-item label="鎵�灞為儴闂�:" prop="subordinateDepartmentsId">
               <el-select v-model="editData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
                 <el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
                   :value="item.value">
@@ -341,7 +341,7 @@
         </el-row>
       </span>
     </el-dialog>
-    <el-dialog title="娣诲姞璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
+    <el-dialog title="璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
       <el-form ref="form" :model="addFile" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -446,7 +446,6 @@
 
 <script>
 import { MessageBox } from 'element-ui'
-import ValueTable from "@/components/Table/value-table.vue";
 import fileDownload from '@/utils/file'
 import vueQr from 'vue-qr'
 import PrintJS from 'print-js'
@@ -484,7 +483,6 @@
     }
   },
   components: {
-    ValueTable,
     vueQr
   },
   data() {
@@ -512,6 +510,9 @@
         calibrationDate: [
           { required: true, message: '璇疯緭鍏ユ牎鍑嗗懆鏈�(鏈�)', trigger: 'blur' },
         ],
+        subordinateDepartmentsId: [
+          { required: true, message: '璇烽�夋嫨鎵�灞為儴闂�', trigger: 'change' },
+        ]
       },
       // dateForm: {
 
@@ -615,18 +616,7 @@
     handleAttachmentClick(row) {
       console.log(row)
       if (row.fileName) {
-        let state = /\.(jpg|jpeg|png|gif)$/i.test(row.fileName)
-        if (state) {
-          let url = this.javaApi + '/img/' + row.fileName;
-          fileDownload.downloadIamge(url, row.fileName)
-        } else {
-          const url = this.javaApi + '/word/' + row.fileName
-          const link = document.createElement('a');
-          link.href = url;
-          link.download = row.fileName;
-          link.click();
-          this.$message.success('涓嬭浇鎴愬姛')
-        }
+        this.$download.saveAs(row.fileName)
       } else {
         this.$message.warning('鏈笂浼犳枃浠讹紒')
       }
@@ -788,10 +778,6 @@
       }
       this.upLoad = true;
       upDeviceParameter(formData).then(res => {
-        if (res.code === 201) {
-          this.upLoad = false
-          return
-        }
         this.$message.success('淇敼鎴愬姛')
         this.upLoad = false
         this.getList(this.clickNodeVal.value)
@@ -1060,14 +1046,14 @@
 .device-main {
   width: 90%;
   margin: 0px 5%;
-  height: 460px;
+  height: 500px;
   padding: 25px 0px;
   background-color: #fff;
 }
 
 .device-center {
   width: 90%;
-  height: 460px;
+  height: 490px;
   margin: 0px 5%;
   border-radius: 15px;
   background-color: #fff;

--
Gitblit v1.9.3