Strona główna Odkrywaj Pomoc
Zaloguj się
zxh
/
mdyxgjweb
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

暂存修改，

xiaohaizhao 1 miesiąc temu
rodzic
899567e1f3
commit
2bd04ddd93
25 zmienionych plików z 31 dodań i 32 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 0 1
      dist/assets/addImg-ef8a454d.css
  2. 0 1
      dist/assets/index-0bc0b7b3.css
  3. 0 1
      dist/assets/index-fe046a92.css
  4. 1 1
      dist/index.html
  5. 1 1
      h5preview/index.html
  6. 0 0
      h5preview/static/js/index.4c97861a.js
  7. 1 1
      src/MAR/archivesMag/modules/add.vue
  8. 1 1
      src/MAR/archivesMag/modules/edit.vue
  9. 1 1
      src/MAR/archivesMag/modules/workManage/add.vue
  10. 1 1
      src/MAR/archivesMag/modules/workManage/edit.vue
  11. 1 1
      src/MAR/assetsStore/modules/Add.vue
  12. 1 1
      src/MAR/assetsStore/modules/Edit.vue
  13. 1 1
      src/MAR/assetsStore/modules/setClass/add.vue
  14. 1 1
      src/MAR/assetsStore/modules/setClass/edit.vue
  15. 11 9
      src/MAR/assetsStore/modules/setClass/index.vue
  16. 1 1
      src/MAR/effectImgManage/detail/modules/Edit.vue
  17. 1 1
      src/MAR/effectImgManage/modules/addImg.vue
  18. 1 1
      src/MAR/extendManage/detail/modules/extendList/Add.vue
  19. 1 1
      src/MAR/extendManage/detail/modules/extendList/Edit.vue
  20. 1 1
      src/MAR/imgTextManage/detail/modules/Add.vue
  21. 1 1
      src/MAR/imgTextManage/detail/modules/Edit.vue
  22. 1 1
      src/MAR/imgTextManage/modules/Add.vue
  23. 1 1
      src/MAR/imgTextManage/modules/Edit.vue
  24. 1 1
      src/MAR/topiceManage/detail/modules/resultManage/Add.vue
  25. 1 1
      src/MAR/topiceManage/detail/modules/resultManage/Edit.vue

+ 0 - 1
dist/assets/addImg-ef8a454d.css
Wyświetl plik 

@@ -1 +0,0 @@
 
-.ant-select[data-v-5f3a52d2]{width:100%}

+ 0 - 1
dist/assets/index-0bc0b7b3.css
Wyświetl plik 

@@ -1 +0,0 @@
 
-.ant-select[data-v-17fb6713],.ant-select[data-v-a5db239e],.ant-select[data-v-c95e32c9]{width:100%}

+ 0 - 1
dist/assets/index-fe046a92.css
Wyświetl plik 

@@ -1 +0,0 @@
 
-.ant-select[data-v-5da3e940]{width:100%}

+ 1 - 1
dist/index.html
Wyświetl plik 

@@ -5,7 +5,7 @@
 
     <link rel="icon" type="image/svg+xml" href="./vite.svg" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>营销宝</title>
 
-    <script type="module" crossorigin src="./assets/index-07396680.js"></script>
 
+    <script type="module" crossorigin src="./assets/index-316bccfd.js"></script>
 
     <link rel="modulepreload" crossorigin href="./assets/vue-8259307b.js">
 
     <link rel="modulepreload" crossorigin href="./assets/vue-router-55bfd43b.js">
 
     <link rel="stylesheet" href="./assets/index-b8e2bd64.css">

+ 1 - 1
h5preview/index.html
Wyświetl plik 

@@ -1,2 +1,2 @@
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>营销工具</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.53ba089c.js></script><script src=./static/js/index.1c73a126.js></script></body></html>
 
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.53ba089c.js></script><script src=./static/js/index.4c97861a.js></script></body></html>

Plik diff jest za duży
+ 0 - 0
h5preview/static/js/index.4c97861a.js


+ 1 - 1
src/MAR/archivesMag/modules/add.vue
Wyświetl plik 

@@ -60,7 +60,7 @@
 
                           accept="image/png, image/jpeg"
 
                           ref="uploadEl"
 
                         ></Upload>
 
-                        <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+                        
                       </a-form-item>
 
                     </a-col>
 
                     <a-col :span="24">

+ 1 - 1
src/MAR/archivesMag/modules/edit.vue
Wyświetl plik 

@@ -72,7 +72,7 @@
 
                           :multiple="false"
 
                           accept="image/png, image/jpeg"
 
                         ></Upload>
 
-                        <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+                        
                       </a-form-item>
 
                     </a-col>
 
                     <a-col :span="24">

+ 1 - 1
src/MAR/archivesMag/modules/workManage/add.vue
Wyświetl plik 

@@ -36,7 +36,7 @@
 
                 ref="upload"
 
                 :multiple="false"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/archivesMag/modules/workManage/edit.vue
Wyświetl plik 

@@ -47,7 +47,7 @@
 
                 ref="upload"
 
                 :multiple="false"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/assetsStore/modules/Add.vue
Wyświetl plik 

@@ -58,7 +58,7 @@
 
                           accept="image/png, image/jpeg"
 
                           ref="upload"
 
                         ></Upload>
 
-                        <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+                        
                       </a-form-item>
 
                     </a-col>
 
                     <a-col :span="24" v-if="from.type==1">

+ 1 - 1
src/MAR/assetsStore/modules/Edit.vue
Wyświetl plik 

@@ -58,7 +58,7 @@
 
                           accept="image/png, image/jpeg"
 
                           ref="upload"
 
                         ></Upload>
 
-                        <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+                        
                       </a-form-item>
 
                     </a-col>
 
                     <a-col :span="24" v-if="from.type==1">

+ 1 - 1
src/MAR/assetsStore/modules/setClass/add.vue
Wyświetl plik 

@@ -32,7 +32,7 @@
 
                 accept="image/png, image/jpeg"
 
                 ref="upload"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col> -->
 
           <a-col :span="24">

+ 1 - 1
src/MAR/assetsStore/modules/setClass/edit.vue
Wyświetl plik 

@@ -32,7 +32,7 @@
 
                 accept="image/png, image/jpeg"
 
                 ref="upload"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col> -->
 
           <a-col :span="24">

+ 11 - 9
src/MAR/assetsStore/modules/setClass/index.vue
Wyświetl plik 

@@ -32,7 +32,7 @@
 
           </template>
 
           <template v-else-if="data.column.dataIndex == 'operation'">
 
             <Edit :disabled="!data.record.isenable != 1" @onSuccess="$refs.table.listData()" :data="data.record" v-if="utils.hasPermission('setClass')"></Edit>
 
-            <Add :disabled="!data.record.isenable != 1" @onSuccess="$refs.table.listData()" :data="data.record" v-if="data.record.level != 3 && utils.hasPermission('setClass')"></Add>
 
+            <Add :disabled="!data.record.isenable != 1" @onSuccess="$refs.table.listData()" :data="data.record" v-if="data.record.level < 3 && utils.hasPermission('setClass')"></Add>
 
             <a-button :disabled="!data.record.isenable != 1" v-if="utils.hasPermission('setClass')" size="samll" type="link" @click="delClass(data.record)">删 除</a-button>
 
           </template>
 
         </template>
 
@@ -90,15 +90,17 @@ const typeChange = async (e,data) => {
 
 }
 
 
 const listData = (res) => {
 
-  res.forEach(item => {
 
-    item.attinfos = utils.fileList(item.attinfos)
 
-    item.children.forEach(item2 => {
 
-      console.log(item2,'111');
 
-      if (!item2.children.length) delete item2.children
 
+  function processChildren(nodes) {
 
+    nodes.forEach(node => {
 
+      node.attinfos = utils.fileList(node.attinfos)
 
+      if (node.children && node.children.length) {
 
+        processChildren(node.children)
 
+      } else if (node.children) {
 
+        delete node.children
 
+      }
 
     })
 
-    if (!item.children.length) delete item.children
 
-    
-  })
 
+  }
 
+  processChildren(res)
 
   console.log(res);
 
 }

+ 1 - 1
src/MAR/effectImgManage/detail/modules/Edit.vue
Wyświetl plik 

@@ -23,7 +23,7 @@
 
                 :isDel="false"
 
                 @uploadSuccess="uploadSuccess"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
         </a-row>

+ 1 - 1
src/MAR/effectImgManage/modules/addImg.vue
Wyświetl plik 

@@ -22,7 +22,7 @@
 
                 @uploadSuccess="uploadSuccess"
 
                 @uploadOver="loading=false"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
         </a-row>

+ 1 - 1
src/MAR/extendManage/detail/modules/extendList/Add.vue
Wyświetl plik 

@@ -45,7 +45,7 @@
 
                         :multiple="false"
 
                         ref="upload"
 
                       ></Upload>
 
-                      <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+                      
                     </a-form-item>
 
                 </a-card>
 
               </a-form>

+ 1 - 1
src/MAR/extendManage/detail/modules/extendList/Edit.vue
Wyświetl plik 

@@ -48,7 +48,7 @@
 
                         :bindData="{ownerid:form.sys_adid,ownertable:'sys_ad',usetype:'default'}" 
                         @uploadSuccess="uploadSuccess"
 
                       ></upload>
 
-                      <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+                      
                     </a-form-item>
 
                 </a-card>
 
               </a-form>

+ 1 - 1
src/MAR/imgTextManage/detail/modules/Add.vue
Wyświetl plik 

@@ -22,7 +22,7 @@
 
                 ref="upload"
 
                 @uploadSuccess="uploadSuccess"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/imgTextManage/detail/modules/Edit.vue
Wyświetl plik 

@@ -23,7 +23,7 @@
 
                 :isDel="false"
 
                 @uploadSuccess="uploadSuccess"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/imgTextManage/modules/Add.vue
Wyświetl plik 

@@ -49,7 +49,7 @@
 
                 ref="upload"
 
                 @uploadSuccess="uploadSuccess"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/imgTextManage/modules/Edit.vue
Wyświetl plik 

@@ -39,7 +39,7 @@
 
                 ref="upload"
 
                 @uploadSuccess="uploadSuccess"
 
               ></Upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/topiceManage/detail/modules/resultManage/Add.vue
Wyświetl plik 

@@ -30,7 +30,7 @@
 
                 @uploadSuccess="uploadSuccess"
 
                 @fileChange="fileChange"
 
               ></upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

+ 1 - 1
src/MAR/topiceManage/detail/modules/resultManage/Edit.vue
Wyświetl plik 

@@ -30,7 +30,7 @@
 
                 @uploadSuccess="uploadSuccess"
 
                 @fileChange="fileChange"
 
               ></upload>
 
-              <p style="color:#b8b3b3">注：建议上传图片大小130x80像素，大小不超过2M，格式为JPG/PNG</p>
 
+              
             </a-form-item>
 
           </a-col>
 
           <a-col :span="24">

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików