Browse Source

修复了一些问题

liuxiaona 1 year ago
parent
commit
82dafede61

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


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


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


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


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index.ddeec96d.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.84395424.js"></script>
9
+    <script type="module" crossorigin src="./assets/index.dd9e7b6e.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.b032fd94.js


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


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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 1
dist/js/taskList/index.6f11bb02.js


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


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


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


+ 11 - 0
src/common/common.ts

@@ -219,6 +219,17 @@ export const formatSeconds = (value:any):string=> {
219 219
     return result;
220 220
 }
221 221
 
222
+//获取当前日期
223
+export const getCurrentDate = ()=>{
224
+    const date:any = new Date();
225
+    var year:any = date.getFullYear();
226
+    var month:any = date.getMonth() + 1;
227
+    var day:any = date.getDate();
228
+    month = (month > 9) ? month : ("0" + month);
229
+    day = (day < 10) ? ("0" + day) : day;
230
+    return  year + "-" + month + "-" + day;
231
+}
232
+
222 233
 
223 234
 
224 235
 

src/common/emoji.js → src/common/emoji.ts


+ 1 - 1
src/components/businessMoudle/collectClip/block/fileBlock.vue

@@ -12,7 +12,7 @@
12 12
     <div class="conBox">
13 13
       <div>{{paramsObj.name || '-'}}</div>
14 14
       <div class="tMar40 flex">
15
-        <div><span class="c-333">素材:</span>{{NumberHandle(paramsObj.file_cnt) || 0}}</div>
15
+        <div><span class="c-333">素材:</span>{{NumberHandle(paramsObj.file_count) || 0}}</div>
16 16
         <div class="lMarauto f14">
17 17
           <el-dropdown @command="handleCommand" size="default">
18 18
             <el-icon style="transform: rotate(90deg)"><i-ep-More /></el-icon>

+ 2 - 1
src/components/businessMoudle/materialLibrary/dialog/uploadCopy.vue

@@ -36,6 +36,7 @@ import Input from '@/components/capsulationMoudle/_input.vue'
36 36
 import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from "vue";
37 37
 import {materialUploadParam} from "@/api/ApiModel";
38 38
 import {Api} from "@/api/api";
39
+import {getCurrentDate} from "@/common/common";
39 40
 import {ElMessage} from "element-plus";
40 41
 
41 42
 
@@ -99,7 +100,7 @@ const addName = () => {
99 100
   nameRef.value!.value = nameRef.value!.value + '-' + props.name
100 101
 }
101 102
 const addDate = () => {
102
-  nameRef.value!.value = nameRef.value!.value + '-<日期>'
103
+  nameRef.value!.value = nameRef.value!.value + '-' + getCurrentDate()
103 104
 }
104 105
 
105 106
 

+ 15 - 20
src/components/businessMoudle/materialLibrary/dialog/uploadMaterial.vue

@@ -40,7 +40,8 @@
40 40
           <div class="title">上传区域</div>
41 41
           <div class="contBox">
42 42
             <div class="uploadBox">
43
-              <input type="file" ref="fileRef" class="uploadIpt" name="file" multiple @change.prevent="handleFileChange" accept="png,jpg,jpeg,gif,mp4,mpeg,3pg,avi,mov">
43
+              <input type="file" ref="fileRef" class="uploadIpt" name="file"
44
+                     multiple @change.prevent="handleFileChange" accept="png,jpg,jpeg,gif,mp4,mpeg,3pg,avi,mov">
44 45
               <div style="z-index: 2">
45 46
                 <el-icon size="32" color="#999"><i-ep-UploadFilled/></el-icon>
46 47
                 <div class="f14">将文件或文件夹拖到此处,或点击上传文件</div>
@@ -169,26 +170,20 @@ const ideaManRef = ref<{value:string|number}>()
169 170
 const designerRef = ref<{value:string|number}>()
170 171
 const CataRef = ref<{value:string,idVal:number,initAllAlbum:()=>void}>()
171 172
 const tagRef = ref<{init:()=>void}>()
172
-const nullCheckEvent = () => {
173
-  return new Promise((resolve:any, reject)=>{
174
-    if(!CataRef.value!.idVal){
175
-      ElMessage.error('请先选择目录!')
176
-      reject()
177
-    }else if(!ideaManRef.value!.value){
178
-      ElMessage.error('请先选择创意人!')
179
-      reject()
180
-    }else if(!designerRef.value!.value){
181
-      ElMessage.error('请先选择设计师!')
182
-      reject()
183
-    }else{
184
-      resolve()
185
-    }
186
-  })
187
-}
188
-
189
-
190 173
 const handleFileChange = async (e:Event)=>{
191
-  await nullCheckEvent()
174
+  if(!CataRef.value!.idVal){
175
+    ElMessage.error('请先选择目录!')
176
+    fileRef.value!.value = ''
177
+    return
178
+  }else if(!ideaManRef.value!.value){
179
+    ElMessage.error('请先选择创意人!')
180
+    fileRef.value!.value = ''
181
+    return
182
+  }else if(!designerRef.value!.value){
183
+    ElMessage.error('请先选择设计师!')
184
+    fileRef.value!.value = ''
185
+    return
186
+  }
192 187
   const target = e.target as HTMLInputElement
193 188
   const files:any = target.files// 注意这里取得的是一个类数组
194 189
   if(files){

+ 1 - 1
src/components/businessMoudle/taskList/detial.vue

@@ -21,7 +21,7 @@
21 21
                   </span>
22 22
                   <span class="val" v-else-if="sub.name == '执行结果'">
23 23
                      <span>成功: {{NumberHandle(propsObj.success_num) || 0}}</span>
24
-                    <span>失败: {{NumberHandle(propsObj.fail_num) || 0}}</span>
24
+                    <span class="lMar5">失败: {{NumberHandle(propsObj.fail_num) || 0}}</span>
25 25
                   </span>
26 26
                   <span class="val" v-else>{{propsObj[sub.key] || '-'}}</span>
27 27
                 </div>