Просмотр исходного кода

修复上传大文件没有进度条问题

shaogen1995 4 лет назад
Родитель
Сommit
054e60109d

+ 8 - 2
src/views/holding/holding0_DiaEdit.vue

@@ -255,7 +255,7 @@
           :on-preview="handlePreview"
           :on-remove="handleRemove"
           :before-remove="beforeRemove"
-          :show-file-list='false'
+          :show-file-list='true'
           multiple
           :on-exceed="handleExceed"
           :file-list="fileList"
@@ -269,7 +269,7 @@
       :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
       :data="tableData"
       border
-      style="width: 100%"
+      style="width: 100%;margin-top: 40px;"
     >
       <el-table-column label="缩略图" width="140" v-if="affixVal==='img'">
         <template #default='{row}'>
@@ -570,6 +570,12 @@ export default {
 }
 </script>
 <style lang='less' scoped>
+/deep/.el-upload-list__item-name{
+  display: none !important;
+}
+/deep/.el-upload-list__item-status-label{
+  display: none !important;
+}
 
 /deep/.upload-demo{
   float: left;

+ 8 - 2
src/views/holding/holding0_Dialog.vue

@@ -257,7 +257,7 @@
           :on-preview="handlePreview"
           :on-remove="handleRemove"
           :before-remove="beforeRemove"
-          :show-file-list='false'
+          :show-file-list='true'
           multiple
           :on-exceed="handleExceed"
           :file-list="fileList"
@@ -271,7 +271,7 @@
       :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
       :data="tableData"
       border
-      style="width: 100%"
+      style="width: 100%;margin-top: 40px;"
     >
       <el-table-column label="缩略图" width="140" v-if="affixVal==='img'">
         <template #default='{row}'>
@@ -602,6 +602,12 @@ export default {
 }
 </script>
 <style lang='less' scoped>
+/deep/.el-upload-list__item-name{
+  display: none !important;
+}
+/deep/.el-upload-list__item-status-label{
+  display: none !important;
+}
 
 /deep/.upload-demo{
   float: left;

+ 10 - 8
src/views/holding/holding3_DiaEdit.vue

@@ -255,7 +255,7 @@
           :on-preview="handlePreview"
           :on-remove="handleRemove"
           :before-remove="beforeRemove"
-          :show-file-list='false'
+          :show-file-list='true'
           multiple
           :on-exceed="handleExceed"
           :file-list="fileList"
@@ -269,7 +269,7 @@
       :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
       :data="tableData"
       border
-      style="width: 100%"
+      style="width: 100%;margin-top: 40px;"
     >
       <el-table-column label="缩略图" width="140" v-if="affixVal==='img'">
         <template #default='{row}'>
@@ -401,7 +401,7 @@ export default {
       disabled: false,
       // 表格数据
       tableData: [],
-      tempData: []
+      tempData: {}
     }
   },
   // 监听属性 类似于data概念
@@ -456,14 +456,12 @@ export default {
       this.tableData = res.data
       this.tableData.forEach((v, i) => {
         v.updateTime = v.updateTime.slice(0, 10)
-        // if (!(this.ruleForm.fileIds.includes(v.id + ''))) this.tableData.splice(i, 1)
       })
       this.$nextTick(() => {
         setTimeout(() => {
           this.tableData = this.tableData.filter(v => this.ruleForm.fileIds.includes(v.id + ''))
         }, 100)
       })
-      // if()
       // console.log(999999, this.tableData, this.ruleForm.fileIds)
       // 删除没有发送接口,需要自己处理数据
       // this.fileList = [{ name: this.tableData[0].name, url: this.tableData[0].filePath }]
@@ -472,7 +470,6 @@ export default {
     // 上传附件
     successFujian (file) {
       // 上传成功
-      // console.log(333333, file)
       // console.log(666666, this.ruleForm.fileIds)
       if (file.code === 0) {
         if (this.ruleForm.fileIds === '') this.ruleForm.fileIds = `${file.data.fileId}`
@@ -484,7 +481,7 @@ export default {
         // const b = myDate.getMonth()
         // const c = myDate.getDate()
         // console.log(999, a, b + 1, c)
-        this.tableData.push({ name: file.data.fileName, updateTime: file.timestamp.slice(0, 10), filePath: file.data.filePath })
+        this.tableData.push({ name: file.data.fileName, updateTime: file.timestamp.slice(0, 10), filePath: file.data.filePath, type: this.affixVal })
       }
     },
     handleRemove (file) {
@@ -583,7 +580,12 @@ export default {
 }
 </script>
 <style lang='less' scoped>
-
+/deep/.el-upload-list__item-name{
+  display: none !important;
+}
+/deep/.el-upload-list__item-status-label{
+  display: none !important;
+}
 /deep/.upload-demo{
   float: left;
   margin-right: 30px;

+ 1 - 1
src/views/holding/holding4_audit.vue

@@ -151,7 +151,7 @@ export default {
       try {
         await this.$refs.fromData.validate()
         const res = await clickAudit(this.fromData)
-        console.log(99999999, res)
+        // console.log(99999999, res)
         if (res.code === 0) {
           this.$message.success('审核成功')
           this.$router.push('/layout/holding4')

+ 1 - 1
src/views/holding/holding4_audit_Dia.vue

@@ -193,7 +193,7 @@ export default {
   async created () {
     // 获取上个页面传递的数据
     const res = await getDetailById(this.$route.query.id)
-    console.log(999999, res)
+    // console.log(999999, res)
     const newFujian = res.data.backupGoodsFile
     newFujian.forEach((v) => {
       v.updateTime = v.updateTime.slice(0, 10)

+ 126 - 24
src/views/holding/holding4_look.vue

@@ -14,23 +14,23 @@
       <div class="conten">
         <div class="info">
           <div class="row">
-            <div><span>藏品名称:</span>123</div>
-            <div><span>总登记号:</span>123</div>
+            <div><span>藏品名称:</span>{{myObj.name}}</div>
+            <div><span>总登记号:</span>{{myObj.num}}</div>
           </div>
         <div class="row">
-          <div><span>编辑登记人:</span>123</div>
-          <div><span>编辑时间:</span>123</div>
+          <div><span>编辑登记人:</span>{{myObj.realName}}</div>
+          <div><span>编辑时间:</span>{{myObj.updateTime}}</div>
         </div>
         <div class="row">
-          <div><span>审核结果:</span>123</div>
+          <div><span>审核结果:</span>{{myObj.statu}}</div>
         </div>
         <div class="row">
-          <div><span>审核说明:</span>快乐的小青乐的小青蛙快乐的小青蛙快乐的小青蛙快乐的小青蛙快乐的</div>
+          <div><span>审核说明:</span>{{myObj.reason}}</div>
         </div>
         </div>
         <div class="con_edit">
           <div class="title">修改记录
-                        <el-button size="small">查 看</el-button>
+                        <el-button size="small" @click="isShow=true">查 看</el-button>
           </div>
           <div class="editChange">
             <div style="width:200px">修改内容</div>
@@ -51,32 +51,55 @@
         </div>
       </div>
     </div>
+        <!-- 点击查看显示弹窗 -->
+    <Holding4Look :dialogFormVisible.sync='isShow' :myObj='myObjLook'  ref="mylook"/>
   </div>
 </template>
 
 <script>
+import Holding4Look from './holding4_audit_Dia.vue'
+import { getDetailById } from '@/apis/holding4'
 import TabList from '@/components/tabLeft.vue'
 export default {
-  name: 'HoldingAdd',
+  name: 'Holding4Look2',
   // import引入的组件需要注入到对象中才能使用
-  components: { TabList },
+  components: { TabList, Holding4Look },
   data () {
     // 这里存放数据
     return {
-      editData: [
-        { name: '完残程度', qian: '基本完整', hou: '部分残缺' },
-        { name: '完残程度2', qian: '基本完整2', hou: '部分残缺2' },
-        { name: '完残程度', qian: '基本完整', hou: '部分残缺' },
-        { name: '完残程度2', qian: '基本完整2', hou: '部分残缺2' },
-        { name: '完残程度', qian: '基本完整', hou: '部分残缺' },
-        { name: '完残程度2', qian: '基本完整2', hou: '部分残缺2' },
-        { name: '完残程度', qian: '基本完整', hou: '部分残缺' },
-        { name: '完残程度2', qian: '基本完整2', hou: '部分残缺2' },
-        { name: '完残程度', qian: '基本完整', hou: '部分残缺' },
-        { name: '完残程度2', qian: '基本完整2', hou: '部分残缺2' },
-        { name: '完残程度', qian: '基本完整', hou: '部分残缺' },
-        { name: '完残程度2', qian: '基本完整2', hou: '部分残缺2' }
-      ]
+      fujianLook: [],
+      myObjLook: {},
+      isShow: false,
+      myObj: {},
+      // 字典
+      dictionaries: {
+        age: '年代',
+        amount: '具体数量',
+        amountType: '数量类型',
+        checkInScope: '入藏时间范围',
+        checkInYear: '入藏年度',
+        goodsTypeId: '文物类别',
+        height: '通高',
+        integrity: '完残程度',
+        length: '通长',
+        level: '文物级别',
+        name: '藏品名称',
+        num: '藏品编号',
+        numTypeId: '编号类型',
+        primitiveName: '原名',
+        quality: '具体质量',
+        qualityScope: '质量范围',
+        registerNum: '总登记号',
+        repair: '保存状态',
+        repairRemark: '完残状况',
+        texture: '质地',
+        textureCategory: '质地类别',
+        textureType: '文物质地',
+        thumb: '藏品图片',
+        width: '通宽'
+      },
+
+      editData: []
     }
   },
   // 监听属性 类似于data概念
@@ -86,7 +109,86 @@ export default {
   // 方法集合
   methods: {},
   // 生命周期 - 创建完成(可以访问当前this实例)
-  created () {},
+  async created () {
+    this.myObj = this.$route.query
+    // 获取上个页面传递的数据
+    const res = await getDetailById(this.myObj.id)
+    const oldObj = res.data.goods
+    if (oldObj.amountType === 0) oldObj.amountType = '单件'
+    else if (oldObj.amountType === 1) oldObj.amountType = '一套多件'
+    if (oldObj.textureType === 0) oldObj.textureType = '单一质地'
+    else if (oldObj.textureType === 1) oldObj.textureType = '复合质地'
+    oldObj.goodsTypeId = this.category(oldObj.goodsTypeId)
+    oldObj.integrity = this.spoil(oldObj.integrity)
+    oldObj.level = this.myWwjb(oldObj.level)
+    oldObj.numTypeId = this.mycategory(oldObj.numTypeId)
+    oldObj.repair = this.mySave(oldObj.repair)
+    if (oldObj.thumb) {
+      const temp = oldObj.thumb.split('/')
+      oldObj.thumb = temp[temp.length - 1]
+    }
+    const newObj = res.data.backupGoods
+    if (newObj.amountType === 0) newObj.amountType = '单件'
+    else if (newObj.amountType === 1) newObj.amountType = '一套多件'
+    if (newObj.textureType === 0) newObj.textureType = '单一质地'
+    else if (newObj.textureType === 1) newObj.textureType = '复合质地'
+    newObj.goodsTypeId = this.category(newObj.goodsTypeId)
+    newObj.integrity = this.spoil(newObj.integrity)
+    newObj.level = this.myWwjb(newObj.level)
+    newObj.numTypeId = this.mycategory(newObj.numTypeId)
+    newObj.repair = this.mySave(newObj.repair)
+    // 把新的数据给查看弹窗
+    this.myObjLook = { ...newObj }
+    if (newObj.thumb) {
+      const temp = newObj.thumb.split('/')
+      newObj.thumb = temp[temp.length - 1]
+    }
+    for (const k in oldObj) {
+      console.log(oldObj[k], newObj[k])
+      if (oldObj[k] !== newObj[k] && this.dictionaries[k]) {
+        this.editData.push({ name: this.dictionaries[k], qian: oldObj[k], hou: newObj[k] })
+      }
+    }
+    // 对比附件
+    const oldFujian = res.data.goodsFile
+    const newFujian = res.data.backupGoodsFile
+    if (oldFujian.length >= newFujian.length) {
+      let temp = ''
+      let temp2 = ''
+      oldFujian.forEach((v, i) => {
+        temp += v.name + ' / '
+        if (i <= newFujian.length - 1) temp2 += newFujian[i].name + ' / '
+      })
+      this.editData.push({ name: '附件信息', qian: temp, hou: temp2 })
+    } else {
+      let temp3 = ''
+      let temp4 = ''
+      newFujian.forEach((v2, i2) => {
+        temp3 += v2.name + ' / '
+        if (i2 <= oldFujian.length - 1) temp4 += oldFujian[i2].name + ' / '
+      })
+      this.editData.push({ name: '附件信息', qian: temp4, hou: temp3 })
+    }
+    // newFujian.forEach((v, i) => {
+    //   if (v.type === 'video') v.type2 = '视频文件'
+    //   if (v.type === 'img') v.type2 = '高清图片'
+    //   if (v.type === 'audio') v.type2 = '音频文件'
+    //   if (v.type === 'model') v.type2 = '三维模型'
+    //   if (v.type === 'doc') v.type2 = '文档资料'
+    //   if (oldFujian.length === 0) {
+    //     this.editData.push({ name: v.type2, qian: '', hou: v.name })
+    //   } else {
+    //     oldFujian.forEach(v2 => {
+    //       if (v.id !== v2.id && v.type === v2.type) {
+    //         this.editData.push({ name: v.type2, qian: v2.name, hou: v2.name + ' , ' + v.name })
+    //       }
+    //     })
+    //   }
+    // })
+    // console.log(999, oldFujian, newFujian)
+    // this.editData附件信息完全相同,直接删掉
+    if (this.editData[this.editData.length - 1].qian === this.editData[this.editData.length - 1].hou) this.editData.pop()
+  },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {},
   beforeCreate () {}, // 生命周期 - 创建之前