Browse Source

修复一些问题

liuxiaona 1 year ago
parent
commit
8dc7fe2a66

File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.30cd6b12.css


File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.e287a332.css


File diff suppressed because it is too large
+ 1 - 1
dist/assets/index.5da171e6.js


File diff suppressed because it is too large
+ 1 - 1
dist/assets/timeScreen.2fbacd04.css


+ 1 - 1
dist/index.html

@@ -6,7 +6,7 @@
6 6
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
7 7
     <title>广告系统</title>
8 8
       <script src="//open.thunderurl.com/thunder-link.js"></script>
9
-    <script type="module" crossorigin src="./assets/index.5da171e6.js"></script>
9
+    <script type="module" crossorigin src="./assets/index.f55f6b3f.js"></script>
10 10
     <link rel="modulepreload" href="./js/@vue/@vue.a4e5ba32.js">
11 11
     <link rel="modulepreload" href="./js/vue-router/vue-router.3516c392.js">
12 12
     <link rel="modulepreload" href="./js/axios/axios.8506093b.js">

File diff suppressed because it is too large
+ 1 - 1
dist/js/_dialog/_dialog.298f44c9.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_input/_input.d8d538ad.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/_select/_select.e2d49a2a.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/basisMoudle/accountManage.2fd95d93.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/basisMoudle/accountManage.98259562.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/error.5c8742d8.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/home.24911030.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/basisMoudle/login.a5d9f8da.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/businessMoudle/adqManage.53783c83.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/collectClip/index.304bbd20.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/layout/index.81369694.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/materialLibrary/index.7c587f1e.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/materialLibrary/index.c84ad930.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/menuPermission/menuList.b94f40e0.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/tableInfo/tableInfo.ffe7bda5.js


File diff suppressed because it is too large
+ 1 - 1
dist/js/taskList/index.7e57b46e.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/textLibrary/index.0f6d8358.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/textLibrary/index.3c893fdd.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/timeScreen/timeScreen.1f17d940.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/timeScreen/timeScreen.421cdddb.js


+ 7 - 2
src/components/businessMoudle/materialLibrary/dialog/uploadMaterial.vue

@@ -78,7 +78,7 @@
78 78
                     <div style="margin: 0 10px">
79 79
                       <img :src="slotProps.row.oss_url" alt=""  style="width: 120px;"
80 80
                            v-if="slotProps.row.mtype==2">
81
-                      <video  controls
81
+                      <video  :controls="false"
82 82
                               :src="slotProps.row.oss_url"
83 83
                               v-if="slotProps.row.mtype==1"  style="height: 120px;width: 120px;z-index: 8000!important;"></video>
84 84
                     </div>
@@ -178,6 +178,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
178 178
   tagChooseVal:[],
179 179
   extraData:{},
180 180
   uploadCopyList:[],
181
+  haveUpload:false,//是否上传了文件
181 182
 })
182 183
 
183 184
 const ideaManRef = ref<{value:string|number}>()
@@ -316,6 +317,7 @@ const updateTable = () => {
316 317
 
317 318
 //显示已上传列表中的图片或视频
318 319
 const getTableList = (obj:any,nameVal?:any) => {
320
+  pageInfo.haveUpload = true
319 321
   tableInfo.tableList.forEach(i=>{
320 322
     if(i.name == (nameVal ? nameVal : obj.name)){
321 323
       i.oss_url = obj.oss_url
@@ -433,6 +435,7 @@ const switchShow = (val:boolean)=>{
433 435
   drawer_show.value = val
434 436
   nextTick(()=>{
435 437
     if(val){
438
+      pageInfo.haveUpload = false
436 439
       pageInfo.uploadCopyList = []
437 440
       tableInfo.tableList = []
438 441
       init_createrList()
@@ -449,7 +452,9 @@ const switchShow = (val:boolean)=>{
449 452
 
450 453
 const closeEvent = () => {
451 454
   drawer_show.value = false
452
-  emit('init')
455
+  if(pageInfo.haveUpload){
456
+    emit('init')
457
+  }
453 458
 }
454 459
 
455 460
 // 父组件共享值

+ 1 - 0
src/components/businessMoudle/materialLibrary/material.vue

@@ -43,6 +43,7 @@
43 43
 
44 44
     <tagBlock ref="tagRef" title="素材标签" selectWidth="240px" :haveNewTag="false" class="bMar10"
45 45
               @handleChange="val=>{pageInfo.tagChooseVal = val}" @hideChange="()=>init()"></tagBlock>
46
+    <span class="pointer c-theme lMar10 bMar10" @click="init()">刷新</span>
46 47
   </div>
47 48
 
48 49
   <div class="materialBox" v-loading="loading">

+ 17 - 9
src/components/businessMoudle/materialLibrary/materialCatalog.vue

@@ -143,7 +143,7 @@ const initAllAlbum = async () => {
143 143
     let resNew:any = res.rst
144 144
     pageInfo.albumList = resNew
145 145
     pageInfo.copyAlbumList = JSON.parse(JSON.stringify(resNew))
146
-    highLightEvent(pageInfo.albumList)
146
+    await highLightEvent(pageInfo.albumList)
147 147
   }else{
148 148
     ElMessage.error(res.errMsg)
149 149
   }
@@ -159,14 +159,7 @@ const highLightEvent = (arr:any) => {
159 159
         album_acIdx.value = idx
160 160
         pageInfo.fileList = arr[idx].child
161 161
       }else{
162
-        if(i.child){
163
-          i.child.forEach(sub=>{
164
-            if(sub.id == idVal.value){
165
-              album_acIdx.value = idx
166
-              pageInfo.fileList = arr[idx].child
167
-            }
168
-          })
169
-        }
162
+        subChildEvent(i.child,idx,arr)
170 163
       }
171 164
     })
172 165
     nextTick(()=>{treeRef.value!.setCurrentKey(idVal.value)})
@@ -175,6 +168,21 @@ const highLightEvent = (arr:any) => {
175 168
     pageInfo.fileList = pageInfo.albumList[0].child
176 169
   }
177 170
 }
171
+// 循环
172
+const subChildEvent = (cld:any,idx:number,arr:any) => {
173
+  if(cld){
174
+    cld.forEach(sub=>{
175
+      if(sub.id == idVal.value){
176
+        album_acIdx.value = idx
177
+        pageInfo.fileList = arr[idx].child
178
+      }else{
179
+        subChildEvent(sub.child,idx,arr)
180
+      }
181
+    })
182
+  }else{
183
+    return
184
+  }
185
+}
178 186
 
179 187
 const init = () => {
180 188
   emit('changeEvent')

+ 1 - 1
src/components/businessMoudle/textLibrary/dialog/type.vue

@@ -2,7 +2,7 @@
2 2
   <div class="flex">
3 3
     <div class="f14 rMar10 c-theme_text">分类:</div>
4 4
     <el-select class="addTextSelect" v-model="textVal"
5
-               placeholder="请选择" clearable filterable
5
+               placeholder="请选择文案" clearable filterable
6 6
                :allow-create="allowCreateFlag"
7 7
                @change="changeEvent"
8 8
                :style="{width:inputWidth}">