修复房间流水筛选bug

package-lock.json

@@ -26,7 +26,8 @@
         "sass": "^1.67.0",
         "sass-loader": "^13.3.2",
         "vue-router": "^4.0.3",
-        "vuex": "^4.0.0"
+        "vuex": "^4.0.0",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "@babel/core": "^7.12.16",
@@ -41,7 +42,6 @@
         "unplugin-auto-import": "^0.16.7",
         "unplugin-vue-components": "^0.25.2",
         "vue": "^3.2.13",
-        "webpack-bundle-analyzer": "^4.9.1",
         "webpack-cli": "^5.1.4"
       }
     },
@@ -3717,6 +3717,14 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/admin-lte": {
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/admin-lte/-/admin-lte-2.3.2.tgz",
@@ -4440,6 +4448,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
@@ -4692,6 +4712,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
@@ -4962,6 +4990,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -6779,6 +6818,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "4.3.6",
       "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.6.tgz",
@@ -11661,6 +11708,17 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
@@ -13274,6 +13332,22 @@
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -13340,6 +13414,26 @@
         }
       }
     },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "vue-cli-service serve --mode development --report",
+    "dev": "vue-cli-service serve --mode development",
     "build": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint"
   },
@@ -26,7 +26,8 @@
     "sass": "^1.67.0",
     "sass-loader": "^13.3.2",
     "vue-router": "^4.0.3",
-    "vuex": "^4.0.0"
+    "vuex": "^4.0.0",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
@@ -41,7 +42,6 @@
     "unplugin-auto-import": "^0.16.7",
     "unplugin-vue-components": "^0.25.2",
     "vue": "^3.2.13",
-    "webpack-bundle-analyzer": "^4.9.1",
     "webpack-cli": "^5.1.4"
   }
 }

src/api/AccessRestriction.vue/AccessRestriction.js

@@ -0,0 +1,65 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+// ==================================地区限制====================================
+
+// 地区列表
+export const recordPage = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/page',
+        method: 'get',
+        params: query
+    });
+};
+// 加入白名单
+export const addWhite = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/addWhite',
+        method: 'get',
+        params: query
+    });
+};
+// 解除限制
+export const relieve = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/relieve',
+        method: 'get',
+        params: query
+    });
+};
+// 添加地区访问限制
+export const recordSave = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+// ==================================访问白名单====================================
+
+// 白名单列表
+export const whitePage = query => {
+    return request({
+        url: '/admin/ip/region/white/page',
+        method: 'get',
+        params: query
+    });
+};
+// 移除白名单
+export const whiteDel = query => {
+    return request({
+        url: '/admin/ip/region/white/del',
+        method: 'get',
+        params: query
+    });
+};
+// 添加白名单
+export const whiteSave = query => {
+    return request({
+        url: '/admin/ip/region/white/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};

src/api/common/upload.js

@@ -0,0 +1,23 @@
+import '@/utils/ajaxfileupload';
+
+export const uploadFile = id => {
+    return new Promise((resolve, reject) => {
+        $.ajaxFileUpload({
+            fileElementId: id,
+            url: '/admin/upload/img',
+            type: 'post',
+            dataType: 'json',
+            secureuri: false,
+            async: true,
+            submitType: 'ajax',
+            success: function (res) {
+                resolve(res);
+            },
+            error: function (res, status, e) {
+                console.error(res);
+                console.error(status);
+                reject(e);
+            }
+        });
+    });
+};

src/api/resource/resource.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+
+export const getResourcePage = query => {
+    return request({
+        url: '/admin/resource/page',
+        method: 'get',
+        params: query
+    });
+};
+
+export const delResource = query => {
+    return request({
+        url: '/admin/resource/del',
+        method: 'get',
+        params: query
+    });
+};
+
+export const effective = query => {
+    return request({
+        url: '/admin/resource/effective',
+        method: 'get',
+        params: query
+    });
+};
+
+export const saveResource = data => {
+    return request({
+        url: '/admin/resource/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: data
+    });
+}

src/api/resource/resourceRule.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getResourceRuleList = query => {
+    return request({
+        url: '/admin/resource/rule/list',
+        method: 'get',
+        params: query
+    });
+};

src/api/system/sysconf.js

@@ -5,4 +5,12 @@ export function getSysConfList() {
         url: '/admin/sysConf/getList',
         method: 'get'
     });
+}
+
+export const getConfigValueByKey = query => {
+    return request({
+        url: '/admin/sysConf/key',
+        method: 'get',
+        params: query,
+    });
 }

src/api/transferIdentitySet/transferIdentitySet.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+// 获取列表
+export const userPage = query => {
+    return request({
+        url: '/admin/give/user/page',
+        method: 'get',
+        params: query
+    });
+};
+// 新增
+export const userSave = query => {
+    return request({
+        url: '/admin/give/user/save',
+        method: 'post',
+        params: query
+    });
+};
+// 删除
+export const batchDel = query => {
+    return request({
+        url: '/admin/give/user/batchDel',
+        method: 'get',
+        params: query
+    });
+};

src/assets/plugins/bootstrap-table/js/bootstrap-table.js

@@ -2203,8 +2203,10 @@
                 fixedScroll = data.fixedScroll;
                 data = data[this.options.dataField];
             } else if (!$.isArray(data)) { // support fixedScroll
-                fixedScroll = data.fixedScroll;
+                if (data) {
-                data = data.data;
+                    fixedScroll = data.fixedScroll;
+                    data = data.data;
+                } 
             }
 
             this.initData(data);
@@ -2528,13 +2530,25 @@
         };
 
         BootstrapTable.prototype.destroy = function () {
+            let bootstrapTable = $('div .bootstrap-table');
+            if (bootstrapTable) {
+                let $this = this;
+                let tables = bootstrapTable.filter(i => {
+                    let $container = $(bootstrapTable[i]);
+                    return ($container && $container.html().indexOf('"' +$this.$el[0].id + '"') != -1);
+                });
+                if (tables.length > 1) {
+                    this.$container = $(tables[0]);
+                    this.options.toolbar = $('div.fixed-table-toolbar > div.bars.pull-left').html();
+                }
+            }
             this.$el.insertBefore(this.$container);
-            $(this.options.toolbar).insertBefore(this.$el);
+                $(this.options.toolbar).insertBefore(this.$el);
-            this.$container.next().remove();
+                this.$container.next().remove();
-            this.$container.remove();
+                this.$container.remove();
-            this.$el.html(this.$el_.html())
+                this.$el.html(this.$el_.html())
-                .css('margin-top', '0')
+                    .css('margin-top', '0')
-                .attr('class', this.$el_.attr('class') || ''); // reset the class
+                    .attr('class', this.$el_.attr('class') || ''); // reset the class
         };
 
         BootstrapTable.prototype.showLoading = function () {
@@ -2776,12 +2790,17 @@
                     data = $this.data('bootstrap.table'),
                     options = $.extend({}, BootstrapTable.DEFAULTS, $this.data(),
                         typeof option === 'object' && option);
-
+                
                 if (typeof option === 'string') {
                     if ($.inArray(option, allowedMethods) < 0) {
                         throw new Error("Unknown method: " + option);
                     }
 
+                    if (!data && option === 'destroy') {
+                        new BootstrapTable(this, options).destroy();
+                        return;
+                    }
+
                     if (!data) {
                         return;
                     }

src/components/maintainer/index.vue

@@ -105,6 +105,7 @@
   
 <script>
 import store from '@/store';
+import { getStore } from '@/utils/store';
 import loading from '@/assets/images/loading.gif';
 
 export default {
@@ -130,6 +131,8 @@ export default {
     },
     methods: {
         getMenu() {
+            this.parentMenus = getStore({ name: 'parent_menus' });
+            this.childMenus = getStore({ name: 'child_menus' });
             store.dispatch('getMenu').then(res => {
                 this.parentMenus = res.parents;
                 this.childMenus = res.childs;
@@ -163,9 +166,7 @@ export default {
                         parentIds.push(v.id);
                     });
                 }
-                console.log(parentIds);
                 this.parentMenus = store.getters.parentMenus.filter(v1 => parentIds.filter(v2 => v1.id == v2).length > 0);
-                this.childMenus = store.getters.childMenus.filter(v1 => parentIds.filter(v2 => v1.parentid == v2).length > 0);
             }
         }
     },

src/css/public.css

@@ -2,39 +2,69 @@
 /*鼠标点击后移开，恢复本身样式*/
 .primary,
 .primary:focus:not(.primary:hover) {
-  color: white;
-  background: #409eff;
-}
-/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
-/* 更改背景和字體顏色 */
-.primary:focus, .primary:hover{
     color: white;
     background: #409eff;
 }
+
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.primary:focus,
+.primary:hover {
+    color: white;
+    background: #409eff;
+}
+
 /*鼠标按下，没有抬起*/
 /* 更改邊框顏色 */
 .primary:active {
-  color: white;
+    color: white;
-  background: #337ecc;
+    background: #337ecc;
 }
 
 
 /*鼠标点击后移开，恢复本身样式*/
 .danger,
 .danger:focus:not(.danger:hover) {
-  color: white;
-  background: #f56c6c;
-}
-/* 危险的按钮样式 */
-/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
-/* 更改背景和字體顏色 */
-.danger:focus, .danger:hover{
     color: white;
     background: #f56c6c;
 }
+
+/* 危险的按钮样式 */
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.danger:focus,
+.danger:hover {
+    color: white;
+    background: #f56c6c;
+}
+
 /*鼠标按下，没有抬起*/
 /* 更改邊框顏色 */
 .danger:active {
-  color: white;
+    color: white;
-  background: #c45656;
+    background: #c45656;
+}
+
+
+/*鼠标点击后移开，恢复本身样式*/
+.success,
+.success:focus:not(.success:hover) {
+    color: white;
+    background: #67c23a;
+}
+
+/* 危险的按钮样式 */
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.success:focus,
+.success:hover {
+    color: white;
+    background: #b3e19d;
+}
+
+/*鼠标按下，没有抬起*/
+/* 更改邊框顏色 */
+.danger:active {
+    color: white;
+    background: #529b2e;
 }

src/utils/ajaxfileupload.js

@@ -4,7 +4,6 @@ jQuery.extend({
         if (s.error) {
             s.error.call(s.context || s, xhr, status, e);
         }
-
         // Fire the global callback
         if (s.global) {
             (s.context ? jQuery(s.context) : jQuery.event).trigger("ajaxError", [xhr, s, e]);
@@ -13,17 +12,14 @@ jQuery.extend({
     createUploadIframe: function (id, uri) {
         //create frame
         var frameId = 'jUploadFrame' + id;
-
         if (window.ActiveXObject) {
             var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
             if (typeof uri == 'boolean') {
                 io.src = 'javascript:false';
-            }
+            } else if (typeof uri == 'string') {
-            else if (typeof uri == 'string') {
                 io.src = uri;
             }
-        }
+        } else {
-        else {
             io = document.createElement('iframe');
             io.id = frameId;
             io.name = frameId;
@@ -31,18 +27,21 @@ jQuery.extend({
         io.style.position = 'absolute';
         io.style.top = '-1000px';
         io.style.left = '-1000px';
-
         document.body.appendChild(io);
-
+        return io;
-        return io
     },
     createUploadForm: function (id, fileElementId) {
         //create form	
         var formId = 'jUploadForm' + id;
         var fileId = 'jUploadFile' + id;
-        var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
+        var form = $('#' + formId);
+        if (form && form.length > 0) {
+            form.remove();
+        }
+        form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
         var oldElement = $('#' + fileElementId);
-        var newElement = $(oldElement).clone();
+        var newElement = $(oldElement).clone(true).val("");
+        //须要复制元素的全部事件处理。  
         $(oldElement).attr('id', fileId);
         $(oldElement).before(newElement);
         $(oldElement).appendTo(form);
@@ -53,7 +52,6 @@ jQuery.extend({
         $(form).appendTo('body');
         return form;
     },
-
     ajaxFileUpload: function (s) {
         // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
         s = jQuery.extend({}, jQuery.ajaxSettings, s);
@@ -68,7 +66,7 @@ jQuery.extend({
         }
         var requestDone = false;
         // Create the request object
-        var xml = {}
+        var xml = {};
         if (s.global)
             jQuery.event.trigger("ajaxSend", [xml, s]);
         // Wait for a response to come back
@@ -98,7 +96,6 @@ jQuery.extend({
                         // If a local callback was specified, fire it and pass it the data
                         if (s.success)
                             s.success(data, status);
-
                         // Fire the global callback
                         if (s.global)
                             jQuery.event.trigger("ajaxSuccess", [xml, s]);
@@ -112,30 +109,22 @@ jQuery.extend({
                 // The request was completed
                 if (s.global)
                     jQuery.event.trigger("ajaxComplete", [xml, s]);
-
                 // Handle the global AJAX counter
                 if (s.global && ! --jQuery.active)
                     jQuery.event.trigger("ajaxStop");
-
                 // Process result
                 if (s.complete)
                     s.complete(xml, status);
-
+                jQuery(io).unbind();
-                jQuery(io).unbind()
-
                 setTimeout(function () {
                     try {
                         $(io).remove();
                         $(form).remove();
-
                     } catch (e) {
                         jQuery.handleError(s, xml, null, e);
                     }
-
+                }, 100);
-                }, 100)
+                xml = null;
-
-                xml = null
-
             }
         }
         // Timeout checker
@@ -153,12 +142,23 @@ jQuery.extend({
             $(form).attr('target', frameId);
             if (form.encoding) {
                 form.encoding = 'multipart/form-data';
-            }
+            } else {
-            else {
                 form.enctype = 'multipart/form-data';
             }
-            $(form).submit();
+            let submitType = s.submitType;
-
+            let $form = $(form);
+            if (!submitType || submitType == 'form') {
+                $form.submit();
+            } else if (submitType == 'ajax') {
+                $form.ajaxSubmit({
+                    success: function (data, status) {
+                        s.success(data, status);
+                    },
+                    error: function (err) {
+                        jQuery.handleError(s, xml, null, err);
+                    }
+                });
+            }
         } catch (e) {
             jQuery.handleError(s, xml, null, e);
         }
@@ -169,9 +169,7 @@ jQuery.extend({
             document.getElementById(frameId).addEventListener('load', uploadCallback, false);
         }
         return { abort: function () { } };
-
     },
-
     uploadHttpData: function (r, type) {
         var data = !type;
         data = type == "xml" || data ? r.responseXML : r.responseText;

src/utils/excelUtils.js

@@ -0,0 +1,26 @@
+import * as XLSX from 'xlsx';
+const exportToExcel = (row, fileName, list, sheetNames) => {//调用方式 exportToExcel(接口返回的表格列表, "文件名", 定义的表头和字段[{ piko号: "erbanNo" }{ piko号: "erbanNo" }],, ["Sheet1"]);
+    var data = [];
+    var headerTitle = [];
+    row.forEach((res, i) => {
+        var arr = [];
+        for (let index = 0; index < list.length; index++) {
+            for (let key in list[index]) {
+                headerTitle[index] = key;
+                arr[index] = res[list[index][key]];
+            }
+        }
+        data[i] = arr;
+    });
+    let smallArr = Array.from(data);
+    let bigArr = [];
+    smallArr = smallArr.map((item) => {
+        bigArr.push(Object.values(item));
+    });
+    const ws = XLSX.utils.aoa_to_sheet([...[headerTitle], ...bigArr]); // tableName为表头，tableData为数据
+    const wb = XLSX.utils.book_new();
+    // 将工作表放入工作簿中
+    XLSX.utils.book_append_sheet(wb, ws, sheetNames);
+    XLSX.writeFile(wb, fileName + ".xlsx");
+}
+export default exportToExcel

src/views/OperationSmsAdminView.vue

@@ -389,9 +389,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/accessRestriction/AccessRestriction.vue

@@ -0,0 +1,355 @@
+<template>
+  <div class="outer">
+    <div class="search">
+      <div class="searchLeft">
+        <span>用户平台ID</span>
+        <el-input
+          v-model="userId"
+          size="default"
+          placeholder="用户平台ID"
+          class="input"
+        ></el-input>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="buttonBox">
+      <el-button class="primary" type="primary" size="default" @click="add()"
+        >新增</el-button
+      >
+      <el-button class="primary" type="primary" size="default" @click="search()"
+        >查询</el-button
+      >
+    </div>
+    <!-- 列表 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用戶id" />
+      <el-table-column prop="nick" align="center" label="用戶昵称" />
+      <el-table-column prop="phone" align="center" label="手机号" />
+      <el-table-column prop="signTime" align="center" label="注册时间" />
+      <el-table-column prop="createTime" align="center" label="进入访问限制时间" />
+      <el-table-column prop="inviteCode" align="center" label="邀请码" />
+      <el-table-column prop="signDeviceId" align="center" label="注册设备" />
+      <el-table-column prop="deviceIds" align="center" label="访问设备" />
+      <el-table-column prop="lastCheckIpRegion" align="center" label="最近一次访问地点" />
+      <el-table-column align="center" label="平台"
+        ><template v-slot="scope">{{
+          scope.row.os == "android" ? "安卓" : "苹果"
+        }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="sim卡信息" width="150"
+        ><template v-slot="scope">
+          <div v-html="tableArrFormat(scope.row)"></div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="系统语言" width="200">
+        <template v-slot="scope">
+          {{langFormat(scope.row.lang)}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="unfreeze(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >解除限制</el-button
+          >
+          <el-button
+            @click="addWhite(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >加入白名单</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500]"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 公共二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> {{ delDialogText }}</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureClick(val, type)"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 添加弹窗 -->
+    <el-dialog v-model="addSure" title="提示" width="30%" center>
+      <div class="selectBox">
+        <span class="left" style="margin-right: 20px">用户ID</span>
+        <el-input
+          v-model="selectUserId"
+          size="default"
+          placeholder="用户平台ID"
+          class="right"
+          style="width: 70%"
+        ></el-input>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="addSure = false">取消</el-button>
+          <el-button type="primary" @click="addSureClick()"> 添加 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  recordPage,
+  addWhite,
+  relieve,
+  recordSave,
+} from "@/api/AccessRestriction.vue/AccessRestriction.js";
+import { ElMessage } from "element-plus";
+export default {
+  name: "AccessRestriction",
+  data() {
+    return {
+      userId: "", //用戶id
+      loading: false, //列表loading
+      tableData: [
+        {
+          erbanNo: "123123123",
+        },
+      ], //列表数据
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      delDialog: false, //控制公共弹窗展示
+      delDialogText: "确定要解除限制吗?", //公共弹窗标题
+      type: null, //1解除限制 2加入白名单
+      obj: {}, //存放公共参数
+      addSure: false, //控制确认添加弹窗展示
+      selectUserId: "", //添加用户id
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 初始化
+    getData() {
+      this.loading = true;
+      recordPage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+        userErBanNo: this.userId,
+      }).then((res) => {
+        this.tableData = res.data.records;
+        this.loading = false;
+        this.total = res.data.total;
+      });
+    },
+    // 搜索
+    search() {
+      this.getData();
+    },
+    // 新增
+    add() {
+      this.addSure = true;
+    },
+    // 确认新增
+    addSureClick() {
+      this.addSure = false;
+      this.delDialogText = "确定要添加地区限制访问吗?";
+      this.delDialog = true;
+      this.type = 3;
+    },
+    // 解除限制按钮
+    unfreeze(row) {
+      console.log(row);
+      this.delDialogText = "确定要解除限制吗?";
+      this.delDialog = true;
+      this.type = 1;
+      this.obj = row;
+    },
+    // 加入白名单
+    addWhite(row) {
+      console.log(row);
+      this.delDialogText = "确定要加入白名单吗?";
+      this.delDialog = true;
+      this.type = 2;
+      this.obj = row;
+    },
+    // 二次确认
+    sureClick() {
+      if (this.type == 1) {
+        relieve({ uid: this.obj.uid }).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "success",
+            });
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      } else if (this.type == 2) {
+        addWhite({ uid: this.obj.uid }).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "success",
+            });
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+      if (this.type == 3) {
+        recordSave({ erBanNoStr: this.selectUserId }).then((res) => {
+          if (res.code == 200) {
+            this.selectUserId = "";
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "success",
+            });
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+      this.getData();
+      this.delDialog = false;
+    },
+    // 分页导航
+    handleSizeChange(val) {
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      this.getData();
+    },
+    // sim格式化
+    tableArrFormat(val) {
+      //   console.log("aaaaaaaaaaaaa", val.simCards);
+      var str = "";
+      if (!val.simCards) {
+        return;
+      }
+      val.simCards.forEach((res, i) => {
+        str += `
+                sim卡${i + 1}: ${
+          res == 452
+            ? "越南"
+            : res == 454
+            ? "香港"
+            : res == 460
+            ? "中国"
+            : res == 466
+            ? "台湾"
+            : res == 456
+            ? "柬埔寨"
+            : res == 502
+            ? "马来西亚"
+            : res == 525
+            ? "新加坡"
+            : res == 510
+            ? "印尼"
+            : res == 414
+            ? "缅甸"
+            : res == 515
+            ? "菲律宾"
+            : res == 520
+            ? "泰国"
+            : res == 457
+            ? "老挝"
+            : res
+        }<br>
+            `;
+      });
+      return str;
+    },
+    // sim格式化
+    langFormat(val) {
+      var str = "";
+      if (val == null) {
+        str = "空";
+      }else if(val.match(/cn/gi)||val.match(/hans/gi)){
+        str = `${val}【简体中文】`;
+      }else if(val.match(/tw/gi)||val.match(/hant/gi)||val.match(/hk/gi)||val.match(/mo/gi)){
+        str = `${val}【繁体中文】`;
+      }else{
+        str = val;
+      }
+      return str;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+}
+</style>

src/views/accessRestriction/AccessWhitelist.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="outer">
+    <!-- 搜索 -->
+    <div class="search">
+      <div class="searchLeft">
+        <span>用户平台ID</span>
+        <el-input
+          v-model="userId"
+          size="default"
+          placeholder="用户平台ID"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="searchRight">
+        <span>用户手机号</span>
+        <el-input
+          v-model="userPhone"
+          size="default"
+          placeholder="用户手机号"
+          class="input"
+        ></el-input>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="buttonBox">
+      <el-button class="primary" type="primary" size="default" @click="add()"
+        >新增</el-button
+      >
+      <el-button class="primary" type="primary" size="default" @click="search()"
+        >查询</el-button
+      >
+    </div>
+    <!-- 列表 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用戶id" />
+      <el-table-column prop="phone" align="center" label="用戶手机号" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column prop="signTime" align="center" label="注册时间" />
+      <el-table-column prop="roleName" align="center" label="身份" />
+      <el-table-column prop="createTime" align="center" label="进入白名单时间" />
+      <el-table-column prop="lastCheckTime" align="center" label="最近一次访问时间" />
+      <el-table-column align="center" label="进入白名单来源">
+        <template v-slot="scope">
+          {{
+            scope.row.source == 1
+              ? "手动添加"
+              : scope.row.source == 2
+              ? "手机号申请通过"
+              : scope.row.source == 3
+              ? "限制访问记录添加"
+              : "未知来源"
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="400">
+        <template v-slot="scope">
+          <el-button
+            @click="delWhite(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >移除白名单</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500]"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 公共二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> {{ delDialogText }}</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureClick(val, type)"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 添加弹窗 -->
+    <el-dialog v-model="addSure" title="提示" width="30%" center>
+      <div class="selectBox">
+        <span class="left">添加号码类型</span>
+        <el-select
+          v-model="value"
+          fit-input-width="true"
+          placeholder="请选择"
+          class="right"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="selectBox" v-if="value == 1">
+        <span class="left">用户ID</span>
+        <el-input
+          v-model="selectUserId"
+          size="default"
+          placeholder="用户平台ID"
+          class="right"
+        ></el-input>
+      </div>
+      <div class="selectBox" v-else>
+        <span class="left">手机号</span>
+        <el-input
+          v-model="selectUserPhone"
+          size="default"
+          placeholder=""
+          class="right"
+          style="width: 56%"
+        >
+        </el-input>
+        <b>+86</b>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="addSure = false">取消</el-button>
+          <el-button type="primary" @click="addSureClick()"> 添加 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  whitePage,
+  whiteDel,
+  whiteSave,
+} from "@/api/AccessRestriction.vue/AccessRestriction.js";
+import { ElMessage } from "element-plus";
+export default {
+  name: "AccessWhitelist",
+  data() {
+    return {
+      userId: "", //用戶id
+      userPhone: "", //用戶手机号
+      loading: false, //列表loading
+      tableData: [], //列表数据
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      delDialog: false, //控制公共弹窗展示
+      delDialogText: "确定要移除白名单吗?", //公共弹窗标题
+      addSure: false, //控制确认添加弹窗展示
+      value: "1", //选择器
+      options: [
+        {
+          value: "1",
+          label: "用户id",
+        },
+        {
+          value: "2",
+          label: "用户手机号",
+        },
+      ],
+      selectUserId: "", //添加弹窗用户id
+      selectUserPhone: "", //添加弹窗用户手机号
+      obj: {}, //存放公共参数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 初始化
+    getData() {
+      this.loading = true;
+      whitePage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+        userErBanNo: this.userId,
+        phone: this.userPhone,
+      }).then((res) => {
+        this.tableData = res.data.records;
+        this.loading = false;
+        this.total = res.data.total;
+      });
+    },
+    // 新增
+    add() {
+      this.addSure = true;
+    },
+    // 搜索
+    search() {
+      this.getData();
+    },
+    // 移除白名单
+    delWhite(row) {
+      console.log(row);
+      this.obj = row;
+      this.delDialog = true;
+    },
+    // 二次确认
+    sureClick() {
+      whiteDel({ id: this.obj.id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.delDialog = false;
+      });
+    },
+    // 添加确认
+    addSureClick() {
+      var objs = {};
+      if (this.value == 1) {
+        objs = {
+          userErBanNoStr: this.selectUserId,
+        };
+      } else {
+        let phone = this.selectUserPhone;
+        if (phone) {
+          phone = '86' + phone;
+        }
+        objs = {
+          phone: phone,
+        };
+      }
+      whiteSave(objs).then((res) => {
+        this.selectUserId = "";
+        this.selectUserPhone = "";
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.getData();
+      });
+      this.addSure = false;
+    },
+    // 分页导航
+    handleSizeChange(val) {
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+  .selectBox {
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    width: 70%;
+    .left {
+      display: block;
+      margin-right: 25px;
+      white-space: nowrap;
+    }
+    .right {
+      width: 70%;
+      position: relative;
+    }
+
+    b {
+      font-style: normal;
+      position: absolute;
+      left: 135px;
+      width: 54px;
+      height: 32px;
+      line-height: 32px;
+      text-align: center;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      border-top-left-radius: 5px;
+      border-bottom-left-radius: 5px;
+      border-right: 1px solid #dcdfe6;
+      border-left: 1px solid #dcdfe6;
+      border-bottom: 1px solid #dcdfe6;
+      border-top: 1px solid #dcdfe6;
+      background: #fff;
+    }
+  }
+}
+input[type="file"] {
+  display: none;
+}
+</style>

src/views/activity/ActivityAwardAdminView.vue

@@ -590,9 +590,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/ActivityPackAdminView.vue

@@ -757,9 +757,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 </script>

src/views/activity/ChargeActivityAdminView.vue

@@ -1147,9 +1147,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/FamilyPKManageAdminView.vue

@@ -617,9 +617,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 </script>

src/views/activity/LuckySeaItemAdminView.vue

@@ -654,9 +654,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/LuckySeaPlatformAdminView.vue

@@ -166,9 +166,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/LuckySeaRecordAdminView.vue

@@ -289,9 +289,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/LuckySeaUserStatAdminView.vue

@@ -133,9 +133,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/OperationActAdminView.vue

@@ -256,9 +256,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/PageActivityView.vue

@@ -249,9 +249,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/UserDrawRecordAdminView.vue

@@ -138,9 +138,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/activity/WeekStarConfigAdminView.vue

@@ -409,9 +409,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/administrator/SuperAdminOperateRecordView.vue

@@ -184,9 +184,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/administrator/SuperAdminView.vue

@@ -136,9 +136,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 

src/views/anchor/AnchorAdminView.vue

@@ -221,9 +221,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/anchor/AnchorBillCheckView.vue

@@ -242,9 +242,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/anchor/AnchorBillUploadView.vue

@@ -261,9 +261,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/anchor/AnchorFansMpAudioView.vue

@@ -279,9 +279,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/anchor/AnchorFansPrivilegeView.vue

@@ -502,9 +502,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/anchor/AnchorFansTeamStatsView.vue

@@ -212,9 +212,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/anchor/AnchorReleaseGoldView.vue

@@ -254,9 +254,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/app/AppBottomBarAdminView.vue

@@ -1061,9 +1061,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/app/AppUpdateView.vue

@@ -434,9 +434,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/audiocard/AudioCardVerifyView.vue

@@ -264,9 +264,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/auditaudio/AuditAudioView.vue

@@ -551,9 +551,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/auditaudio/MonitorRuleView.vue

@@ -151,9 +151,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/batch/FlowDataBatchSearchView.vue

@@ -438,6 +438,11 @@ export default {
                         let id = $('#id').val();
                         let startTime = $('#startTime').val();
                         let endTime = $('#endTime').val(); 
+                        if (getDate(endTime).getMonth() != getDate(startTime).getMonth()) {
+                            $("#tipMsg").text("归因场次不允许跨月.");
+                            $("#tipModal").modal('show'); 
+                            return;
+                        }
                         if ((getDate(endTime).getTime() - getDate(startTime).getTime()) > (36 * 60 * 60 * 1000)) {
                             $("#tipMsg").text("时间间隔不能超过36h.");
                             $("#tipModal").modal('show');
@@ -536,9 +541,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/blinddate/BlindDateCapAdminView.vue

@@ -288,7 +288,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateCapModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -334,6 +334,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addCapModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -405,9 +406,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/blinddate/BlindDateJoinhandAdminView.vue

@@ -341,7 +341,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -387,6 +387,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -517,9 +518,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/callbattle/ActCallBattleItemAdminView.vue

@@ -570,9 +570,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/callbattle/ActCallBattlePlatformAdminView.vue

@@ -156,9 +156,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/callbattle/ActCallBattleRecordAdminView.vue

@@ -290,9 +290,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/callbattle/ActCallBattleUserStatAdminView.vue

@@ -133,9 +133,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/car/CarAdminView.vue

@@ -267,9 +267,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/car/CarGoodsAdminView.vue

@@ -1035,9 +1035,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/car/CarRecordView.vue

@@ -114,9 +114,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/car/CarStatisticsView.vue

@@ -125,9 +125,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/channel/ChannelContentPartitionAdminView.vue

@@ -489,9 +489,7 @@ export default {
 
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/charge/ChargeUserLimitView.vue

@@ -272,9 +272,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/charge/FirstChargeRewardConfigView.vue

@@ -482,9 +482,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/charge/FirstChargeRewardRecordView.vue

@@ -257,9 +257,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/charge/RedeemcodeAdminView.vue

@@ -197,9 +197,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/chatbubble/ChatbubbleManageView.vue

@@ -471,9 +471,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/chatbubble/ChatbubbleRecordView.vue

@@ -200,9 +200,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/discovery/DiscoveryAdminView.vue

@@ -548,9 +548,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 function clearForm(formId) {

src/views/dressShop/DressShopAdminView.vue

@@ -407,9 +407,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/face/FaceJsonAdminView.vue

@@ -815,9 +815,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/family/FamilyAdminView.vue

@@ -773,9 +773,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/family/FamilyMemberAdminView.vue

@@ -201,9 +201,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/family/FamilyMoneyAdminView.vue

@@ -472,9 +472,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/family/FamilyStatisticsView.vue

@@ -143,9 +143,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/finance/FinanceStatisticsView.vue

@@ -185,9 +185,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/findlove/FindLovePlatformPrizeDataAdminView.vue

@@ -228,9 +228,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/findlove/FindLovePoolItemAdminView.vue

@@ -823,9 +823,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/findlove/FindLovePrizeDrawRecordAdminView.vue

@@ -147,9 +147,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/FirstPageActivityBannerView.vue

@@ -959,9 +959,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/FirstPageBannerView.vue

@@ -977,9 +977,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/FirstPageOptView.vue

@@ -342,9 +342,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/FirstPageTabRoomView.vue

@@ -571,9 +571,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/FirstPageTabView.vue

@@ -476,9 +476,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/RecommendResourceAdminView.vue

@@ -575,9 +575,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/firstpage/RecommendRoomAdminView.vue

@@ -329,9 +329,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/floating/FloatingScreenView.vue

@@ -186,9 +186,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/flowteam/FlowTeamGroupManageView.vue

@@ -477,9 +477,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/flowteam/FlowTeamInvitecodeManageView.vue

@@ -256,6 +256,21 @@ export default {
                                 return date.format('yyyy-MM-dd hh:mm:ss');
                             }
                         },
+                        { 
+                            field: 'source', 
+                            title: '邀请码填写类型', 
+                            align: 'center', 
+                            width: '5%',
+                            formatter: function (val) {
+                                let value = '';
+                                if (val == 0) {
+                                    value = '自填';
+                                } else if (val == 1) {
+                                    value = '补填';
+                                }
+                                return value;
+                            } 
+                        },
                         {
                             field: 'memberId',
                             title: '操作',
@@ -382,9 +397,7 @@ export default {
 
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 // 初始化团队选择器

src/views/flowteam/FlowTeamMemberAdminView.vue

@@ -454,9 +454,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 

src/views/flowteam/FlowTeamSettlementView.vue

@@ -206,8 +206,11 @@ export default {
                         { field: 'totalChargeAmount', title: '累计充值(美元)', align: 'center', width: '5%', },
                         { field: 'totalChargeUserNum', title: '累计充值人数', align: 'center', width: '5%', },
                         { field: 'totalChargeNum', title: '累计充值次数', align: 'center', width: '5%', },
-                        { field: 'totalGiveNum', title: '累计收到转赠次数', align: 'center', width: '5%', },
+                        { field: 'newUserGiveAmount', title: '当月新增转赠', align: 'center', width: '10%', valign: 'center' },
-                        { field: 'totalGiveAmount', title: '累计收到转赠金额', align: 'center', width: '5%', },
+                        { field: 'totalGiveAmount', title: '累计转赠(美元)', align: 'center', width: '5%', },
+                        { field: 'totalGiveUserNum', title: '累计转赠人数', align: 'center', width: '5%', },
+                        { field: 'totalGiveNum', title: '累计转赠次数', align: 'center', width: '5%', },
+                        
                         {
                             field: 'month',
                             title: '操作',
@@ -352,9 +355,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/flowteam/FlowTeamStatisticView.vue

@@ -477,7 +477,7 @@ export default {
                     groupData.tchargeMoney = tchargeMoney;
                     groupData.tsendGiftMony = tsendGiftMony;
                     groupData.tgiveCount = tgiveCount; 
-                    groupData.tgiveMoney = tgiveMoney;
+                    groupData.tgiveMoney = tgiveMoney.toFixed(0);
                     groupData.tarpu = (tchargeMoney / tnewUserCount).toFixed(2);
                     groupDataList.push(groupData);
                 }
@@ -793,9 +793,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/flowteam/RefillInviteCodeView.vue

@@ -254,9 +254,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/game/GameAccessUrlView.vue

@@ -306,9 +306,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/game/GameActivityRankView.vue

@@ -770,9 +770,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/game/GameChannelView.vue

@@ -333,9 +333,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/game/GameFaceView.vue

@@ -364,9 +364,7 @@ export default {
             })
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/game/GameInfoView.vue

@@ -785,9 +785,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 function cleanModal(obj) {

src/views/gamemanage/GameBillRecordAdminView.vue

@@ -193,9 +193,7 @@ export default {
             }
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/gamemanage/GameManageBannerView.vue

@@ -970,9 +970,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/gamemanage/GameManageChannelTicketView.vue

@@ -535,9 +535,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/gamemanage/GameManageGiveTicketView.vue

@@ -100,9 +100,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/gamemanage/GameManageGroupAdminView.vue

@@ -390,9 +390,7 @@ export default {
 
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/gamemanage/GameManageInfoAdminView.vue

@@ -1207,9 +1207,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 function clearModal() {

src/views/gamemanage/GameManageQuickGameInfoAdminView.vue

@@ -1304,9 +1304,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 function clearModal() {

src/views/gamemanage/GameManageTicketAccessView.vue

@@ -297,9 +297,7 @@ export default {
 
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 
 // 根据type获取路径名称

src/views/gamemanage/GameManageTicketHistoryAdminView.vue

@@ -218,9 +218,7 @@ export default {
 
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/gamemanage/GameManageWithdrawAdminView.vue

@@ -579,9 +579,7 @@ export default {
             });
         }
     },
-    unmounted() {
+
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>