ソースを参照

增加相关枚举类型

yumeng 2 週間 前
コミット
4414a11254

+ 136 - 134
package.json

@@ -1,139 +1,141 @@
 {
-  "name": "ant-design-vue-jeecg",
-  "version": "2.0.2",
-  "private": true,
-  "scripts": {
-    "serve": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
-    "build": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js  build",
-    "lint": "vue-cli-service lint",
-    "test:unit": "vue-cli-service test:unit",
-    "test:e2e": "vue-cli-service test:e2e"
-  },
-  "dependencies": {
-    "@antv/data-set": "^0.10.2",
-    "@femessage/upload-to-ali": "^1.8.1",
-    "@jeecg/antd-online-beta220": "^1.0.1",
-    "@riophae/vue-treeselect": "^0.4.0",
-    "@tinymce/tinymce-vue": "^2.0.0",
-    "ali-oss": "^6.1.1",
-    "ant-design-vue": "^1.3.9",
-    "apexcharts": "^3.6.5",
-    "area-data": "^5.0.6",
-    "axios": "^0.18.0",
-    "babel-loader": "^8.0.6",
-    "blueimp-md5": "^2.11.0",
-    "browser-md5-file": "^1.1.1",
-    "clipboard": "^2.0.4",
-    "codemirror": "^5.46.0",
-    "core-js": "^2.6.12",
-    "cos-js-sdk-v5": "^0.5.26",
-    "dayjs": "^1.8.0",
-    "echarts": "^4.9.0",
-    "echarts-gl": "^1.1.2",
-    "element-ui": "^2.13.0",
-    "enquire.js": "^2.1.6",
-    "html2canvas": "^1.0.0-rc.3",
-    "jquery": "^3.4.1",
-    "js-cookie": "^2.2.0",
-    "lodash.get": "^4.4.2",
-    "lodash.pick": "^4.4.0",
-    "mcanvas": "^1.3.9",
-    "md5": "^2.2.1",
-    "nprogress": "^0.2.0",
-    "promise.prototype.finally": "^3.1.1",
-    "tinymce": "^5.0.2",
-    "viser-vue": "^2.4.4",
-    "vue": "^2.6.10",
-    "vue-apexcharts": "^1.3.2",
-    "vue-class-component": "^6.0.0",
-    "vue-count-to": "^1.0.13",
-    "vue-cropper": "^0.4.8",
-    "vue-i18n": "^8.7.0",
-    "vue-infinite-scroll": "^2.0.2",
-    "vue-layer": "^1.0.2",
-    "vue-lazyload": "^1.3.3",
-    "vue-loader": "^15.7.0",
-    "vue-ls": "^3.2.0",
-    "vue-oss-uploader": "^0.1.10",
-    "vue-photo-preview": "^1.1.3",
-    "vue-preview": "^1.1.3",
-    "vue-print-nb": "^1.7.5",
-    "vue-print-nb-jeecg": "^1.0.8",
-    "vue-property-decorator": "^7.3.0",
-    "vue-router": "^3.0.1",
-    "vue-splitpane": "^1.0.4",
-    "vue-video-player": "^5.0.2",
-    "vue-waterfall-easy": "^2.4.3",
-    "vuedraggable": "^2.20.0",
-    "vuex": "^3.0.1",
-    "vuex-class": "^0.3.1"
-  },
-  "devDependencies": {
-    "@babel/polyfill": "^7.2.5",
-    "@vue/cli-plugin-babel": "^3.3.0",
-    "@vue/cli-plugin-eslint": "^3.3.0",
-    "@vue/cli-service": "^3.3.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "babel-eslint": "^10.0.1",
-    "babel-plugin-component": "^1.1.1",
-    "compression-webpack-plugin": "^5.0.1",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.1.0",
-    "html-webpack-plugin": "^3.2.0",
-    "less": "^3.9.0",
-    "less-loader": "^4.1.0",
-    "node-sass": "^4.11.0",
-    "sass-loader": "^7.0.1",
-    "style-resources-loader": "^1.3.2",
-    "vue-cli-plugin-style-resources-loader": "^0.1.3",
-    "vue-template-compiler": "^2.6.10"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
+    "name": "ant-design-vue-jeecg",
+    "version": "2.0.2",
+    "private": true,
+    "scripts": {
+        "serve": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
+        "build": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js  build",
+        "lint": "vue-cli-service lint",
+        "test:unit": "vue-cli-service test:unit",
+        "test:e2e": "vue-cli-service test:e2e"
     },
-    "extends": [
-      "plugin:vue/strongly-recommended",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
+    "dependencies": {
+        "@antv/data-set": "^0.10.2",
+        "@femessage/upload-to-ali": "^1.8.1",
+        "@jeecg/antd-online-beta220": "^1.0.1",
+        "@riophae/vue-treeselect": "^0.4.0",
+        "@tinymce/tinymce-vue": "^2.0.0",
+        "ali-oss": "^6.1.1",
+        "ant-design-vue": "^1.3.9",
+        "apexcharts": "^3.6.5",
+        "area-data": "^5.0.6",
+        "axios": "^0.18.0",
+        "babel-loader": "^8.0.6",
+        "blueimp-md5": "^2.11.0",
+        "browser-md5-file": "^1.1.1",
+        "clipboard": "^2.0.4",
+        "codemirror": "^5.46.0",
+        "core-js": "^2.6.12",
+        "cos-js-sdk-v5": "^0.5.26",
+        "dayjs": "^1.8.0",
+        "echarts": "^4.9.0",
+        "echarts-gl": "^1.1.2",
+        "element-ui": "^2.13.0",
+        "enquire.js": "^2.1.6",
+        "html2canvas": "^1.0.0-rc.3",
+        "jquery": "^3.4.1",
+        "js-cookie": "^2.2.0",
+        "lodash.get": "^4.4.2",
+        "lodash.pick": "^4.4.0",
+        "mcanvas": "^1.3.9",
+        "md5": "^2.2.1",
+        "nprogress": "^0.2.0",
+        "promise.prototype.finally": "^3.1.1",
+        "tinymce": "^5.0.2",
+        "viser-vue": "^2.4.4",
+        "vue": "^2.6.10",
+        "vue-apexcharts": "^1.3.2",
+        "vue-class-component": "^6.0.0",
+        "vue-count-to": "^1.0.13",
+        "vue-cropper": "^0.4.8",
+        "vue-i18n": "^8.7.0",
+        "vue-infinite-scroll": "^2.0.2",
+        "vue-layer": "^1.0.2",
+        "vue-lazyload": "^1.3.3",
+        "vue-loader": "^15.7.0",
+        "vue-ls": "^3.2.0",
+        "vue-oss-uploader": "^0.1.10",
+        "vue-photo-preview": "^1.1.3",
+        "vue-preview": "^1.1.3",
+        "vue-print-nb": "^1.7.5",
+        "vue-print-nb-jeecg": "^1.0.8",
+        "vue-property-decorator": "^7.3.0",
+        "vue-router": "^3.0.1",
+        "vue-splitpane": "^1.0.4",
+        "vue-video-player": "^5.0.2",
+        "vue-waterfall-easy": "^2.4.3",
+        "vuedraggable": "^2.20.0",
+        "vuex": "^3.0.1",
+        "vuex-class": "^0.3.1"
     },
-    "rules": {
-      "generator-star-spacing": "off",
-      "no-mixed-operators": 0,
-      "vue/max-attributes-per-line": [
-        2,
-        {
-          "singleline": 5,
-          "multiline": {
-            "max": 1,
-            "allowFirstLine": false
-          }
+    "devDependencies": {
+        "@babel/polyfill": "^7.2.5",
+        "@vue/cli-plugin-babel": "^3.3.0",
+        "@vue/cli-plugin-eslint": "^3.3.0",
+        "@vue/cli-service": "^3.3.0",
+        "@vue/eslint-config-standard": "^4.0.0",
+        "babel-eslint": "^10.0.1",
+        "babel-plugin-component": "^1.1.1",
+        "compression-webpack-plugin": "^5.0.1",
+        "eslint": "^5.16.0",
+        "eslint-plugin-vue": "^5.1.0",
+        "html-webpack-plugin": "^3.2.0",
+        "less": "^3.9.0",
+        "less-loader": "^4.1.0",
+        "node-sass": "^4.11.0",
+        "sass-loader": "^7.0.1",
+        "style-resources-loader": "^1.3.2",
+        "vue-cli-plugin-style-resources-loader": "^0.1.3",
+        "vue-template-compiler": "^2.6.10",
+        "webpack": "^4.44.2",
+        "webpack-cli": "^6.0.1"
+    },
+    "eslintConfig": {
+        "root": true,
+        "env": {
+            "node": true
+        },
+        "extends": [
+            "plugin:vue/strongly-recommended",
+            "eslint:recommended"
+        ],
+        "parserOptions": {
+            "parser": "babel-eslint"
+        },
+        "rules": {
+            "generator-star-spacing": "off",
+            "no-mixed-operators": 0,
+            "vue/max-attributes-per-line": [
+                2,
+                {
+                    "singleline": 5,
+                    "multiline": {
+                        "max": 1,
+                        "allowFirstLine": false
+                    }
+                }
+            ],
+            "vue/attribute-hyphenation": 0,
+            "vue/html-self-closing": 0,
+            "vue/component-name-in-template-casing": 0,
+            "vue/html-closing-bracket-spacing": 0,
+            "vue/singleline-html-element-content-newline": 0,
+            "vue/no-unused-components": 0,
+            "vue/multiline-html-element-content-newline": 0,
+            "vue/no-use-v-if-with-v-for": 0,
+            "vue/html-closing-bracket-newline": 0,
+            "vue/no-parsing-error": 0,
+            "no-console": 0
+        }
+    },
+    "postcss": {
+        "plugins": {
+            "autoprefixer": {}
         }
-      ],
-      "vue/attribute-hyphenation": 0,
-      "vue/html-self-closing": 0,
-      "vue/component-name-in-template-casing": 0,
-      "vue/html-closing-bracket-spacing": 0,
-      "vue/singleline-html-element-content-newline": 0,
-      "vue/no-unused-components": 0,
-      "vue/multiline-html-element-content-newline": 0,
-      "vue/no-use-v-if-with-v-for": 0,
-      "vue/html-closing-bracket-newline": 0,
-      "vue/no-parsing-error": 0,
-      "no-console": 0
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ]
 }

+ 2 - 1
src/filters.js

@@ -158,7 +158,8 @@ const filters = {
             12: '小红书',
             13: 'b站',
             14: '快手金教',
-            15: '阿里UC'
+            15: '阿里UC',
+            16: '腾讯',
         }
         return data[sta]
     },

+ 1 - 1
src/views/modules/advertiser/ProjectList.vue

@@ -151,7 +151,7 @@
           <div v-else>-</div>
         </span>
         <span slot="mediaId" slot-scope="text">
-          {{ text == '1' || text == '3' ? '头条' :text == '2' || text=='4'?'快手' :text=='5'?'千川' :text=='6'?'磁力金牛' :text=='12'?'小红书' :text=='13'?'b站' :text=='14'?'快手金教' :text=='15'?'阿里UC':'其他'}}
+          {{ text == '1' || text == '3' ? '头条' : text == '2' || text == '4' ? '快手' : text == '5' ? '千川' : text == '6' ? '磁力金牛' : text == '12' ? '小红书' : text == '13' ? 'b站' : text == '14' ? '快手金教' : text == '15' ? '阿里UC' : text == '16' ? '腾讯' : '其他'}}
         </span>
 
         <span slot="action" slot-scope="text, record">

+ 1 - 0
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -15,6 +15,7 @@
                         <a-radio-button value="13">b站</a-radio-button>
                         <a-radio-button value="14">快手金教</a-radio-button>
                         <a-radio-button value="15">阿里UC</a-radio-button>
+                        <a-radio-button value="16">腾讯</a-radio-button>
                     </a-radio-group>
                 </a-form-item>
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="代理商名称">

+ 8 - 0
src/views/modules/policy-management/appPoolList.vue

@@ -89,6 +89,7 @@
                             <a-select-option value="13"> b站</a-select-option>
                             <a-select-option value="14"> 快手金教</a-select-option>
                             <a-select-option value="15"> 阿里UC</a-select-option>
+                            <a-select-option value="16"> 腾讯</a-select-option>
                         </a-select>
                     </a-form-item>
 
@@ -185,6 +186,7 @@
                             <a-select-option value="13"> b站</a-select-option>
                             <a-select-option value="14"> 快手金教</a-select-option>
                             <a-select-option value="15"> 阿里UC</a-select-option>
+                            <a-select-option value="16"> 腾讯</a-select-option>
 
                         </a-select>
                     </a-form-model-item>
@@ -739,6 +741,10 @@ export default {
                 {
                     id: 15,
                     name: '阿里UC'
+                },
+                {
+                    id: 16,
+                    name: '腾讯'
                 }
 
             ],
@@ -853,6 +859,8 @@ export default {
                             return '快手金教'
                         } else if (t == '15') {
                             return '阿里UC'
+                        }else if (t == '16') {
+                            return '腾讯'
                         }
                     }
                 },

+ 7 - 0
src/views/modules/policy-management/appRecharge.vue

@@ -86,6 +86,7 @@
                             <a-select-option value="13"> b站</a-select-option>
                             <a-select-option value="14"> 快手金教</a-select-option>
                             <a-select-option value="15"> 阿里UC</a-select-option>
+                            <a-select-option value="16"> 腾讯</a-select-option>
                         </a-select>
                     </a-form-item>
 
@@ -987,6 +988,10 @@ export default {
                 {
                     id: 15,
                     name: '阿里UC'
+                },
+                {
+                    id: 16,
+                    name: '腾讯'
                 }
             ],
 
@@ -1078,6 +1083,8 @@ export default {
                             return '快手金教'
                         } else if (t == '15') {
                             return '阿里UC'
+                        } else if (t == '16') {
+                            return '腾讯'
                         }
                     }
                 },

+ 9 - 0
src/views/modules/policy-management/applicationLog.vue

@@ -86,6 +86,7 @@
                             <a-select-option value="13"> b站</a-select-option>
                             <a-select-option value="14"> 快手金教</a-select-option>
                             <a-select-option value="15"> 阿里UC</a-select-option>
+                            <a-select-option value="16"> 腾讯</a-select-option>
                         </a-select>
                     </a-form-item>
 
@@ -227,6 +228,7 @@
                             <a-select-option :value="13"> b站</a-select-option>
                             <a-select-option :value="14"> 快手金教</a-select-option>
                             <a-select-option :value="15"> 阿里UC</a-select-option>
+                            <a-select-option :value="16"> 腾讯</a-select-option>
                         </a-select>
                     </a-form-model-item>
                     <a-form-model-item label="客户名称" prop="advertiserId">
@@ -683,6 +685,10 @@ export default {
                 {
                     id: 15,
                     name: '阿里UC'
+                },
+                {
+                    id: 16,
+                    name: '腾讯'
                 }
 
             ],
@@ -821,6 +827,9 @@ export default {
                         } else if (t == '15') {
                             return '阿里UC'
                         }
+                        else if (t == '16') {
+                            return '腾讯'
+                        }
                     }
                 },
                 {

+ 6 - 0
src/views/modules/policy-management/policy-management.vue

@@ -621,6 +621,7 @@
                                 <a-select-option :value="13"> b站</a-select-option>
                                 <a-select-option :value="14"> 快手金教</a-select-option>
                                 <a-select-option :value="15"> 阿里UC</a-select-option>
+                                <a-select-option :value="16"> 腾讯</a-select-option>
                             </a-select>
                         </a-form-model-item>
                         <a-form-model-item label="销售" prop="saleId">
@@ -1008,6 +1009,11 @@
                         name: '阿里UC'
                     },
 
+                    {
+                        id: 16,
+                        name: '腾讯'
+                    },
+
                 ],
                 creativeRebateOptions: [
                     {

+ 5 - 0
src/views/modules/policy-management/reimbursement.vue

@@ -582,6 +582,7 @@
                                 <a-select-option :value="13">b站</a-select-option>
                                 <a-select-option :value="14">快手金教</a-select-option>
                                 <a-select-option :value="15">阿里UC</a-select-option>
+                                <a-select-option :value="16">腾讯</a-select-option>
 
                             </a-select>
                         </a-form-model-item>
@@ -967,6 +968,10 @@ export default {
                     id: 15,
                     name: '阿里UC'
                 },
+                {
+                    id: 16,
+                    name: '腾讯'
+                },
             ],
             creativeRebateOptions: [
                 {