Browse Source

更新依赖

ZaiZai 11 months ago
parent
commit
5f40446058
5 changed files with 20 additions and 46 deletions
  1. 1 1
      package.json
  2. 1 1
      src/config/index.json
  3. 14 14
      src/views/certificate/modules/list/form.vue
  4. 0 26
      src/views/project/list.vue
  5. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -19,7 +19,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
         "element-plus": "2.6.2",
-        "hc-vue3-ui": "^3.6.5",
+        "hc-vue3-ui": "^3.6.6",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.4.7",
         "js-md5": "^0.8.3",

+ 1 - 1
src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.109:8090",
+    "target": "http://39.108.216.210:8090",
     "vite": {
         "port": 5188,
         "host": "0.0.0.0"

+ 14 - 14
src/views/certificate/modules/list/form.vue

@@ -73,7 +73,7 @@
                                 </div>
                             </div>
                         </template>
-                        <hc-form-upload v-model="formModel.certificateFileUrl" :upload="{ options: certificateOptions }" />
+                        <hc-form-upload v-model="formModel.certificateFileUrl" :upload="{ options: certificateOptions }" @success="certificateFileSuccess" />
                     </el-form-item>
                     <el-form-item label="签名体文件:" prop="signatureFileUrl">
                         <template #label>
@@ -87,7 +87,7 @@
                                 </div>
                             </div>
                         </template>
-                        <hc-form-upload v-model="formModel.signatureFileUrl" :options="{ type: 'preview' }" :upload="{ options: signatureOptions }" />
+                        <hc-form-upload v-model="formModel.signatureFileUrl" :options="{ type: 'preview' }" :upload="{ options: signatureOptions }" @success="signatureFileSuccess" />
                     </el-form-item>
                 </el-col>
                 <el-col v-if="formModel.certificateType === 2" :span="24">
@@ -107,7 +107,7 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { deepClone, formValidate, getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import { getDictionaryData } from '~uti/tools'
 import mainApi from '~api/certificate/list'
@@ -272,6 +272,12 @@ const certificateOptions = {
     size: 200,
 }
 
+//证书文件上传成功
+const certificateFileSuccess = (val, file, res) => {
+    formModel.value.certificateFileName = res.originalName
+}
+
+
 //签名体文件上传配置
 const signatureOptions = {
     url: '/api/blade-resource/client/addFileInfo',
@@ -281,17 +287,11 @@ const signatureOptions = {
     size: 200,
 }
 
-// 文件上传成功的回调
-/*const uploadSuccess = ({ echoParams, resData }) => {
-    const { link, originalName } = getObjValue(resData)
-    if (echoParams.type === '证书文件') {
-        formModel.value.certificateFileUrl = link
-        formModel.value.certificateFileName = originalName
-    } else if (echoParams.type === '签名体文件') {
-        formModel.value.signatureFileUrl = link
-        formModel.value.signatureFileName = originalName
-    }
-}*/
+//签名体文件上传成功
+const signatureFileSuccess = (val, file, res) => {
+    formModel.value.signatureFileName = res.originalName
+}
+
 
 //提交数据
 const submitLoading = ref(false)

+ 0 - 26
src/views/project/list.vue

@@ -8,7 +8,6 @@
             </div>
         </template>
         <template #extra>
-            <el-button hc-btn type="primary" @click="testUpFile">测试上传文件</el-button>
             <el-button hc-btn type="primary" @click="addProjectClick">创建项目</el-button>
         </template>
         <hc-card-item v-for="item in tableData" :key="item.id" class="hc-project-list-card" @click="projectClick(item.id)">
@@ -42,7 +41,6 @@ import { getArrValue, getObjValue } from 'js-fast-way'
 import InfoDialog from './modules/list/info-dialog.vue'
 import HcWbsTree from './modules/list/wbs-tree.vue'
 import mainApi from '~api/project/project'
-import { HcUpload } from 'hc-vue3-ui'
 
 defineOptions({
     name: 'ProjectList',
@@ -50,33 +48,9 @@ defineOptions({
 
 //激活
 onActivated(() => {
-    HcUpload.init()
-    HcUpload.on('progress', (data) => {
-        console.log('上传中:', data)
-    })
-    HcUpload.on('success', (data) => {
-        console.log('上传成功:', data)
-    })
-    HcUpload.on('error', (data) => {
-        console.log('上传失败:', data)
-    })
-    HcUpload.on('cancel', (data) => {
-        console.log('取消上传:', data)
-    })
-    HcUpload.on('item', (data) => {
-        console.log('使用文件:', data)
-    })
-    HcUpload.on('finish', (data) => {
-        console.log('全部文件上传完成:', data)
-    })
     getDataApi()
 })
 
-//测试上传文件
-const testUpFile = () => {
-    HcUpload.open()
-}
-
 const getDataApi = async () => {
     await getProjectData()
     searchClick()

+ 4 - 4
yarn.lock

@@ -2041,10 +2041,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^3.6.5:
-  version "3.6.5"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.6.5.tgz#1468b3c9855c5bfa7e596e8d5291808b95e064fa"
-  integrity sha512-sZoOBwjbzlmS0F0+YPhQAhiWScaMC9GvZ8N6ZyKtkHksSbk7gYmhdt6da1QRfpJAQ/an0JWHSN8sKNLnF9I5WA==
+hc-vue3-ui@^3.6.6:
+  version "3.6.6"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.6.6.tgz#d4625e8ddcf693706c45b9cc839d795236b20b65"
+  integrity sha512-siZsKDfmmQ9U+XIRDEs1oL1UTsBz8JR6ny5Pr1eUhEiBixvT/WqK2zdt7AGHxsai+RpoQAv7k5RcQYh+90z8JQ==
   dependencies:
     axios "^1.6.8"
     dayjs "^1.11.10"