diff --git a/fuintAdmin_zt/.editorconfig b/fuintAdmin_zt/.editorconfig
deleted file mode 100644
index 7034f9bf3..000000000
--- a/fuintAdmin_zt/.editorconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# 告诉EditorConfig插件，这是根文件，不用继续往上查找
-root = true
-
-# 匹配全部文件
-[*]
-# 设置字符集
-charset = utf-8
-# 缩进风格，可选space、tab
-indent_style = space
-# 缩进的空格数
-indent_size = 2
-# 结尾换行符，可选lf、cr、crlf
-end_of_line = lf
-# 在文件结尾插入新行
-insert_final_newline = true
-# 删除一行中的前后空格
-trim_trailing_whitespace = true
-
-# 匹配md结尾的文件
-[*.md]
-insert_final_newline = false
-trim_trailing_whitespace = false
diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development
deleted file mode 100644
index 3f0000c2e..000000000
--- a/fuintAdmin_zt/.env.development
+++ /dev/null
@@ -1,18 +0,0 @@
-# 页面标题
-VUE_APP_TITLE = 百业兴智慧油站系统
-
-# 开发环境配置
-ENV = 'development'
-
-# fuint会员营销系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
-
-# 发布目录
-VUE_APP_PUBLIC_PATH = '/'
-
-# 后端接口地址
-
-VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
-
-# cp端地址
-# VUE_PC_SERVER_URL = 'http://192.168.31.72:8081/'
diff --git a/fuintAdmin_zt/.env.production b/fuintAdmin_zt/.env.production
deleted file mode 100644
index 3dce2b9f3..000000000
--- a/fuintAdmin_zt/.env.production
+++ /dev/null
@@ -1,17 +0,0 @@
-# 页面标题
-VUE_APP_TITLE = 百业兴智慧油站系统
-
-# 生产环境配置
-ENV = 'production'
-
-# fuint会员营销系统/生产环境
-VUE_APP_BASE_API = '/fuint-application/'
-
-# 发布目录
-VUE_APP_PUBLIC_PATH = '/oilZt/'
-
-# 后端接口地址
-VUE_APP_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'
-
-# cp端地址
-VUE_PC_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'
diff --git a/fuintAdmin_zt/.env.staging b/fuintAdmin_zt/.env.staging
deleted file mode 100644
index d8673edd1..000000000
--- a/fuintAdmin_zt/.env.staging
+++ /dev/null
@@ -1,16 +0,0 @@
-# 页面标题
-VUE_APP_TITLE = 百业兴智慧油站系统
-
-# 测试环境配置
-ENV = 'staging'
-
-# fuint会员营销系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
-
-# 发布目录
-VUE_APP_PUBLIC_PATH = '/'
-
-# 后端接口地址
-VUE_APP_SERVER_URL = 'https://oilapi.youkerr.com/oilAdmin/'
-# cp端地址
-VUE_PC_SERVER_URL = 'https://oilapi.youkerr.com/oilAdmin/'
diff --git a/fuintAdmin_zt/.eslintignore b/fuintAdmin_zt/.eslintignore
deleted file mode 100644
index 89be6f659..000000000
--- a/fuintAdmin_zt/.eslintignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# 忽略build目录下类型为js的文件的语法检查
-build/*.js
-# 忽略src/assets目录下文件的语法检查
-src/assets
-# 忽略public目录下文件的语法检查
-public
-# 忽略当前目录下为js的文件的语法检查
-*.js
-# 忽略当前目录下为vue的文件的语法检查
-*.vue
\ No newline at end of file
diff --git a/fuintAdmin_zt/.eslintrc.js b/fuintAdmin_zt/.eslintrc.js
deleted file mode 100644
index 82bbdeea6..000000000
--- a/fuintAdmin_zt/.eslintrc.js
+++ /dev/null
@@ -1,199 +0,0 @@
-// ESlint 检查配置
-module.exports = {
-  root: true,
-  parserOptions: {
-    parser: 'babel-eslint',
-    sourceType: 'module'
-  },
-  env: {
-    browser: true,
-    node: true,
-    es6: true,
-  },
-  extends: ['plugin:vue/recommended', 'eslint:recommended'],
-
-  // add your custom rules here
-  //it is base on https://github.com/vuejs/eslint-config-vue
-  rules: {
-    "vue/max-attributes-per-line": [2, {
-      "singleline": 10,
-      "multiline": {
-        "max": 1,
-        "allowFirstLine": false
-      }
-    }],
-    "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
-    "vue/name-property-casing": ["error", "PascalCase"],
-    "vue/no-v-html": "off",
-    'accessor-pairs': 2,
-    'arrow-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'block-spacing': [2, 'always'],
-    'brace-style': [2, '1tbs', {
-      'allowSingleLine': true
-    }],
-    'camelcase': [0, {
-      'properties': 'always'
-    }],
-    'comma-dangle': [2, 'never'],
-    'comma-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
-    'comma-style': [2, 'last'],
-    'constructor-super': 2,
-    'curly': [2, 'multi-line'],
-    'dot-location': [2, 'property'],
-    'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
-    'generator-star-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'handle-callback-err': [2, '^(err|error)$'],
-    'indent': [2, 2, {
-      'SwitchCase': 1
-    }],
-    'jsx-quotes': [2, 'prefer-single'],
-    'key-spacing': [2, {
-      'beforeColon': false,
-      'afterColon': true
-    }],
-    'keyword-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'new-cap': [2, {
-      'newIsCap': true,
-      'capIsNew': false
-    }],
-    'new-parens': 2,
-    'no-array-constructor': 2,
-    'no-caller': 2,
-    'no-console': 'off',
-    'no-class-assign': 2,
-    'no-cond-assign': 2,
-    'no-const-assign': 2,
-    'no-control-regex': 0,
-    'no-delete-var': 2,
-    'no-dupe-args': 2,
-    'no-dupe-class-members': 2,
-    'no-dupe-keys': 2,
-    'no-duplicate-case': 2,
-    'no-empty-character-class': 2,
-    'no-empty-pattern': 2,
-    'no-eval': 2,
-    'no-ex-assign': 2,
-    'no-extend-native': 2,
-    'no-extra-bind': 2,
-    'no-extra-boolean-cast': 2,
-    'no-extra-parens': [2, 'functions'],
-    'no-fallthrough': 2,
-    'no-floating-decimal': 2,
-    'no-func-assign': 2,
-    'no-implied-eval': 2,
-    'no-inner-declarations': [2, 'functions'],
-    'no-invalid-regexp': 2,
-    'no-irregular-whitespace': 2,
-    'no-iterator': 2,
-    'no-label-var': 2,
-    'no-labels': [2, {
-      'allowLoop': false,
-      'allowSwitch': false
-    }],
-    'no-lone-blocks': 2,
-    'no-mixed-spaces-and-tabs': 2,
-    'no-multi-spaces': 2,
-    'no-multi-str': 2,
-    'no-multiple-empty-lines': [2, {
-      'max': 1
-    }],
-    'no-native-reassign': 2,
-    'no-negated-in-lhs': 2,
-    'no-new-object': 2,
-    'no-new-require': 2,
-    'no-new-symbol': 2,
-    'no-new-wrappers': 2,
-    'no-obj-calls': 2,
-    'no-octal': 2,
-    'no-octal-escape': 2,
-    'no-path-concat': 2,
-    'no-proto': 2,
-    'no-redeclare': 2,
-    'no-regex-spaces': 2,
-    'no-return-assign': [2, 'except-parens'],
-    'no-self-assign': 2,
-    'no-self-compare': 2,
-    'no-sequences': 2,
-    'no-shadow-restricted-names': 2,
-    'no-spaced-func': 2,
-    'no-sparse-arrays': 2,
-    'no-this-before-super': 2,
-    'no-throw-literal': 2,
-    'no-trailing-spaces': 2,
-    'no-undef': 2,
-    'no-undef-init': 2,
-    'no-unexpected-multiline': 2,
-    'no-unmodified-loop-condition': 2,
-    'no-unneeded-ternary': [2, {
-      'defaultAssignment': false
-    }],
-    'no-unreachable': 2,
-    'no-unsafe-finally': 2,
-    'no-unused-vars': [2, {
-      'vars': 'all',
-      'args': 'none'
-    }],
-    'no-useless-call': 2,
-    'no-useless-computed-key': 2,
-    'no-useless-constructor': 2,
-    'no-useless-escape': 0,
-    'no-whitespace-before-property': 2,
-    'no-with': 2,
-    'one-var': [2, {
-      'initialized': 'never'
-    }],
-    'operator-linebreak': [2, 'after', {
-      'overrides': {
-        '?': 'before',
-        ':': 'before'
-      }
-    }],
-    'padded-blocks': [2, 'never'],
-    'quotes': [2, 'single', {
-      'avoidEscape': true,
-      'allowTemplateLiterals': true
-    }],
-    'semi': [2, 'never'],
-    'semi-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
-    'space-before-blocks': [2, 'always'],
-    'space-before-function-paren': [2, 'never'],
-    'space-in-parens': [2, 'never'],
-    'space-infix-ops': 2,
-    'space-unary-ops': [2, {
-      'words': true,
-      'nonwords': false
-    }],
-    'spaced-comment': [2, 'always', {
-      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
-    }],
-    'template-curly-spacing': [2, 'never'],
-    'use-isnan': 2,
-    'valid-typeof': 2,
-    'wrap-iife': [2, 'any'],
-    'yield-star-spacing': [2, 'both'],
-    'yoda': [2, 'never'],
-    'prefer-const': 2,
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'object-curly-spacing': [2, 'always', {
-      objectsInObjects: false
-    }],
-    'array-bracket-spacing': [2, 'never']
-  }
-}
diff --git a/fuintAdmin_zt/.gitignore b/fuintAdmin_zt/.gitignore
deleted file mode 100644
index 78a752d87..000000000
--- a/fuintAdmin_zt/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-**/*.log
-
-tests/**/coverage/
-tests/e2e/reports
-selenium-debug.log
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.local
-
-package-lock.json
-yarn.lock
diff --git a/fuintAdmin_zt/README.md b/fuintAdmin_zt/README.md
deleted file mode 100644
index 9935fdd6c..000000000
--- a/fuintAdmin_zt/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## 开发
-
-```bash
-
-# 进入项目目录
-cd fuintAdmin
-
-# 安装依赖
-npm install
-
-# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npmmirror.com
-
-# 启动服务
-npm run dev
-```
-
-浏览器访问 http://localhost:8081
-
-## 发布
-
-```bash
-# 构建测试环境
-npm run build:stage
-
-# 构建生产环境
-npm run build:prod
-```
\ No newline at end of file
diff --git a/fuintAdmin_zt/babel.config.js b/fuintAdmin_zt/babel.config.js
deleted file mode 100644
index b99f00148..000000000
--- a/fuintAdmin_zt/babel.config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = {
-  presets: [
-    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
-  ],
-  'env': {
-    'development': {
-      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
-      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
-      'plugins': ['dynamic-import-node']
-    }
-  }
-}
diff --git a/fuintAdmin_zt/package.json b/fuintAdmin_zt/package.json
deleted file mode 100644
index 76f6631bd..000000000
--- a/fuintAdmin_zt/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "name": "fuintAdmin",
-  "version": "3.0.3",
-  "description": "fuint会员营销系统后台管理端",
-  "author": "FSQ",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "中台": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/fuint/fuint-uniapp.git"
-  },
-  "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
-    "bignumber.js": "^9.1.2",
-    "clipboard": "2.0.8",
-    "core-js": "3.25.3",
-    "echarts": "4.9.0",
-    "element-ui": "2.15.12",
-    "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "nprogress": "0.2.0",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "vue": "2.6.12",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
-    "vue-print-nb": "^1.7.5",
-    "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0",
-    "vuex-persistedstate": "^4.1.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "4.1.0",
-    "compression-webpack-plugin": "5.0.2",
-    "connect": "3.6.6",
-    "eslint": "^6.0.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
-}
diff --git a/fuintAdmin_zt/public/favicon.ico b/fuintAdmin_zt/public/favicon.ico
deleted file mode 100644
index 253590774..000000000
Binary files a/fuintAdmin_zt/public/favicon.ico and /dev/null differ
diff --git a/fuintAdmin_zt/public/html/ie.html b/fuintAdmin_zt/public/html/ie.html
deleted file mode 100644
index 052ffcd64..000000000
--- a/fuintAdmin_zt/public/html/ie.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8" />
-    <title>请升级您的浏览器</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
-    <meta name="renderer" content="webkit">
-    <base target="_blank" />
-    <style type="text/css">
-        html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing:0}
-        a{text-decoration:none;color:#0072c6;}a:hover{text-decoration:none;color:#004d8c;}
-        body{width:960px;margin:0 auto;padding:10px;font-size:14px;line-height:24px;color:#454545;font-family:'Microsoft YaHei UI','Microsoft YaHei',DengXian,SimSun,'Segoe UI',Tahoma,Helvetica,sans-serif;overflow-y:scroll}
-        h1{font-size:40px;line-height:80px;font-weight:100;margin-bottom:10px;}
-        h2{font-size:20px;line-height:25px;font-weight:100;margin:10px 0;}
-        em{color:red}
-        p{margin-bottom:10px;}
-        hr{margin:20px 0;border:0;border-top:1px solid #dadada}
-        span{display:block;font-size:12px;line-height:12px;}
-        .clean{clear:both;}
-        .browser{padding:10px 10px;}
-        .browser li{width:auto;padding:0 80px;margin-top:30px;height:34px;line-height:22px;float:left;list-style:none;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAADMCAYAAAAWCXEwAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAC7ESURBVHja5Lx5dFRV1rBfgHwYRQQVtB26ZWhtabtfeUGxGxFbUGZF8RMHGkVbRkekVYiKisicVhE0gEwBokgDAhEMMSSQkAECwcxkrlRSqVTqJqnxzs/vj5t7qUyAvr9e37fWV2vtleSm6p6n9t5nn733OVU2RaUaEP5PiqJSbeMXPBTA5/Xhzk9Vnd9vo3HFx21E2LYJX9IRgh6npvyCe9uaqS4K4C3IpXHFx9S99CTuJ8Z0KLVjRlA7ZgTuJ8ZgXxmJL+kIlwAkXBQk6HFq9pWRVA8fSvXwodYgdS892a6EA1UNvouqwXdR99KTeAtyfz2IL+kI1cOHYh9wqwVwKWJqpXbMCOv19gG3Imzb1JF2OgZxfr/NukH4jcNVfyEAE8IU+4BbKet1PfaVke3BtA/i/H6b8aIBt7a4mWmaC0nr55vmqRp8F5V33Mm5LhHtwbQF8SUdsSDCb1I1+K42g1xIWgOYYh9wK+e6RCBs29QxSIWus37aJM51iWjx4so77mwD1d5AHQ1eecedlN9yuyVlva6nrNf14Q7cEmRn4W7u3T2E9ME3UX7L7W1uZg5Weced1s3sA2613ql5LXzQjuRclwjcT4wxTXQeRHC7GLdnHPeensiCVwa3e0PznZk3EbZtwluQa0kofz8NcVNxr++Ce30XnNuv61Bcu7viXt8Fvyu7JYipjfGHxzD+8Bh2j+7fAiZcC+Y0zPDIbCyD6DyV6DyVeDcIQR2C39J4oieNJ3oSOnkVcnZ35Ozu6MVdDHF0N6S4C43OqJYg/0ydzb27hzDx0FjuPT2R+asfa6OVsl7X40s6QoWus/CQk6fWZPHChhxe3lbMCxtyrN9TyxSQSwidvMoC0XK6tRGybPjSRmOuNUKVo4Zxe8YxIu4+Jh4ay/jDY7j39MQWWjnXJYLGFR9Toes8tSaLiavTrIHDxfxfapkCwW8hy9YuhCmhk1fR1FRnaCS1NM4yy8RDYy2tjIkZRXq/HtYsCnqc2sJDTkYsTrU00J6YkEJQR7M/eEGY0MmrcOenqjZA2JmyzTJLuJiOe65LBHUvPUmGR2bE4lQmrk7jqTVZHcrE1WkMWpRIdJ4KnpUXBCHLRl3e16EWIOEaMU00/vAY9na/gsYVH/NdgYe+8w9bMBeSQYsSWXjICcFvL2ga+dhlFwcJ10rjio/ZklprgbSWiavTWvzdd/5hXt5W/OtATC201sq9u4eQ+PVijmSW0nf+YQYtSmTQosR2gUYsTmXQokT6zj9saeRCpmkJ0hxD2gOZeGgsI+Lu45+ps7FXlFmDmDDtSd/5h+k7/zCpZQpa9cwOQciyIR+77LyzFhXlMyZmFOP2jLP8orVWRsTdR2ppHFtSa+k6ZZM1WHvSdcomwyxySceayO4OWTY88TdirygzUkWf18eL2//RQiutYcwYE/Q4tagDOUQ8uo6uUzbRZ3qMJV2nbCLi0XU8tSbrolNXzu6OfOyylgEN4NOkaO5acw/j9ozr0ET37h5imehIZimPL91rAfSZHsOQBfuISS7E7vaTETeX0MmrOoQInbwK+dhlNKWsahni0zPSuGvNPW1M1BrI1NrOwt0WkCn2ijJSS+MYt2ccuQk3oxd36RCi8URPY+HLT1VbgGiSzPsx71laCddMe2Yygf6ZOtuScXvG0XfJn/n8YL+LQnjibyQ34WZ8Xl/bfKSoKL+FVi4EYwKZcu/uIQzaPoExMaPQcrq1ADFX33AI1+6u1OV9HVI6ShU/TYqm75I/dwjTHtDEQ2MZt2ccg7ZPaGGScIDWEBlxc42UoSMQ00StYdoDCgcbtH0Cbx+8p40ZTIBwiFM7RmB3+y+exZvT2YRpDdR6ZoVrw1xRWwN44m/Euf06A6Ki7NLrmnDNmH7TEdSg7RP4/GA/yLK1GdwEKNzSk1M7RlDlqPl1JefOlG2MXTGmXaAxMaMsB/XE34h4tH+7ANlrB7T2iV8OAlDlqOH9mPcsIBPKlF3R16Ad7GwlxoVberYAKCrKv1ghfmkg5sPldLIzZVsLqLErxpC9doAlp3aMICNurlGyVpRdSAu/HqS1Q58rd1JUlI87P1UtKsrHXlGG3e1HCOoov+x2wiX3RxT+o49L1IgutXxVUCfDIxNfLraQDI+M3e3/NdCXbhohqBNfLrIsVzZqmoT6dmXG0SBLTrmJLxd/CVRLECXcDGFaSC1TmHE0yKg4B0P2uxiy38WoOAePHaptAfHYoVqG7HcxcGc5o+IcfFfgsbQUPoYoSa213BbE78oGucTSwpJTbobFFjNgbQHdvi6g8/Z6Om+vZ8h+VxsQE7T/97UMWFvA+Og0UvIryfDIZBQ4CeXvt8a5IAhAY/RImlJWUaHrPHaolhuXFXHN+8e58qNcbomq5P6t3xG973WePLzPgnnsUG0LiP7f1zJwZzk3LisyctfSOFxOJ4lfLzYToQubxu/KpmpWBFWzInguOokrP8ql7/zDRMxLpFfUabasHwlZNnITbmbgznI6b6+3Bu7/fa2lrW5fF9Ar6jQD1hYwLLaYx5fupdi+EiGok748koa4qa010xKkKWUV2UM7kd6vB7tH9yfpnUFkLzQiZOGWnmgHO9N4oie9ok5bA4YPbkqvqNNc8/5xIuYl8tSaLOLLRXambENXF+PxNJD0ziAanVHhYaEliH1lJD/1iqD0qSsIzu2M/N550TZ3QjvYmS3rR1qDtwdhgpgwnabGMj46zRjQsxJdXYw7P1X1pY0GuaRjkMKxPah5qxuV8y6nct7l1LzVDfdyo6miHexM+ou9mblwKfdv/Y77t37HNe8fbwMQDhIxL5FOU2PZklqLJjUYdU7wWxBuN+ricBAF0KQG6pcNovZpw0fCQao/MEBcu7tSOLYHjnu7EZzbmeDczqyfNokrP8ptMXi4XDnzAJ0n72TIgn1oUoMB4VlpgIjj24I0payi9KkrqHj+Ssth2wM5c38f8p68D2nbHKRtc3h86d42A/eZHsOVMw9Y0nXKJmxDvyS1NA70z8Gz0qh5hNvbzpr6ZYMofzyiBUwLkOVdjfR/eVcao0dSl/d1aHx0GhHzEi0TXDnzAJ2mxtJpaixdp2yypM/0GLrcs5D3Y94ztNDsK7qjuxmzDBBz2rYGqZoVQc1b3dr4yfppk+g8eWeLd91aAxGPrqPbyKV0G7mUiEfXMWdz+nmQ0Jsgn1AbT/SkMXrkeZC6vK9DpU9d0S5I5bzLqf6gq6UV7WBn5q9+zDJBuEQ8us4SE6LLPQvpcs9CjmSW4ndlo1XPNBxWLiE34WbSX+wNapEBEsrfT/njERSO7WGBmDA1b3Wj9KkrSO/Xg1WjBjJl/CT+8sQ8a0BT/eGDhwN0uWchXe94ia07YkE+oSLc3gxyQt2yfiSrRg0E+YRqgRSO7UHh2B4UT7ragqmcdznFk67mp14ROO7txpTxk7AN/bLFgN1GLsU29EvrejiACdG59xQjKgu3GzVP9UwIvcmCVwYb102NmBHVBDFNVDUrgjP39yF98E0E5xox5Dcj5lsDhwOYQObg4dK59xR2RV8D4njEo/0NIEd3dkVfgy9t9HkfMTWSO6pXG63kjupF8aSrqXj+SoJzO1M573KmjJ/Eb0bM5y9PzGPBK4Mp3GKUEFvWj+Q3I+a3AOjcewp/eWKesUQ0T1mz2att7oSU9+F5EE2SqXvpSbKHdrIGNmHCoapmRVgh33LezZ3QNncyloGDnVnwyuA2IFvWj0Q+dplREzu6Wy0r9/KubVvg9pWRpPfrwZn7+1haMSHCxdSM/J4RWWufjiC9Xw/m9PgtN9w0uo1JbrhpNI0njAXTrAIbT/TEvb4LjdEj2641vqQjpPfrQfrgm1qYKHxKlz51BbmjerFj4G2WtAYwtWDKglcGG2ZoXrldu43AWDUrAmnbnLaRVZMayHvyPn7qZThoa38pfeoKap+OIDi3M6tGDeSGm0a3GTT82g03jeaGm0bj3H4d8rHLrN0I93LDpDsG3kb68si2a425hfZTrwjSB9/UBiZcM+YM6ghoyvhJpL/Ym+yFhknc67tYQVF+z3gjc3r8Fuf32zpOFTMeHXpRGDNfMYF2j+7PqlEDWTVqIOkv9rZ8SNvcCff6LlTOu9yK1Okv9mZOj9+S8ehQNKmBDhs17vxU9adeES1gwoHKH49oFyhcwhfKynmXWzOu4vkryR7aieyhnQjl7+84QzNNJGzbxN7uV1gw7WmntYZaLw2mmNdrn44ge2gnztzfx9od7zBnDa9t0pdHtgsTDhRustaaCndwEyLj0aG481PVS9r3FSUJj6eBrConMZHvnodpntrh2gkHCgcLl/TBN7G3+xXGLMlIo0LXjU7ixeoaUZIQ3C7OlTtJya8kJvJddgy8DctvWgGFaylcHPd2Y2/3K5jT47esGjWQrTtiyapy4nI6jUrvUmpfUytFRfmkZ6SxdUcs66dNYsfA2ywNtQBrJeb/dgy8jZjId/kx4YgF4fP6Ln1L3uyhhWvnSGYpOw6lEBP5LuunTWLDAw+x4YGHrAi74YGHWD9tEuunTSIm8l227ohtAyBK0i8/pNDagTVJxuf1YXf7OVfuJKvKMF16RhrpGWkcySwlJb+SrCqn1awRgjqaJP9nO0b/Zxo1v+ahS0ZqKJ9QCX5rJMyhN42aRj6h/udB5BKjiAp+i64uNrJ2M0Vs3rUiy4aU92G42X49iCYZDZjUMoX4ctFIcILfGgVU6E0LwEyCxKP98aWNxpc2GvFof+RjlyHlfdjxWnOxh93tJya5kIWHnDx2qJbnopP4NCmaYvtKC0LL6WYkQps70RA3laaUVbjzU1V7RRn2ijK8BbkWUJsM7VIAog7k8MyuPKtD1AJA/9zQQpYN9/oubFk/kpkLl7J4a0KbtrdZa/vSRrfMWS8GcSSzlGd25TH5VIjptTpR9T5SS+OMsrHZD3RHd7SDnTm1YwSzY2KsTtL46DSei07iSGZpm/tKeR8a5gnf0+vI8zfE5zAstpjptTrvifBJeeZ5LTQDkGXDtbsr0fte59mjDmaWaUyv1ZlZpvH3XJlRcQ6Grj5OTHJhy/t7VhrpwMVAog7kMCrOwcs+nZWaccak2L7S0oLpC6d2jGDJiUyWN8E6FVZqsLwJ5ruwYO5O9jFoUSIb4nPOT+/gtxf3kZjkQobFFreAaHRGGZoQbm+hhWd25fHsUQevHilgbo7bAmoNM2S/i6Grj3Mks9Tolcgn1Hb39MzHuXInw9edZrJd4z3xPISuLrYgCrf0ZOuOWKLzVFLLFDIKmlfr5EJmHMxhfoWvDczkUyELxl5RduFUUZNkIvdm8+BpkZd9eocQPyYc6XDnocpRQ+TebObmuFmptdTK5FMhBqwt4K1vMi4cWTMKnIyKczDZrvFJeWaHEBdrbVc5aphxMIflTR1rJaPA2TFI1IEc7k72tZwdYRCLtyZc6h4MMcmF7WrlwRSRAWsLiNyb3T6Iz+vjmV15jIpztIHwxN/I7JgY4svFS47CHk9DG62Y5hm4s5zx0Wntb0CnlikMiy3m06ToFpFSO9iZnSnbeGZXHkcyS8kocF6SHMksZc7m9AuaJyW/si3IltRaZsfEGNM09KZVs2bEzWV5EyzLlXn1SEG7MuNgTruy5JS73dlzd7IvPMi1BIlJLmRnyjbLJFawar7ZHi5NdrSS9jRyd7KPXlGnzQDXyjSlcYY2mk1SuKUnS05kslI7f9M9/HKgdaoh74nn/cR02NV7M9t2A9A/t/qf2uZOvB/zHvNdxk3Mm0bV+36VzK8wxHTWVutPmEbkE6q1hjQ3/yefCvGeeB7k1SPGlLsUeeubDOtnezJnczpvfZPBuXJnGEjzAqSri9FyulG4pSf3b/3OCvErNQNmxsEczpU70ST5kuWXJc9yiZXemQ3du5N9TK/VedmnW1qZm+M+v3r+gpTS42nA42nA5XRa4vE0hFd8zSDBb63cInvtAAYtSuTuZB+T7ZoFYy7tz+zK6+igQZtHRoGTyL3ZLab4M7vyGB+dxpAF+1i8NaEliLmWyNndsa+MZPi60/T/vpaJhTKT7ZqllZWaoZW3vsnA42m4IMS5cifPRScxN8fNeyK87NOZXqszsdDITa55/3i4dgVb0OPUTG2IR/vjzk9Vt6Qau5R3J/uYWCi3MJEJM2dzOkcyS80Q3WKrPia50IIIX2cmnwrxYIpIr6jTPBed1Mo0apFgpv0NcVMR3C5ESWLO5nS6fV3Ag6fFdmHmV/iYcTCHyL3ZRB3IsSRybzbP7MpjfoWvXYj+39cyZME+c7aEgTQ36smy0RA31dostrv9DF193IIJ9xcTxgSam+O2xAQwg9fMMo2JhTIPnjYgBi1KbC+RPq8REyR8iT9X7rRgWptpvssYLBwqHGB6rc7fc2ULYsh+F4MWJbLjUErH09c8ytcaxNTMCxtyGLC2oIUDT6/VO5TJdkMLJsTAneUMWpTYNotvE0eaj3rKxy6zun2t69mdKdt4fOley4lN35ls11pIOIC51D8XnWQu9xcGUQCteibyscuM5n31TKNqD5fm1H9DfA7PRScxdPVxhsUWMyy22Dq4MGS/i2GxxQxfd9oC2HEopb1WVcdtCU2Sqcv7OmTWpGbRLOV9SCh/P0GPUwvPvDIKnMQkFxK5N5s5m9N5LjqJ56KTeOubDFbvzSQlv7LN1P5FxzZ8Xp918v8SWk5WsWStLbr0a5oLHRdY/+GjPP8vtq7+0yCiJOHz+hDcLlxOJ2bzxeV0Irhdlk/9x0B8Xh9VjhoEt6s5rZTaFU1qQHC7qHLU/PpZ05EGqhw1uJxO0CVESSIlv5KoAznM2ZxufTJgzuZ0og7kkJJfaR1mcjmdVDlqflkc6ahSs1eUWdMzJrmQQYsSrYMJNy4raiHmYQWzD2IC2SvKLpa/dAzi8/qsc6cZBU6GLNjHlTMPcEtUJVMSdd45qRGdp7KxDOvDPu+c1JhxNMgtUZVcOfMAQxbss0K7vaLsQqbq+GCtCbEhPodOU2O58qNcZhwNsrMK4t0Xlp1VMONokCs/yqXT1FgrE7sATPvbJK0hblxWxDsnNWugvc7zcqFry3JlbomqbANzSdskpk9kFDjpOmWTpQnzne6sMgbbWWWYY8kpN0tOuYnOU1v8z9TcOyc1blxWRNcpmwwz6dLFjxr7vD5rY+eO13YSMS+Rh/co1iAby4wBluXKLDnl5rsCD1lVxk7FdwUelpxysyxXbvHcjWUwYb9CxLxE7nhtp7X10spELUHMMiHqQA6dJ+9k8KYaJh1u6ZRLTrnZklrb+hS3lURtSa1lySm39fyNZTAlUWfwpho6T95p1rqtS5LzICapJsmWNkbEBpiSqLMs1/gY3DsntfAuT4tDlkrYtci92bxzUmNjmaG9KYk6I2IDbbTStsBqjhma1EBKfiVdp2xiwNoCHt6jMOmwxjsnNev46KWUkaIksfCQk2W5Mu+c1Jh0WGPCfoUBawvoOmWT1d4Miy3nQczIuXpvJp2mxjJ4Uw0T9hsg09KM6fhcdBIxyYWXJM9FJzHjaJBpaTDpsAEzeFMNnabGGhVec+RtA1LlqAFd4vGley0Q8wZTEnWmpWGdWX3sUC3PHnW0K+b/n0qoZ1oaTEszfCQc5PGle0GXwv0k7PxI87S9EMjMMo35rvMdILPDbErrzlA4iOmw4SBh0/iXgUxLg8mnQvw9V2Zmmdau/D1XtpoxpiYe3qPw8B6FW6IqreOCvwpkWhqMinMwaFEi46PTfrFMXG38HLr6OHe8ttPykXZNYzrr4q0JdJoay4C1BS2cdfCmGuZsTrd6Hv/T5ozZJ7no9L1xWZE1fU0bD193unXx3GESFZNcyIb4nDazaUN8Dh6PkTy1O307CmgT9itM2K9YWnkuOumi26wTV6dZR43NXOXKj3LpPHknEY+us0DaDWiWnwCr92bSdcomBm+q4eE9ShsThTXh2jRn5mxOZ/CmmjYzZkRsgE5TY40Q33bhu/iiF66VcJjh604TuTfbUnnk3myGrzttQZgzZtJhzQrvfabHWGNccNELnz2tfSUcJjxADVhbwIC1BdYsMyOp+fyH9yhWGnAks/TS0gDTV4qK8q2NxU5TY7klqrIFTDhQ6+gZ/hwzdoSbpKgo/9LPj5hnR8yUwEwVw810MRkRG7BSRXPpLyrKv/RUsT2YI5mlLZLnEbEBK1q2lhGxASt5vuO1nZY5ioryL5TJX7icENwuioryjV1rr4+oAzkMWbDvouXEkAX7iDqQg8/rQ5MaLgZxaQWWJslWSWkWWBkFzl9UYP2PvgjFPNrj8/osM/2YcIQfE46QnpFmfL7K7SLocWpBj1Mz6+D0jLQWzzPb3b/6aI8SVnCbvXTTVOZxno6kqCjfKlPNUH4pIP9XPGz/N319UFnrf2iKLGi6LmggqCBoIOi6JuiqIqCrgqIrgqyrgoYu6JpiiK4LKgigCpquCCEdQdVVAU0VdP2iMGW29tplmtbcQNQ1QEXXNDQdQGsWHZBbvdQsKkTQfaiaBJrc/PyLPpQ2zqqbL9U10GV0TUbTZUCyQAoaJPaVinx5RmbVKZnVWRpf56r8WKlQFww2Q4bf8VdMXwsEtfkdGb97xSAb8yRG7df4zYYQ3deEsK2WsK1UsK1U6LIqxJWfKQzcEODVw0GS7KbG1F8Pout6C7WuL5Dpv1PBtlLEFgWXfyHTY61Ery91rvkiwLWfB7h6jcxV/5LoskLF9gl0+tjLI7FesuuxzKnrHeqneQdL143Bjacj6wqg4ZFUph8JYvusCdsXIldvhGvXi/T+SuS6dQrXrZO4fp3Ib76UuH5NiD6fi1z/mcgNnwa5epWMbbHG1StEvsoSjbeoq2i60h6MYNN1XTAhNF1vdlBoVFSG7/Nh+1Ti2o1Brl8v03uDyDVfN3DDVz5u+FKh15cKvdbp9FoHvT5X6PW5wjVr4LrPda6NkugTJdL1EwXbIpkVx5sdGaXZ8S9gGgNIJ6ipPHgghO3TED23h+ixTafXZpmb1ofos0ml+9dw1VcaV3wapMvKIF1WSVz+qULPzxV6faZw9Wc613yq0Xt1iN9Ehei+WMG2QObz03JHDtxsGk07P2XRmZ/hx7ZG5rqtMjdubqTHFonrNov8doPMZRvA9pmPqz8X+MNWhb/tkrg/VuGWaJXLPmmk85Imen6m0+sz6BMlcsNqP9etVujysU63jwIcrwy1N6UFm6Zrgma4KKBxrE7lyq999PnaT58dcMNWjV5bFa7d6sP2lcj/+szP6/FNHK2SqQtpSKqIKItUN2psyJH52yYXtkV+uq9UuP5fMj1XqVy9WuWGFSE6LQgxbHMQv6kVXW92B12wKZouSEjGNNMVJvwgYdugcGOsym+2q/TZqnD9dh3bVz5u3h4guVJtnpJa808zkJlBMMS7SQG6vB/gimUKvVdK9Fmu0nu5zLXLZGzvaWzLDhggmoysqwYIKoKqG+rKqVO5douP62JUfvutxg2xCn1iZTpv0rgpRuF0XQAIgRJElSUURUWWZWRZRpFlgrIKeIEg7yaC7X2FXkslei+XDVkmY1sQ4pFNDaA3hwcdNF0XbGjNZwNQWXZaxrZV5XexMjftFLnpW4ne34rYNvjZUywBQUJqEEkMoEk6oqIgySqipCCKEt6Qis8fRNEaAB+TtijYInV6Lwtx7VKRPstkIj5S6PGBRGFtwFCgApquCDYFTQANXZeZkiARsVPnlu9kfhcr0/cbiYivA4w94DM0oet4VQVJUQiJGiFRIiTKBEMSAX+QhoBIvU/C1SQCfpIKGrl8kZerFitcu0Tkuk9ErlsiYXtDYuMpYyobE0gVbIouC6DiDsgMiwtx406Z/rs0+u6WGPCNSI8tIZbnSoCCEvITkBRkWSMUkAgEJbz+EE2+IA3eAPUNjTR6fNTWSni9PuoFN/d8KtBpkcg1n3jp82GQ3h/6sc33seAHb/P6pYOmCTY0VQCNEkHhrgMhfrdL5k/fafT/XqT/boU+sRI/2r0AhESFYFDCF1TwBSWa/CE8TQHcjQFcDX6cdQGq63w43PWU1AoEmup4emMjtvl+enzop/d7Aa57N4Btvo/Z37jCHBzBpuqaAHDOHWDo/iD99in8+XuZO/er/H6fxsB/h0irDgGqoYGAhOAL0eALUd/oo87TRK2nCUddI3anQKXTTUl1DUVVNXga6nh2mwvb6066L3Bz3btOekU2YXtd5MVNDmuVVtEFm6brAmiUu4OMPODnjv0idx+UGHpQ4q6DEnf928+h0iCg0egN0OgXqW8MUCd4cXm81LgbqHIJlDs9lFd5KK90U1hWQ3GlgLOqlrs/rsQ2q45rFjq57q0yukc6sL3iYc62akBDR0fRNcGmq5oAQYSAyuQEibsPhnjgkMYD8T4ePOTnv/ZrfJrtBTWE4A3ibvRTJ3hx1jdRXddApbOeMoebEruL3Ao3p8vqOVVSR1JuDZkFtbywvgDb0zl0eqmanm+Wct2bFdhmlvP2Po/hH6qIrmiCTdNUAVVElTVeyfTz10My435UGHNE5JGfJIYf1ZiV4kFo8uILBKirD+LwBHC43Dhq6ymurqfAUU9ORS05RSU0NHmQVRW/JCMqOho6354U6DEri04z8+nxWim2fxSx8ZgLEAlJCqoiCzZZUwVZVECDjUVNDD8s8sRRlSmJOs8mwbPHZJ466iO2yI8aDNJU56a8tpGqaicOZx2FVfWcLa8lq7CMBn8IHfAGZQKSik/SQAoBOjEZtdiezqTTS/l0fzmPrFIBNB9CUCcoSYJN0TTBKymgS5TXBXn8pwCTj8lMT1WZmarx+nGR2Rk680+GOFleh9/bgMtZR3V1HYWVLvJKajiTV0pVjRsV8IVEgrLaLApeERSCAAx5/xS2+48zZvlZAmKIQFMTHq+PppAi2DRdFQIyyKIfRImoMz6ePO7lpUyJl08r/PN0iMjTEh9kS6zNEUgp92GvaaDAXstZh4DLG0JoChAMyviDMn5Jxi/K+EISIVnFr0h4JWPZ33a8mNteSCI6vhpZbMDhaqChyYfHHxRsmhYURBECoRDoMvkukVfTFN7IlHk7W+aDXIlVOSHW5ob4qhi2F4v8WNLIiSov5wLgkVVERSUYMqa2LyTjF1UCkkpQ1vGLImJAxCsai2SdKFJQ6aG0ooqK+gBuVxOCTxBsuq4IkqQSFCVCkgyqzg8lXt5J9/H+WViVJ7G+KMSOEoVdJSp77DJxdRrH3Rq5goLDJyMERRqCIt6QbPiHqBAQFSRJJSCrhGSZJklDUs/nIefsNRRXe3DWefE0NjUf21BURFEiGDRWVH9I5Nu8Rt7Pk/lXocbWIpFvKzT2VSr8YJdIcEqk1Svke2TsPhV3SMYTEmkISngDCr6QTFBSCUkqQUnFL2kEJUNLflFF1aGuyUepow6HuxG34DdyVkVRkCQFUVLxBWR0ScEfFPmuuIG1hTIxpSr/rpA46FBIqJHJdGmcqVPJa1Co9MrUBiTcQQlPQKYhoNAUUvCJCn5JJSApBCTZEr8oEVJU/IpKiaOOmnov9Q1+QyOqqiErGqKiIYk6/mAATQ4QalRItPvZU+EnvkrmxxqJRJdIVp1KTr1GQaNChVei2idTE9BwBRTqAzKeoEyjKNMkKvglhaCkNAMZogAeX4DS6npcDQE8jYHmM0aajqLqyLJOSNbwSTJev0woEKCxyU9OdZCEkgAJ1UGSBYWsBo3cRihq0qj0KVT5ZBwBjdqQRn1IRhBVGiWVRlklqOiIikZQ1hAV4ytjJE2n0ummqt6LU/AjNAYEm64jaBqoqo6iaEiKhiirBESVhkAQr9eH0ChSUu3nVGkdGY4mUmt8ZLoC5DWoFDUplHpVKnw6VT6ZWn+IuqCEJ6TQEFINzUgSflXFJ8nUe304XALVdQ3UNwaob/TT5A0ZILoO4TCyrBKSZHxBGcEfxNPgpdETwO32U+ZoIKesnrPlHrLtbn6urCfPXk+B3U2R3cO5qgbOVTVQUilwrkKgtEqguLKe4sp6yhwNlNg9VLkEhKYgjd4QTX6RYFA+X2Dpuo6maaiqiqqqKIqGKKn4QwrekERjIIC70YenMUBjk0S9EKK23our3ovb48Xj8SI0BfD4ROq9IdyNQeoa/Lg8AZxuPzV1PuobRASfguAN0egP4Q1KBEMykqwKNkAxMnpDNM1oSxhQGrKiI6oqTapIkyTiDYUIiDLBkEwoICOGjHghKxqKqqCoEooqEVJFgkqIkBIiKIsEpBB+MYA/FMAXkgiICiHRmK2KoilWo6bZRIKu61bjRdd1QdEQVBVBkzRBlVRBFhVBVTRBUXRBknVB1hAUECQQNF0XUHVB13RB0XRBVDRBUjRBUTVBUlRBlBRBlGQhJGuCJOuCouiCpuqCqqpl/7Eemqor5HnS2Ja/hPezpvCP1PuYlfo3vvo5EnfA0baH9qs+CKZpBIIh7DUuyuw1lNprqHDU4mnwoqoamq5xyn2YVTkv8cKJO3n+TH+eTB7Ao/H9eSr+TnbmrfyfgdiddZzKKaK0yklhuYN6oWVfvabay+6Tu3gzaSJPpPZm9E9XMmnvH1n60wKSanZypuEg35WuZlrCMLb9vPSXgzicdWTkFLX7vya5Dq/spk62s8v1AW+cu53ns29kSd6z/Fi9mZ/L8tpqVFfZeHYxBe7MSwdJy85v8Xd1oJwDFRtZlTeTD88+wcKsMSzMGsv8rL8wNbMnc7LuJN6xg6AcsF6TW1xBkzfQct9P8pDrSkfT1QuDKKrKz8UV1t+V3kKi89/m1YyhvHlyMPOz/ouFZ4fwYe59fJAzjLfO3s66wuep8p7jbF0iUTkzOe76/rzZ6jxUVteGtch06gL2C4PIikJFtcv6e3/ZeuamDOHNU//NivwxfFY8jnXlE/iyYiKflz/Eh4WD2Gv/CL/YQIJjI2+dvJvXTt7FtJS+LPt5OvVBY383KEoUlFaGzSz5wqb5ubC0WSsyG3PfZUbKnXzw8wOsKX6EdWUT+NI+nq8cY1nrGMnikjuJd0Xhld1sr3iTt37+IyuLHmZN0WMszxnPzLSBvJnxMMWNPxv7vUITLrdw8VlzMswnNud+xD+O3cGy3LF8ce5R1pZN4IuKsXzlGM0X1SP4uPJ2jgpraJAcfFb+CJHnbuOz8pF8UT6OL0om8nnRJFblPcrLaXfxxolROHzGd2idq7xIHBEavTQFQwAcLNvMP5Lu5JOcsawpmsRnJROIKnuYtVWjWVP9Vz6q7McRz0pUTSa2Zh6LSgeytOJPfGa/j3UVY1lTMoFPz01kdcEjLM95hNmp/8UHmU+j6MYnlrJyz3UMknHW0IbDW8rLyfexIGs4nxU8zqqi8Xx07gGiKkfyheN+ltnvJEFYGdYOFWlUqjniWcGK8iFElQ1jTek4Pi2awOqCR1iZ9wgfnx3Hs4l9+aHc+BqH2voGRFFqC+JpaEKSjOR2Y84iZqX8majcx1ieN57Xc+/hvXPD+aziAZaX30VGY0yH0/1s00E+KR7KquL7+ezceFbnT2BFzkSW5Uzg7VP38UbKQ3hCdc1aKWoLktHsG06/nbnJ9/H+6VGsyJnIC9l38kreMNaUPsKSkkHsdy26aABMcK3lw4L/5l9FY1mdP56lOeP55Ox4Psh+mOeT7+BAyUZj17O8qiWIKMkUlNoBOFQaw4zkQSw+M5bZp+7in7mPsKnkFVade4DPSsfTJNVeFCSk+lhbPIVl+Q+wMnccS8+OY/GZsXxwZjTTj9/OkqwXACi3O/H5A+dBKhy1lFQac33t2bf5R/KdvJnxFxadnkSyYzuf5j3BssIR/Kt4DBvLp/NF2dOsqXiSNRVPsKbyCeNnxZN8XjaFz4ufJrr4Bf5V8Agr8h5iWc5YPs4ey4enR/P+6YeYnfZn3kh9CAUfqgz2Gtd5kLOFpZTYjUMHH516jmlJA3jjxHCO2XexteBtFpwZyqqC0awo+huLCv7Eu4W38V7x73mvtD/vl/Xl/bJ+vFfye94tuo2F+X/g3dw/szT/b6zIHcMnZ0fz0ZmHWXT6ISKzRvJq5mBeSh5MSeNZyzyyrBggWTlFlNsNssiMKYz9oQe7i/9FmmM/r6bezZKfx7Is5yGW5f+NFYUjWHXuflaXDmN12V+JKhtGVNkwVpX9lZXFw1lRNILl+Q/ySc6DfHRmFIuyRhF5ciRvZ/6NNzPvZ3baIJ5N+AM/1xsfXcg9V47XH2wLMidpFE/9eAcVQg7Lsp7j9fShfHTmIT4+M4rIrKG8ljGAeSf78eaZfszP7sc/z/bln9n9mH+mH29m9eO1jP7MPfF7ZibfxvSE3zP1UD+eiruVxw/cxIT9fRj+764Mje3M6bqjAOQVl+MPhgyQvHPllFQapnkhfgRf5y7haNV3PJvwe945+QDvnnyAf2bcQ0zR22S7fySzbj+Z7n2cdO/jZP1eTtbvI9O9j8y6fWS49pHm3Edq9T6OV+0luXIPRyt2k1C+i/jybzhYupUfSrfjV40wX1zhQNN0A8RR66bEbjjr5p+Xc9IRz9snJvJ88h94O/N+3s64j1dS7mJLXuT/v0e/vT6qa93nnVXXdXLOlRtJi6qSWLmL8Yd682rGvcxLG8qbJ4byRuoQXj56L+UNuRcdoDHk5kDJNvaXbuZA2Rb2l21hX9nX7C3byNaCKJKr4pqnbw3+QLBlQDttxn4dPsh4hseP3sjcjP/m5dRBvJYymNdTBjMtvh8rT865KMja0wsZvqsr4/f3ZNyBnjx88CpGxV3BiAM2bt5iY8PPKwz/KKlsG1lDooTgCRJAYPKR/jyb2pcZaQOZdfyPzDn+J145/l/MSfojU364lW05yzuE2F30FU/80JcZSQN5+fifmH38Tmam3MGM1Dt4LOE6pv90DyHFCGLZ+SXtL3pn88rJCR5hbPy1TEq6jqnJv2XGsduZdfwPzD52By8n/5FZSX9g8sGbeDflGU7VHMUTqKMhVM/Z2hMsSZ/JY3G38I/E25l77I/MOv4HZhy/nRkptzE1+Rbu+beNhMrvjLEKSi+cj0T+8AaPZfTi2eQ/8Gj89fz96C3MSB7AjOTfMzPpNmYn3c7MowN4/IdrmXKoPy8l3MtLP/2Fpw7fxiMHr+HFxH7MTrqNmUm/56XkAbyY3I/pyb/jr/tsRJ542hqnOGydaRdkxv6J/DXBxvflX/Fd0Rru2W3jmYTrmZnUnxlJ/ZhxtB+zjg5g1tH+vJBwM1Pjr+fZ+Ot5PuFmZiX2Y9ZR43kvJfXlpeR+PJ90M3/da2Nm4gME5MZ2c5F2QV5OeYA/7rZxrOYgANE/f8S933ViTFxXZiX1ZfbRvsxK7MusxFuZnXgrs8JkZuKtzEi8lZlHf8espL48Gd+Lu3fbeDVpLA1BY+kvc7T7ZTktQUQlyLQjg/nzv20cyo+zrsdX7OKR/bcybLeNp368hpd+uok5ib9lbuKtzfI75ib+jtmJv2PGT7fwfMJveOj7zty/O4JPs+YjKsYUdTc04Wloav/YRusLz/04lAeTIsgsPENewfnc0is1EH32Qx47MICH913F+O//F+O/t/H4wW7877gIHtnfhXHfd2Hs91cyZl9v3k19lgLPaev15TV1NDR6Oz4/0vrC26ceYVhcL45X/GB4d2Eljf7Q+cJI9pHqiGPVqVeZd+wRZicOZ0bCvbyS9DAfpD3PnnNfUuO3ny9NVI2T+eVI8oVPGrUB2ZsfzX1HehJTtMK6FgyJZOYW0+gXf1EIz8wro9LhvKTn2lrugkMoFOS5n/7C0APXYK8tb3GepMrh5HB8Cmknz5JbXEpBSQVlFbVU2N0UlVWRW1RK1s95/JCQzMkzPyPLMpqm4ff7CQQChEIhJElCURQ0TcPsVOm6fn6tCT+oUOkq4bGE27n/qzv4KeMIwVCQQCBAbV0ttXW1VFRWkJ19lrS0DJKSj5F4NInk5OOcPHmK/Px8amtrcbvd1NTU4HQ6cbvdNDU1WTCyLKOqaguYDmvfgNzE4bIYdpWv4UT5EezuMkQl9B877PT/DQC7cLwx8LR3hQAAAABJRU5ErkJggg==) no-repeat;padding-left:40px}
-        .browser .browser-firefox{background-position:0 -34px}
-        .browser .browser-ie{background-position:0 -68px;margin-left:0px}
-        .browser .browser-360{background-position:0 -170px;margin-left: -27px}
-    </style>
-</head>
-<body style="margin-top:50px">
-<h1>请升级您的浏览器，以便我们更好的为您提供服务！</h1>
-<p>您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。</p>
-<hr>
-<h2>请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束</h2>
-<p>自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 <a href="https://www.microsoft.com/zh-cn/WindowsForBusiness/End-of-IE-support">微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明</a> 。</p>
-<hr>
-<h2>您可以选择更先进的浏览器</h2>
-<p>推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。</p>
-<ul class="browser">
-    <li class="browser-chrome"><a href="https://www.google.cn/chrome/browser/desktop/index.html?hl=zh-CN&standalone=1"> 谷歌浏览器<span>Google Chrome</span></a></li>
-    <li class="browser-firefox"><a href="https://www.mozilla.org/zh-CN/firefox/new/"> 火狐浏览器<span>Mozilla Firefox</span></a></li>
-    <li class="browser-ie"><a href="https://windows.microsoft.com/zh-cn/internet-explorer/download-ie"> IE 11 浏览器<span>Internet Explorer</span></a></li>
-    <li class="browser-360"><a href="http://se.360.cn/"> 360安全浏览器<span>360 Chrome</span></a></li>
-    <div class="clean"></div>
-</ul>
-<hr>
-</body>
-</html>
\ No newline at end of file
diff --git a/fuintAdmin_zt/public/index.html b/fuintAdmin_zt/public/index.html
deleted file mode 100644
index 6a93d4e3c..000000000
--- a/fuintAdmin_zt/public/index.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="renderer" content="webkit">
-    <meta name="robots" content="nofollow"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
-    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-      <style>
-    html,
-    body,
-    #app {
-      height: 100%;
-      margin: 0px;
-      padding: 0px;
-    }
-
-    #loader-wrapper {
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      z-index: 999999;
-    }
-
-    #loader {
-      display: block;
-      position: relative;
-      left: 50%;
-      top: 50%;
-      width: 150px;
-      height: 150px;
-      margin: -75px 0 0 -75px;
-      border-radius: 50%;
-      border: 3px solid transparent;
-      border-top-color: #FFF;
-      -webkit-animation: spin 2s linear infinite;
-      -ms-animation: spin 2s linear infinite;
-      -moz-animation: spin 2s linear infinite;
-      -o-animation: spin 2s linear infinite;
-      animation: spin 2s linear infinite;
-      z-index: 1001;
-    }
-
-    #loader:before {
-      content: "";
-      position: absolute;
-      top: 5px;
-      left: 5px;
-      right: 5px;
-      bottom: 5px;
-      border-radius: 50%;
-      border: 3px solid transparent;
-      border-top-color: #FFF;
-      -webkit-animation: spin 3s linear infinite;
-      -moz-animation: spin 3s linear infinite;
-      -o-animation: spin 3s linear infinite;
-      -ms-animation: spin 3s linear infinite;
-      animation: spin 3s linear infinite;
-    }
-
-    #loader:after {
-      content: "";
-      position: absolute;
-      top: 15px;
-      left: 15px;
-      right: 15px;
-      bottom: 15px;
-      border-radius: 50%;
-      border: 3px solid transparent;
-      border-top-color: #FFF;
-      -moz-animation: spin 1.5s linear infinite;
-      -o-animation: spin 1.5s linear infinite;
-      -ms-animation: spin 1.5s linear infinite;
-      -webkit-animation: spin 1.5s linear infinite;
-      animation: spin 1.5s linear infinite;
-    }
-
-
-    @-webkit-keyframes spin {
-      0% {
-        -webkit-transform: rotate(0deg);
-        -ms-transform: rotate(0deg);
-        transform: rotate(0deg);
-      }
-      100% {
-        -webkit-transform: rotate(360deg);
-        -ms-transform: rotate(360deg);
-        transform: rotate(360deg);
-      }
-    }
-
-    @keyframes spin {
-      0% {
-        -webkit-transform: rotate(0deg);
-        -ms-transform: rotate(0deg);
-        transform: rotate(0deg);
-      }
-      100% {
-        -webkit-transform: rotate(360deg);
-        -ms-transform: rotate(360deg);
-        transform: rotate(360deg);
-      }
-    }
-
-
-    #loader-wrapper .loader-section {
-      position: fixed;
-      top: 0;
-      width: 51%;
-      height: 100%;
-      background: #409EFF;
-      z-index: 1000;
-      -webkit-transform: translateX(0);
-      -ms-transform: translateX(0);
-      transform: translateX(0);
-    }
-
-    #loader-wrapper .loader-section.section-left {
-      left: 0;
-    }
-
-    #loader-wrapper .loader-section.section-right {
-      right: 0;
-    }
-
-    .loaded #loader-wrapper .loader-section.section-left {
-      -webkit-transform: translateX(-100%);
-      -ms-transform: translateX(-100%);
-      transform: translateX(-100%);
-      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-    }
-
-    .loaded #loader-wrapper .loader-section.section-right {
-      -webkit-transform: translateX(100%);
-      -ms-transform: translateX(100%);
-      transform: translateX(100%);
-      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-    }
-
-    .loaded #loader {
-      opacity: 0;
-      -webkit-transition: all 0.3s ease-out;
-      transition: all 0.3s ease-out;
-    }
-
-    .loaded #loader-wrapper {
-      visibility: hidden;
-      -webkit-transform: translateY(-100%);
-      -ms-transform: translateY(-100%);
-      transform: translateY(-100%);
-      -webkit-transition: all 0.3s 1s ease-out;
-      transition: all 0.3s 1s ease-out;
-    }
-
-    .no-js #loader-wrapper {
-      display: none;
-    }
-
-    .no-js h1 {
-      color: #222222;
-    }
-
-    #loader-wrapper .load_title {
-      font-family: 'Open Sans';
-      color: #FFF;
-      font-size: 19px;
-      width: 100%;
-      text-align: center;
-      z-index: 9999999999999;
-      position: absolute;
-      top: 60%;
-      opacity: 1;
-      line-height: 30px;
-    }
-
-    #loader-wrapper .load_title span {
-      font-weight: normal;
-      font-style: italic;
-      font-size: 13px;
-      color: #FFF;
-      opacity: 0.5;
-    }
-  </style>
-  </head>
-  <body>
-    <div id="app">
-       <div id="loader-wrapper">
-          <div id="loader"></div>
-          <div class="loader-section section-left"></div>
-          <div class="loader-section section-right"></div>
-          <div class="load_title">正在加载系统资源，请耐心等待...</div>
-       </div>
-  </div>
-  </body>
-</html>
diff --git a/fuintAdmin_zt/public/robots.txt b/fuintAdmin_zt/public/robots.txt
deleted file mode 100644
index 77470cb39..000000000
--- a/fuintAdmin_zt/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/App.vue b/fuintAdmin_zt/src/App.vue
deleted file mode 100644
index 6b9d54c5f..000000000
--- a/fuintAdmin_zt/src/App.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <div id="app">
-    <router-view />
-  </div>
-</template>
-
-<script>
-  export default  {
-    name:  'App',
-    metaInfo() {
-      return {
-        title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-        titleTemplate: title => {
-          return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-        }
-      }
-    }
-  }
-</script>
-<style >
-  .app-container{
-    width: 100%;
-    height: 100vh;
-    background: #f6f8f9;
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js
deleted file mode 100644
index 88be902ca..000000000
--- a/fuintAdmin_zt/src/api/allOrder.js
+++ /dev/null
@@ -1,173 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getOrderListApi(query) {
-  return request({
-      url: 'business/allOrderInfo/getPageList',
-      method: 'get',
-      params: query
-
-  })
-}
-// 分页查询所有的订单信息
-export function getSumPayMoneyApi(query) {
-  return request({
-      url: 'business/allOrderInfo/sumPayMoney',
-      method: 'get',
-      params: query
-
-  })
-}
-
-// 查询订单信息
-export function getOrderInfo(orderId) {
-  return request({
-    url: 'backendApi/order/info/' + orderId,
-    method: 'post',
-    data: data
-  })
-}
-
-export function getTradingPageApi(query) {
-  return request({
-    url: 'business/allOrderInfo/trading',
-    method: 'get',
-    params: query
-
-  })
-}
-export function getInstituionListApi(query) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByInstituion',
-    method: 'get',
-    params: query
-
-  })
-}
-
-export function getNoneListApi(query) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByNone',
-    method: 'get',
-    params: query
-
-  })
-}
-
-export function getDayListApi(query) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByDay',
-    method: 'get',
-    params: query
-
-  })
-}
-export function getDayDatyListApi(query) {
-  return request({
-    url: 'business/allOrderInfo/getRunningWaterByDayData',
-    method: 'get',
-    params: query
-
-  })
-}
-//统计
-export function getRunningWaterByDataApi(query) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByData',
-    method: 'get',
-    params: query
-
-  })
-}
-//统计
-export function getRunningWaterByTissueApi(query) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByTissue',
-    method: 'get',
-    params: query
-
-  })
-}
-
-//统计
-export function getTissueByDataApi(query) {
-  return request({
-    url: 'business/allOrderInfo/getTradingData',
-    method: 'get',
-    params: query
-
-  })
-}
-
-
-
-export function exportExcelTradingApi(data) {
-  return request({
-    url: 'business/allOrderInfo/tradingExportExcel',
-    method: 'post',
-    responseType: 'blob', // 表明响应类型为二进制流
-    data: data // 通过 data 参数传递需要的数据
-  });
-}
-
-
-export function exportExcelTissueApi(data) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByTissueExportExcel',
-    method: 'post',
-    responseType: 'blob', // 表明响应类型为二进制流
-    data: data // 通过 data 参数传递需要的数据
-  });
-}
-
-export function exportExcelOilDeptApi(data) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByOilDeptExportExcel',
-    method: 'post',
-    responseType: 'blob', // 表明响应类型为二进制流
-    data: data // 通过 data 参数传递需要的数据
-  });
-}
-
-export function exportExcelDayApi(data) {
-  return request({
-    url: 'business/allOrderInfo/runningWaterByDayExportExcel',
-    method: 'post',
-    responseType: 'blob', // 表明响应类型为二进制流
-    data: data // 通过 data 参数传递需要的数据
-  });
-}
-
-export function getFenxiByDailiApi(query) {
-  return request({
-    url: 'business/allOrderInfo/getFenxiByDaili',
-    method: 'get',
-    params: query
-
-  })
-}
-export function getFenxiByDailiByDataApi(query) {
-  return request({
-    url: 'business/allOrderInfo/getFenxiByDailiBydata',
-    method: 'get',
-    params: query
-
-  })
-}
-
-export function getFenxiByDailiTypeApi(query) {
-  return request({
-    url: 'business/allOrderInfo/getFenxiByDailiType',
-    method: 'get',
-    params: query
-
-  })
-}
-export function getFenxiByDailgetFenxiByDailiTypeiByDataApi(query) {
-  return request({
-    url: 'business/allOrderInfo/getFenxiByDailiBydata',
-    method: 'get',
-    params: query
-
-  })
-}
diff --git a/fuintAdmin_zt/src/api/article.js b/fuintAdmin_zt/src/api/article.js
deleted file mode 100644
index 1ce90eaf7..000000000
--- a/fuintAdmin_zt/src/api/article.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询文章列表
-export function getArticleList(query) {
-  return request({
-      url: 'backendApi/article/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询文章信息
-export function getArticle(articleId) {
-  return request({
-    url: 'backendApi/article/info/' + articleId,
-    method: 'get'
-  })
-}
-
-// 更新文章状态
-export function updateStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/article/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 保存数据
-export function saveArticle(data) {
-  return request({
-    url: 'backendApi/article/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/balance.js b/fuintAdmin_zt/src/api/balance.js
deleted file mode 100644
index e129508a2..000000000
--- a/fuintAdmin_zt/src/api/balance.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询余额明细列表
-export function getBalanceList(query) {
-  return request({
-      url: 'backendApi/balance/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询明细详情
-export function getBalanceInfo(memberId) {
-  return request({
-    url: 'backendApi/balance/info/' + memberId,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateBalanceStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/balance/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 获取配置信息
-export function getSettingInfo() {
-  return request({
-    url: 'backendApi/balance/setting',
-    method: 'get'
-  })
-}
-
-// 保存配置
-export function saveSetting(data) {
-  return request({
-    url: 'backendApi/balance/saveSetting',
-    method: 'post',
-    data: data
-  })
-}
-
-// 确定充值
-export function doRecharge(data) {
-  return request({
-    url: 'backendApi/balance/doRecharge',
-    method: 'post',
-    data: data
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/banner.js b/fuintAdmin_zt/src/api/banner.js
deleted file mode 100644
index fcc0ddbac..000000000
--- a/fuintAdmin_zt/src/api/banner.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询banner列表
-export function getBannerList(query) {
-  return request({
-      url: 'backendApi/banner/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询banner信息
-export function getBannerInfo(bannerId) {
-  return request({
-    url: 'backendApi/banner/info/' + bannerId,
-    method: 'get'
-  })
-}
-
-// 更新banner状态
-export function updateBannerStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/banner/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 保存数据
-export function saveBanner(data) {
-  return request({
-    url: 'backendApi/banner/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/cashier.js b/fuintAdmin_zt/src/api/cashier.js
deleted file mode 100644
index 2ac1fd1ec..000000000
--- a/fuintAdmin_zt/src/api/cashier.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import request from '@/utils/request'
-
-// 初始化数据
-export function init(userId) {
-  return request({
-      url: 'backendApi/cashier/init/' + userId,
-      method: 'get'
-  })
-}
-
-// 查询商品详情
-export function getGoodsInfo(goodsId) {
-  return request({
-    url: 'backendApi/cashier/getGoodsInfo/' + goodsId,
-    method: 'get'
-  })
-}
-
-// 查询商品
-export function searchGoods(data) {
-  return request({
-    url: 'backendApi/cashier/searchGoods',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询会员信息
-export function getMemberInfo(data) {
-  return request({
-    url: 'backendApi/cashier/getMemberInfo',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询会员信息
-export function getMemberInfoById(userId) {
-  return request({
-    url: 'backendApi/cashier/getMemberInfoById/' + userId,
-    method: 'get'
-  })
-}
-
-// 获取购物车列表
-export function getCartList(data) {
-  return request({
-    url: 'clientApi/cart/list',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存购物车
-export function saveCart(data) {
-  return request({
-    url: 'clientApi/cart/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除购物车
-export function removeFromCart(data) {
-  return request({
-    url: 'clientApi/cart/clear',
-    method: 'post',
-    data: data
-  })
-}
-
-// 提交结算
-export function submitSettlement(data) {
-  return request({
-    url: 'clientApi/settlement/submit',
-    method: 'post',
-    data: data
-  })
-}
-
-// 发起支付
-export function doPay(params) {
-  return request({
-    url: 'clientApi/pay/doPay',
-    method: 'get',
-    params: params
-  })
-}
-
-// 获取订单列表
-export function getOrderList(data) {
-  return request({
-    url: 'backendApi/order/latest',
-    method: 'post',
-    data: data
-  })
-}
-
-// 执行挂单
-export function doHangUp(data) {
-  return request({
-    url: 'backendApi/cashier/doHangUp',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取挂单
-export function getHangUpList() {
-  return request({
-    url: 'backendApi/cashier/getHangUpList',
-    method: 'get'
-  })
-}
-
-// 删除挂单
-export function removeHangUp(data) {
-  return request({
-    url: 'clientApi/cart/clear',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/commission/log.js b/fuintAdmin_zt/src/api/commission/log.js
deleted file mode 100644
index 1e1c73507..000000000
--- a/fuintAdmin_zt/src/api/commission/log.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-
-// 查询员工提成统计列表
-export function getStaffStatistics(query) {
-  return request({
-    url: 'backendApi/commissionLog/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询员工提成统计列表
-export function getStaffStatisticsDetail(query) {
-  return request({
-    url: 'backendApi/commissionLog/list',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/fuintAdmin_zt/src/api/commission/rule.js b/fuintAdmin_zt/src/api/commission/rule.js
deleted file mode 100644
index 62ade5e1e..000000000
--- a/fuintAdmin_zt/src/api/commission/rule.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询分销提成规则列表
-export function getCommissionRuleList(query) {
-  return request({
-      url: 'backendApi/commissionRule/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询分销提成规则详情
-export function getCommissionRuleInfo(ruleId) {
-  return request({
-     url: 'backendApi/commissionRule/info/' + ruleId,
-     method: 'get'
-  })
-}
-
-// 更新分销提成规则状态
-export function updateCommissionRuleStatus(ruleId, status) {
-  const data = { ruleId, status }
-  return request({
-     url: 'backendApi/commissionRule/updateStatus',
-     method: 'post',
-     data: data
-  })
-}
-
-// 保存分销提成规则
-export function saveCommissionRule(data) {
-  return request({
-     url: 'backendApi/commissionRule/save',
-     method: 'post',
-     data: data
-  })
-}
-
-// 选择商品列表
-export function selectGoodList(query) {
-  return request({
-    url: 'backendApi/commissionRule/selectGoodList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除信息
-export function removeCommissionRule(data) {
-  return request({
-    url: 'backendApi/commissionRule/remove',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/coupon/confirmLog.js b/fuintAdmin_zt/src/api/coupon/confirmLog.js
deleted file mode 100644
index ec3bed32b..000000000
--- a/fuintAdmin_zt/src/api/coupon/confirmLog.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询核销流水列表
-export function getConfirmLogList(query) {
-  return request({
-      url: 'backendApi/confirmLog/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 撤销已使用的卡券
-export function rollbackUserCoupon(id, userCouponId) {
-  return request({
-    url: 'backendApi/confirmLog/rollbackUserCoupon/' + id + '?userCouponId=' + userCouponId,
-    method: 'get',
-  })
-}
diff --git a/fuintAdmin_zt/src/api/coupon/coupon.js b/fuintAdmin_zt/src/api/coupon/coupon.js
deleted file mode 100644
index 6c6e9d473..000000000
--- a/fuintAdmin_zt/src/api/coupon/coupon.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询卡券列表
-export function getCouponList(query) {
-  return request({
-      url: 'backendApi/coupon/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询卡券信息
-export function getCouponInfo(id) {
-  return request({
-    url: 'backendApi/coupon/info/' + id,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateCouponStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/coupon/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除卡券
-export function deleteCoupon(id) {
-  return request({
-    url: 'backendApi/coupon/delete/' + id,
-    method: 'get'
-  })
-}
-
-// 保存卡券
-export function saveCoupon(data) {
-  return request({
-    url: 'backendApi/coupon/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询卡券核销信息
-export function getConfirmInfo(data) {
-  return request({
-    url: 'backendApi/doConfirm/info',
-    method: 'post',
-    data: data
-  })
-}
-
-// 执行核销
-export function doConfirm(data) {
-  return request({
-    url: 'backendApi/doConfirm/doConfirm',
-    method: 'post',
-    data: data
-  })
-}
-
-// 发放卡券
-export function sendCoupon(params) {
-  return request({
-    url: 'backendApi/coupon/sendCoupon',
-    method: 'get',
-    params: params
-  })
-}
diff --git a/fuintAdmin_zt/src/api/coupon/give.js b/fuintAdmin_zt/src/api/coupon/give.js
deleted file mode 100644
index ac7cfb62f..000000000
--- a/fuintAdmin_zt/src/api/coupon/give.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询转赠记录列表
-export function getGiveLogList(query) {
-  return request({
-      url: 'backendApi/give/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 获取转赠详情
-export function getGiveItem(id) {
-  return request({
-      url: 'backendApi/give/giveItem?giveId=' + id,
-      method: 'get',
-  })
-}
diff --git a/fuintAdmin_zt/src/api/coupon/group.js b/fuintAdmin_zt/src/api/coupon/group.js
deleted file mode 100644
index e8dcda70f..000000000
--- a/fuintAdmin_zt/src/api/coupon/group.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询卡券分组列表
-export function getGroupList(query) {
-  return request({
-      url: 'backendApi/couponGroup/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询卡券分组列表
-export function getAllGroupList(query) {
-  return request({
-    url: 'backendApi/couponGroup/quickSearch',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询分组信息
-export function getGroupInfo(id) {
-  return request({
-    url: 'backendApi/couponGroup/info/' + id,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateGroupStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/couponGroup/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除卡券分组
-export function deleteGroup(id) {
-  return request({
-    url: 'backendApi/couponGroup/delete/' + id,
-    method: 'get'
-  })
-}
-
-// 保存卡券分组数据
-export function saveGroup(data) {
-  return request({
-    url: 'backendApi/couponGroup/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/coupon/sendLog.js b/fuintAdmin_zt/src/api/coupon/sendLog.js
deleted file mode 100644
index d8b57a945..000000000
--- a/fuintAdmin_zt/src/api/coupon/sendLog.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询发券记录列表
-export function getSendLogList(query) {
-  return request({
-      url: 'backendApi/sendLog/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 撤销已发放的卡券
-export function removeUserCoupon(id) {
-  return request({
-    url: 'backendApi/sendLog/removeUserCoupon/' + id,
-    method: 'get',
-  })
-}
diff --git a/fuintAdmin_zt/src/api/coupon/userCoupon.js b/fuintAdmin_zt/src/api/coupon/userCoupon.js
deleted file mode 100644
index d8d7ce54e..000000000
--- a/fuintAdmin_zt/src/api/coupon/userCoupon.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询会员卡券列表
-export function getUserCouponList(query) {
-  return request({
-      url: 'backendApi/userCoupon/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 作废会员卡券
-export function deleteUserCoupon(id) {
-  return request({
-      url: 'backendApi/userCoupon/delete/' + id,
-      method: 'get',
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/dict/type.js b/fuintAdmin_zt/src/api/dict/type.js
deleted file mode 100644
index a0254baa7..000000000
--- a/fuintAdmin_zt/src/api/dict/type.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-// 查询字典类型列表
-export function listType(query) {
-  return request({
-    url: '/system/dict/type/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典类型详细
-export function getType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'get'
-  })
-}
-
-// 新增字典类型
-export function addType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典类型
-export function updateType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典类型
-export function delType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'delete'
-  })
-}
-
-// 刷新字典缓存
-export function refreshCache() {
-  return request({
-    url: '/system/dict/type/refreshCache',
-    method: 'delete'
-  })
-}
-
-// 获取字典选择框列表
-export function optionselect() {
-  return request({
-    url: '/system/dict/type/optionselect',
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/duty/duty.js b/fuintAdmin_zt/src/api/duty/duty.js
deleted file mode 100644
index 259cd5aa4..000000000
--- a/fuintAdmin_zt/src/api/duty/duty.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询角色信息
-export function dutyList(query) {
-  return request({
-    url: '/business/member/duty',
-    method: 'get',
-    params: query
-  })
-}
-// 分页查询角色信息
-export function dutyLists(query) {
-  return request({
-    url: '/business/member/duty/dutys',
-    method: 'get',
-    params: query
-  })
-}
-export function selectyDutyIdsApi(query) {
-  return request({
-    url: '/business/member/duty/selectyDutyIds',
-    method: 'get',
-    params: query
-  })
-}
-
-// 根据id删除角色信息
-export function dutyDelete(id) {
-  return request({
-    url: '/business/member/duty/'+id,
-    method: 'delete',
-  })
-}
-
-// 根据id删除角色信息
-export function dutyEdit(data) {
-  return request({
-    url: '/business/member/duty',
-    method: 'put',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js b/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js
deleted file mode 100644
index 228d6768c..000000000
--- a/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-
-// 会员充值订单
-  export function getDuiZhangVipListApi(query) {
-  return request({
-    url: 'business/marketingActivity/activeExchange/cardValueOrders/selectCardValueOrdersByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
-// 油品订单
-export function getDuiZhangOilListApi(query) {
-  return request({
-    url: 'business/oilOrder/selectOilOrderListByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 油品订单
-export function getDuiZhangGoodsListApi(query) {
-  return request({
-    url: 'business/order/selectOrderListByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
-// 积分订单
-export function getDuiZhangIntegralListApi(query) {
-  return request({
-    url: 'business/integral/integralOrders/queryByPageByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js b/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
deleted file mode 100644
index c5bc1da02..000000000
--- a/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import request from '@/utils/request'
-
-
-// 会员充值订单
-  export function getFenXiUserbalanceListApi(query) {
-  return request({
-    url: '/business/userManager/userbalance/listByZt',
-    method: 'get',
-    params: query
-  })
-}
-  export function getFenXiUserbalanceDataApi(query) {
-  return request({
-    url: '/business/userManager/userbalance/getUser',
-    method: 'get',
-    params: query
-  })
-}
-
-// 油品分析
-  export function getFenXiOilOrderListApi(query) {
-  return request({
-    url: '/business/oilOrder/selectOilOrderFenXiListByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-  export function getFenXiOilOrderDataApi(query) {
-  return request({
-    url: '/business/oilOrder/selectOilOrderFenXiDataByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
-// 商品订单
-  export function getFenXiStoreListApi(query) {
-  return request({
-    url: '/business/order/selectOrderFenxiListByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-  export function getFenXiStoreDataApi(query) {
-  return request({
-    url: '/business/order/selectOrderFenxiDataByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
-// 积分商城
-export function getFenXiIntegralListApi(query) {
-  return request({
-    url: '/business/integral/integralOrders/queryByPageFenxiByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-export function getFenXiIntegralDataApi(query) {
-  return request({
-    url: '/business/integral/integralOrders/getIntFenxiDataByZtDz',
-    method: 'get',
-    params: query
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/goods.js b/fuintAdmin_zt/src/api/goods.js
deleted file mode 100644
index ce44c4061..000000000
--- a/fuintAdmin_zt/src/api/goods.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询商品列表
-export function getGoodsList(query) {
-  return request({
-      url: 'backendApi/goods/goods/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询商品详情
-export function getGoodsInfo(goodsId) {
-  return request({
-    url: 'backendApi/goods/goods/info/' + goodsId,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateGoodsStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/goods/goods/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 保存分类数据
-export function saveGoods(data) {
-  return request({
-      url: 'backendApi/goods/goods/save',
-      method: 'post',
-      data: data
-  })
-}
-
-// 保存商品规格名称
-export function saveSpecName(data) {
-  return request({
-      url: 'backendApi/goods/goods/saveSpecName',
-      method: 'post',
-      data: data
-  })
-}
-
-// 保存商品规格值
-export function saveSpecValue(data) {
-  return request({
-      url: 'backendApi/goods/goods/saveSpecValue',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除商品规格
-export function deleteSpec(query) {
-  return request({
-      url: 'backendApi/goods/goods/deleteSpec',
-      method: 'get',
-      params: query
-  })
-}
-
-// 删除商品规格值
-export function deleteSpecValue(query) {
-  return request({
-      url: 'backendApi/goods/goods/deleteSpecValue',
-      method: 'get',
-      params: query
-  })
-}
-
-// 获取选择商品列表
-export function selectGoodsList(data) {
-  return request({
-     url: 'backendApi/goods/goods/selectGoods',
-     method: 'post',
-     data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/goodsCate.js b/fuintAdmin_zt/src/api/goodsCate.js
deleted file mode 100644
index e277b16fb..000000000
--- a/fuintAdmin_zt/src/api/goodsCate.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询商品分类列表
-export function getGoodsCateList(query) {
-  return request({
-      url: 'backendApi/goods/cate/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询商品分类详情
-export function getGoodsCateInfo(cateId) {
-  return request({
-    url: 'backendApi/goods/cate/info/' + cateId,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateGoodsCateStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-    url: 'backendApi/goods/cate/updateStatus',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存分类数据
-export function saveGoodsCate(data) {
-  return request({
-    url: 'backendApi/goods/cate/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/home.js b/fuintAdmin_zt/src/api/home.js
deleted file mode 100644
index a8d1e038c..000000000
--- a/fuintAdmin_zt/src/api/home.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 获取首页数据
-export function getHomeData() {
-  return request({
-    url: 'backendApi/home/index',
-    method: 'get'
-  })
-}
-
-// 获取统计数据
-export function getStatisticData(query) {
-  return request({
-    url: 'backendApi/home/statistic',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/fuintAdmin_zt/src/api/indexBanner/index.js b/fuintAdmin_zt/src/api/indexBanner/index.js
deleted file mode 100644
index feaef0691..000000000
--- a/fuintAdmin_zt/src/api/indexBanner/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import request from '@/utils/request'
-
-// 查询首页店铺数量信息
-export function storeTotalIndex(query) {
-  return request({
-    url: '/backendApi/store/getStoreTotal',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询首页店铺金额信息
-export function storeAmountIndex(query) {
-  return request({
-    url: '/business/allOrderInfo/getAmount',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询首页店铺金额信息
-export function storeAmountIndex1(query) {
-  return request({
-    url: '/business/allOrderInfo/getAmount1',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询首页店铺金额信息
-export function selectStoreAmount(query) {
-  return request({
-    url: '/backendApi/store/selectStoreAmount',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 查询首页店铺金额信息
-export function getStoreAmountByTime(query) {
-  return request({
-    url: '/backendApi/store/getStoreAmountByTime',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 查询首页店铺金额信息
-export function getAccountInfo(query) {
-  return request({
-    url: '/system/dept/getInfo',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/fuintAdmin_zt/src/api/indexBanner/indexBanner.js b/fuintAdmin_zt/src/api/indexBanner/indexBanner.js
deleted file mode 100644
index 22dc0e19f..000000000
--- a/fuintAdmin_zt/src/api/indexBanner/indexBanner.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询首页轮播图信息
-export function listIndexBanner(query) {
-  return request({
-    url: '/business/indexBanner/lists',
-    method: 'get',
-    params: query
-  })
-}
-
-// 根据id查询首页轮播图信息
-export function indexBannerInfo(id) {
-  return request({
-    url: '/business/indexBanner/'+id,
-    method: 'get',
-  })
-}
-
-// 添加首页轮播图信息
-export function addIndexBanner(data) {
-  return request({
-    url: '/business/indexBanner',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改首页轮播图信息
-export function updateIndexBanner(data) {
-  return request({
-    url: '/business/indexBanner',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除首页轮播图信息
-export function deleteIndexBanner(id) {
-  return request({
-    url: '/business/indexBanner/'+id,
-    method: 'delete',
-  })
-}
diff --git a/fuintAdmin_zt/src/api/indexBanner/ljstore.js b/fuintAdmin_zt/src/api/indexBanner/ljstore.js
deleted file mode 100644
index 4d0dba90e..000000000
--- a/fuintAdmin_zt/src/api/indexBanner/ljstore.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-// 查询所有店铺信息
-export function ljStoreList() {
-  return request({
-    url: '/business/storeInformation/store/list',
-    method: 'get',
-  })
-}
diff --git a/fuintAdmin_zt/src/api/login.js b/fuintAdmin_zt/src/api/login.js
deleted file mode 100644
index cb0ad4c71..000000000
--- a/fuintAdmin_zt/src/api/login.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 登录方法
-export function login(username, password, captchaCode, uuid) {
-  const data = {
-    username,
-    password,
-    captchaCode,
-    uuid
-  }
-  return request({
-    url: 'backendApi/login/doLogins',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取用户详细信息
-export function getInfo() {
-  return request({
-    url: 'backendApi/login/getInfo',
-    method: 'get'
-  })
-}
-
-// 获取手机验证码
-export function gettelcode(data) {
-  return request({
-    url: 'backendApi/login/sendMsg',
-    method: 'post',
-    data:data
-  })
-}
-
-// 退出方法
-export function logout() {
-  return request({
-    url: 'backendApi/login/logout',
-    method: 'post'
-  })
-}
-
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    url: 'clientApi/captcha/getCode',
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/member.js b/fuintAdmin_zt/src/api/member.js
deleted file mode 100644
index e14c24ede..000000000
--- a/fuintAdmin_zt/src/api/member.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询会员列表
-export function getMemberList(query) {
-  return request({
-      url: 'backendApi/member/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询会员信息
-export function getMemberInfo(memberId) {
-  return request({
-    url: 'backendApi/member/info/' + memberId,
-    method: 'get'
-  })
-}
-
-// 查询会员设置
-export function getMemberSetting() {
-  return request({
-    url: 'backendApi/member/setting',
-    method: 'get'
-  })
-}
-
-// 保存会员设置
-export function saveSetting(data) {
-  return request({
-    url: 'backendApi/member/saveSetting',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新会员状态
-export function updateMemberStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-      url: 'backendApi/member/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除会员信息
-export function deleteMember(memberId) {
-  return request({
-    url: 'backendApi/member/delete/' + memberId,
-    method: 'get'
-  })
-}
-
-// 保存数据
-export function saveMember(data) {
-  return request({
-    url: 'backendApi/member/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/menu.js b/fuintAdmin_zt/src/api/menu.js
deleted file mode 100644
index f65ebe058..000000000
--- a/fuintAdmin_zt/src/api/menu.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-// 获取路由
-export const getRouters = () => {
-  return request({
-    url: 'backendApi/login/getRouters',
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/merchant.js b/fuintAdmin_zt/src/api/merchant.js
deleted file mode 100644
index 3d9a8685b..000000000
--- a/fuintAdmin_zt/src/api/merchant.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询商户列表
-export function getMerchantList(query) {
-  return request({
-     url: 'backendApi/merchant/list',
-     method: 'get',
-     params: query
-  })
-}
-
-// 查询商户信息
-export function getMerchantInfo(merchantId) {
-  return request({
-     url: 'backendApi/merchant/info/' + merchantId,
-     method: 'get'
-  })
-}
-
-// 查询商户列表
-export function searchMerchant(param) {
-  return request({
-     url: 'backendApi/merchant/searchMerchant',
-     method: 'get',
-     params: param
-  })
-}
-
-// 更新商户状态
-export function updateMerchantStatus(merchantId, status) {
-  const data = {
-     merchantId,
-     status
-  }
-  return request({
-     url: 'backendApi/merchant/updateStatus',
-     method: 'post',
-     data: data
-  })
-}
-
-// 保存商户信息
-export function saveMerchant(data) {
-  return request({
-     url: 'backendApi/merchant/save',
-     method: 'post',
-     data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/openGift.js b/fuintAdmin_zt/src/api/openGift.js
deleted file mode 100644
index 133749791..000000000
--- a/fuintAdmin_zt/src/api/openGift.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询开卡赠礼列表
-export function getOpenGiftList(query) {
-  return request({
-      url: 'backendApi/openGift/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询信息
-export function getOpenGiftInfo(id) {
-  return request({
-    url: 'backendApi/openGift/info/' + id,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateOpenGiftStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/openGift/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除开卡赠礼
-export function deleteOpenGift(id) {
-  return request({
-    url: 'backendApi/openGift/delete/' + id,
-    method: 'get'
-  })
-}
-
-// 保存数据
-export function saveOpenGift(data) {
-  return request({
-    url: 'backendApi/openGift/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/order.js b/fuintAdmin_zt/src/api/order.js
deleted file mode 100644
index 4ab73ab30..000000000
--- a/fuintAdmin_zt/src/api/order.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询订单列表
-export function getOrderList(data) {
-  return request({
-      url: 'backendApi/order/list',
-      method: 'post',
-      data: data
-  })
-}
-
-// 查询订单信息
-export function getOrderInfo(orderId) {
-  return request({
-    url: 'backendApi/order/info/' + orderId,
-    method: 'get'
-  })
-}
-
-// 更新订单状态
-export function updateOrderStatus(orderId, status) {
-  const data = {
-    orderId,
-    status
-  }
-  return request({
-      url: 'backendApi/order/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除订单
-export function deleteOrder(orderId) {
-  return request({
-    url: 'backendApi/order/delete/' + orderId,
-    method: 'get'
-  })
-}
-
-// 保存订单数据
-export function saveOrder(data) {
-  return request({
-    url: 'backendApi/order/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 验证核销订单
-export function verifyOrder(data) {
-  return request({
-    url: 'backendApi/order/verify',
-    method: 'post',
-    data: data
-  })
-}
-
-// 提交发货信息
-export function delivered(data) {
-  return request({
-    url: 'backendApi/order/delivered',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取配置信息
-export function getSettingInfo() {
-  return request({
-    url: 'backendApi/order/setting',
-    method: 'get'
-  })
-}
-
-// 保存配置
-export function saveSetting(data) {
-  return request({
-    url: 'backendApi/order/saveSetting',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
deleted file mode 100644
index 20c423f88..000000000
--- a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
+++ /dev/null
@@ -1,84 +0,0 @@
-    import request from '@/utils/request'
-
-// 查询商户列表
-export function listMerchant() {
-  return request({
-    url: '/api/merchantConfig/list',
-    method: 'get',
-  })
-}
-
-
-// 查询商户列表
-export function listMerchant2(query) {
-  return request({
-    url: '/api/merchantConfig/list2',
-    method: 'get',
-    params: query,
-
-  })
-}
-
-// 查询商户列表
-export function listMerchantPage(query) {
-  return request({
-    url: '/api/merchantConfig',
-    method: 'get',
-    params: query,
-
-  })
-}
-
-// 修改商户使用状态
-export function editMerchant(data) {
-  return request({
-    url: '/api/merchantConfig',
-    method: 'put',
-    data: data,
-  })
-}
-
-// 修改商户备注信息
-export function editMerchantRemark(data) {
-  return request({
-    url: '/api/merchantConfig/edit',
-    method: 'post',
-    data: data,
-  })
-}
-
-
-// 添加商户使用状态
-export function addMerchantApi(data) {
-  return request({
-    url: '/api/merchantConfig',
-    method: 'post',
-    data: data,
-  })
-}
-
-// 根据id查询商户配置信息
-export function merchantInfo(id) {
-  return request({
-    url: '/api/merchantConfig/'+id,
-    method: 'get',
-  })
-}
-
-// 根据id删除商户配置信息
-export function deleteMerchant(id) {
-  return request({
-    url: '/api/merchantConfig/'+id,
-    method: 'delete',
-  })
-}
-
-
-// 根据id删除商户配置信息
-export function getMerchant(id) {
-  return request({
-    url: '/api/merchantConfig/selectInfo/'+id,
-    method: 'get',
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/payConfig/oilconfig.js b/fuintAdmin_zt/src/api/payConfig/oilconfig.js
deleted file mode 100644
index acfa47fa3..000000000
--- a/fuintAdmin_zt/src/api/payConfig/oilconfig.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 查询支付规则列表
-export function listOilConfig(query) {
-  return request({
-    url: '/api/oilConfig/listBystoreId',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 是否开启支付规则
-export function isOpenOilConfig(data) {
-  return request({
-    url: '/api/oilConfig/isOpen',
-    method: 'post',
-    data: data
-  })
-}
-
-// 根据id查询支付配置信息
-export function oilConfigInfo(id) {
-  return request({
-    url: '/api/oilConfig/info/'+id,
-    method: 'get',
-  })
-}
-
-// 添加支付配置信息
-export function addOilConfig(data) {
-  return request({
-    url: '/api/oilConfig',
-    method: 'post',
-    data: data,
-  })
-}
-
-// 修改支付配置信息
-export function editOilConfig(data) {
-  return request({
-    url: '/api/oilConfig',
-    method: 'put',
-    data: data,
-  })
-}
-
-// 删除支付配置信息
-export function delOilConfig(id) {
-  return request({
-    url: '/api/oilConfig/'+id,
-    method: 'delete',
-  })
-}
diff --git a/fuintAdmin_zt/src/api/payConfig/paymentParameter.js b/fuintAdmin_zt/src/api/payConfig/paymentParameter.js
deleted file mode 100644
index 941345bb2..000000000
--- a/fuintAdmin_zt/src/api/payConfig/paymentParameter.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import request from '@/utils/request'
-
-
-// 查询支付参数配置信息
-export function listPaymentParameterPage(query) {
-  return request({
-    url: '/paymentParameterConfig',
-    method: 'get',
-    params: query,
-
-  })
-}
-
-// 修改支付参数配置信息
-export function editPaymentParameter(data) {
-  return request({
-    url: '/paymentParameterConfig',
-    method: 'put',
-    data: data,
-  })
-}
-
-
-// 添加支付参数配置信息
-export function addPaymentParameter(data) {
-  return request({
-    url: '/paymentParameterConfig',
-    method: 'post',
-    data: data,
-  })
-}
-
-// 根据id查询支付参数配置信息
-export function paymentParameterInfo(id) {
-  return request({
-    url: '/paymentParameterConfig/'+id,
-    method: 'get',
-  })
-}
-
-// 根据id删除支付参数配置信息
-export function deletePaymentParameter(id) {
-  return request({
-    url: '/paymentParameterConfig/'+id,
-    method: 'delete',
-  })
-}
-
-
-// 根据id查询支付参数配置信息
-export function getPaymentParameter(id) {
-  return request({
-    url: '/paymentParameterConfig/getInfo/'+id,
-    method: 'get',
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/payConfig/ruleConfig.js b/fuintAdmin_zt/src/api/payConfig/ruleConfig.js
deleted file mode 100644
index fccb3057d..000000000
--- a/fuintAdmin_zt/src/api/payConfig/ruleConfig.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import request from '@/utils/request'
-
-// 查询支付配置规则列表
-export function listRuleConfig(query) {
-  return request({
-    url: '/api/ruleConfig',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 查询支付配置规则列表
-export function getRuleConfig(id) {
-  return request({
-    url: '/api/ruleConfig/'+id,
-    method: 'get',
-  })
-}
-
-// 查询支付配置规则列表
-export function addRuleConfig(query) {
-  return request({
-    url: '/api/ruleConfig',
-    method: 'post',
-    data: query,
-  })
-}
-
-// 查询支付配置规则列表
-export function editRuleConfig(query) {
-  return request({
-    url: '/api/ruleConfig',
-    method: 'put',
-    data: query,
-  })
-}
-// 查询支付配置规则列表
-export function enableRuleConfig(query) {
-  return request({
-    url: '/api/ruleConfig/enableRule',
-    method: 'post',
-    data: query,
-  })
-}
-
-// 查询支付配置规则列表
-export function deleteRuleConfig(id) {
-  return request({
-    url: '/api/ruleConfig/'+id,
-    method: 'delete',
-  })
-}
-
-// 查询支付配置规则列表
-export function getOilGunList(query) {
-  return request({
-    url: '/business/petrolStationManagement/oilGun/queryByPage',
-    method: 'get',
-    params: query,
-  })
-}
diff --git a/fuintAdmin_zt/src/api/point.js b/fuintAdmin_zt/src/api/point.js
deleted file mode 100644
index 9427b6a5b..000000000
--- a/fuintAdmin_zt/src/api/point.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询积分明细列表
-export function getPointList(query) {
-  return request({
-      url: 'backendApi/point/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询明细详情
-export function getPointInfo(memberId) {
-  return request({
-    url: 'backendApi/point/info/' + memberId,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updatePointStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/point/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 获取配置信息
-export function getSettingInfo() {
-  return request({
-    url: 'backendApi/point/setting',
-    method: 'get'
-  })
-}
-
-// 保存配置
-export function saveSetting(data) {
-  return request({
-    url: 'backendApi/point/saveSetting',
-    method: 'post',
-    data: data
-  })
-}
-
-// 确定充值
-export function doRecharge(data) {
-  return request({
-    url: 'backendApi/point/doRecharge',
-    method: 'post',
-    data: data
-  })
-}
-
diff --git a/fuintAdmin_zt/src/api/refund.js b/fuintAdmin_zt/src/api/refund.js
deleted file mode 100644
index 7cba5360a..000000000
--- a/fuintAdmin_zt/src/api/refund.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询退款订单列表
-export function getRefundList(query) {
-  return request({
-      url: 'backendApi/refund/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询订单信息
-export function getRefundInfo(refundId) {
-  return request({
-    url: 'backendApi/refund/info/' + refundId,
-    method: 'get'
-  })
-}
-
-// 订单退款
-export function doRefund(data) {
-  return request({
-      url: 'backendApi/refund/doRefund',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除退款订单
-export function deleteRefund(refundId) {
-  return request({
-    url: 'backendApi/refund/delete/' + refundId,
-    method: 'get'
-  })
-}
-
-// 保存退款订单
-export function saveRefund(data) {
-  return request({
-    url: 'backendApi/refund/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/service/service.js b/fuintAdmin_zt/src/api/service/service.js
deleted file mode 100644
index 1dd70a9f1..000000000
--- a/fuintAdmin_zt/src/api/service/service.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import request from '@/utils/request'
-
-// 查询店铺列表
-export function Storelist(query) {
-  return request({
-    url: '/chainStoreInfo',
-    method: 'get',
-    params: query
-  })
-}
-
-export function Storedetails(id) {
-  return request({
-    url: '/backendApi/store/info/'+id,
-    method: 'get',
-
-  })
-}
-
-// 查询员工详细
-export function getStaff(id) {
-  return request({
-    url: '/business/member/staff/' + id,
-    method: 'get'
-  })
-}
-
-// 新增员工
-export function addStaff(data) {
-  return request({
-    url: '/business/member/staff',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改员工
-export function updateStaff(data) {
-  return request({
-    url: '/business/member/staff',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除员工
-export function delStaff(id) {
-  return request({
-    url: '/business/member/staff/' + id,
-    method: 'delete'
-  })
-}
-
-
-
-// 查找店铺信息
-export function getStoreInfo(id) {
-  return request({
-    url: '/backendApi/store/info/' + id,
-    method: 'get'
-  })
-}
-
-
-// 修改店铺信息
-export function editStoreInfoApi(data) {
-  return request({
-    url: '/backendApi/store/editStoreInfo',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改店铺信息
-export function singleSignOnApi(data) {
-  return request({
-    url: '/backendApi/store/singleSignOn',
-    method: 'post',
-    data: data
-  })
-}
-
-
-// 查询会员人数
-export function getUserNumApi(query) {
-  return request({
-    url: '/business/userManager/user/userNum',
-    method: 'get',
-    params: query
-
-  })
-}
-
-
-// 查询支付订单
-export function getOrderNumApi(query) {
-  return request({
-    url: '/business/allOrderInfo/getOrderNum',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 查询店铺列表
-export function getStorelist(query) {
-  return request({
-    url: '/business/storeInformation/store/selectListDept',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/fuintAdmin_zt/src/api/setting/hardware.js b/fuintAdmin_zt/src/api/setting/hardware.js
deleted file mode 100644
index 184e70d9c..000000000
--- a/fuintAdmin_zt/src/api/setting/hardware.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getListApi(query) {
-  return request({
-    url: 'hardwareStore',
-    method: 'get',
-    params: query
-  })
-}
-
-//
-export function deleteApi(ids) {
-  return request({
-    url: 'hardwareStore?idList=' + ids,
-    method: 'delete'
-  })
-}
-//
-export function saveApi(data) {
-  return request({
-    url: 'hardwareStore',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateApi(data) {
-  return request({
-    url: 'hardwareStore',
-    method: 'put',
-    data: data
-  })
-}
-
-
diff --git a/fuintAdmin_zt/src/api/setting/message.js b/fuintAdmin_zt/src/api/setting/message.js
deleted file mode 100644
index 1f74cd23f..000000000
--- a/fuintAdmin_zt/src/api/setting/message.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getListApi(query) {
-  return request({
-    url: 'messageTemplate',
-    method: 'get',
-    params: query
-  })
-}
-
-//
-export function deleteApi(ids) {
-  return request({
-    url: 'messageTemplate?idList=' + ids,
-    method: 'delete'
-  })
-}
-//
-export function saveApi(data) {
-  return request({
-    url: 'messageTemplate',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateApi(data) {
-  return request({
-    url: 'messageTemplate',
-    method: 'put',
-    data: data
-  })
-}
-
-
diff --git a/fuintAdmin_zt/src/api/setting/sysLog.js b/fuintAdmin_zt/src/api/setting/sysLog.js
deleted file mode 100644
index 35570cee0..000000000
--- a/fuintAdmin_zt/src/api/setting/sysLog.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getListApi(query) {
-  return request({
-    url: 'sysLog',
-    method: 'get',
-    params: query
-  })
-}
-
-//
-export function deleteApi(ids) {
-  return request({
-    url: 'sysLog?idList=' + ids,
-    method: 'delete'
-  })
-}
-//
-export function saveApi(data) {
-  return request({
-    url: 'sysLog',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateApi(data) {
-  return request({
-    url: 'sysLog',
-    method: 'put',
-    data: data
-  })
-}
-
-
diff --git a/fuintAdmin_zt/src/api/smsManager.js b/fuintAdmin_zt/src/api/smsManager.js
deleted file mode 100644
index 886ad2fb4..000000000
--- a/fuintAdmin_zt/src/api/smsManager.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询短信列表
-export function getSmsList(query) {
-  return request({
-      url: 'backendApi/smsManager/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 发送短信
-export function sendSms(data) {
-  return request({
-    url: 'backendApi/smsManager/send',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/smsTemplate.js b/fuintAdmin_zt/src/api/smsTemplate.js
deleted file mode 100644
index 9b49c3ef1..000000000
--- a/fuintAdmin_zt/src/api/smsTemplate.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询短信模板列表
-export function getSmsTemplateList(query) {
-  return request({
-      url: 'backendApi/smsTemplate/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询信息
-export function getSmsTemplateInfo(id) {
-  return request({
-    url: 'backendApi/smsTemplate/info/' + id,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateSmsTemplateStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/smsTemplate/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除短信模板
-export function deleteSmsTemplate(id) {
-  return request({
-    url: 'backendApi/smsTemplate/delete/' + id,
-    method: 'get'
-  })
-}
-
-// 保存数据
-export function saveSmsTemplate(data) {
-  return request({
-    url: 'backendApi/smsTemplate/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/staff.js b/fuintAdmin_zt/src/api/staff.js
deleted file mode 100644
index 6768af8ad..000000000
--- a/fuintAdmin_zt/src/api/staff.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import request from '@/utils/request'
-
-// 查询员工列表
-export function getStaffList(query) {
-  return request({
-    url: 'backendApi/staff/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询员工信息
-export function getStaffInfo(staffId) {
-  return request({
-    url: 'backendApi/staff/info/' + staffId,
-    method: 'get'
-  })
-}
-
-// 删除员工信息
-export function deleteStaff(staffId) {
-  return request({
-    url: 'backendApi/staff/delete/' + staffId,
-    method: 'get'
-  })
-}
-
-// 获取店铺员工列表
-export function getStoreStaffList(storeId) {
-  return request({
-    url: 'backendApi/staff/storeStaffList/' + storeId,
-    method: 'get'
-  })
-}
-
-// 更新员工状态
-export function updateStaffStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-    url: 'backendApi/staff/updateStatus',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存员工信息
-export function saveStaff(data) {
-  return request({
-    url: 'backendApi/staff/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/staff/staff.js b/fuintAdmin_zt/src/api/staff/staff.js
deleted file mode 100644
index e9dcdc5e7..000000000
--- a/fuintAdmin_zt/src/api/staff/staff.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询员工列表
-export function listStaff(query) {
-  return request({
-    url: '/business/member/staff/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询员工详细
-export function getStaff(id) {
-  return request({
-    url: '/business/member/staff/' + id,
-    method: 'get'
-  })
-}
-
-// 新增员工
-export function addStaff(data) {
-  return request({
-    url: '/business/member/staff',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改员工
-export function updateStaff(data) {
-  return request({
-    url: '/business/member/staff',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除员工
-export function delStaff(id) {
-  return request({
-    url: '/business/member/staff/' + id,
-    method: 'delete'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/staff/user/user.js b/fuintAdmin_zt/src/api/staff/user/user.js
deleted file mode 100644
index 9a4171acb..000000000
--- a/fuintAdmin_zt/src/api/staff/user/user.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import request from '@/utils/request'
-
-// 查询会员列表
-export function listUser(query) {
-  return request({
-    url: '/business/userManager/user/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询会员统计列表
-export function listUserStatistic(query) {
-  return request({
-    url: '/business/userManager/userStatistic/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询会员列表
-export function listStatistic(query) {
-  return request({
-    url: '/business/userManager/user/statistic',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询会员详细
-export function getUser(id) {
-  return request({
-    url: '/business/userManager/user/' + id,
-    method: 'get'
-  })
-}
-// 根据手机号查询会员详细
-export function getUserMobile(data) {
-  return request({
-    url: '/business/userManager/user/mobile' ,
-    method: 'post',
-    data: data
-  })
-}
-
-// 新增会员
-export function addUser(data) {
-  return request({
-    url: '/business/userManager/user',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改会员
-export function updateUser(data) {
-  return request({
-    url: '/business/userManager/user',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除会员
-export function delUser(id) {
-  return request({
-    url: '/business/userManager/user/' + id,
-    method: 'delete'
-  })
-}
-
-//下载示例文件
-export function exportUsers() {
-  return request({
-    url: '/excel/export',
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/statistic.js b/fuintAdmin_zt/src/api/statistic.js
deleted file mode 100644
index 06e0f1f25..000000000
--- a/fuintAdmin_zt/src/api/statistic.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-
-// 获取看板数据
-export function getMainData(params) {
-  return request({
-    url: 'backendApi/statistic/main',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取排行榜数据
-export function getTopData(params) {
-  return request({
-    url: 'backendApi/statistic/top',
-    method: 'post',
-    data: params
-  })
-}
diff --git a/fuintAdmin_zt/src/api/stock.js b/fuintAdmin_zt/src/api/stock.js
deleted file mode 100644
index fac99fa66..000000000
--- a/fuintAdmin_zt/src/api/stock.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询库存管理记录列表
-export function getStockList(query) {
-  return request({
-      url: 'backendApi/stock/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 删除库存管理记录
-export function deleteStock(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-    url: 'backendApi/stock/delete',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存库存管理记录
-export function saveStock(data) {
-  return request({
-    url: 'backendApi/stock/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取库存管理记录详情
-export function getStockInfo(cateId) {
-  return request({
-    url: 'backendApi/stock/info/' + cateId,
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/store.js b/fuintAdmin_zt/src/api/store.js
deleted file mode 100644
index 8f7b51c85..000000000
--- a/fuintAdmin_zt/src/api/store.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询店铺列表
-export function getStoreList(query) {
-  return request({
-      url: 'backendApi/store/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询店铺信息
-export function getStoreInfo(storeId) {
-  return request({
-    url: 'backendApi/store/info/' + storeId,
-    method: 'get'
-  })
-}
-
-// 查询店铺列表
-export function searchStore(param) {
-  return request({
-    url: 'backendApi/store/searchStore',
-    method: 'get',
-    params: param
-  })
-}
-
-// 更新店铺状态
-export function updateStoreStatus(storeId, status) {
-  const data = {
-    storeId,
-    status
-  }
-  return request({
-      url: 'backendApi/store/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 保存店铺
-export function saveStore(data) {
-  return request({
-    url: 'backendApi/store/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/subMessage.js b/fuintAdmin_zt/src/api/subMessage.js
deleted file mode 100644
index 1aeea5efb..000000000
--- a/fuintAdmin_zt/src/api/subMessage.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询订阅消息列表
-export function getSubMessageList(query) {
-  return request({
-      url: 'backendApi/subMessage/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询信息
-export function getSubMessageInfo(id) {
-  return request({
-    url: 'backendApi/subMessage/info/' + id,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateSubMessageStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-      url: 'backendApi/subMessage/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除订阅消息
-export function deleteSubMessage(id) {
-  return request({
-    url: 'backendApi/subMessage/delete/' + id,
-    method: 'get'
-  })
-}
-
-// 保存数据
-export function saveSubMessage(data) {
-  return request({
-    url: 'backendApi/subMessage/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/sys/app.js b/fuintAdmin_zt/src/api/sys/app.js
deleted file mode 100644
index b07e1c706..000000000
--- a/fuintAdmin_zt/src/api/sys/app.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getAppListApi(query) {
-  return request({
-      url: 'sys/sysApp/queryByPage',
-      method: 'get',
-      params: query
-
-  })
-}
-
-//
-export function deleteAppApi(AppId) {
-  return request({
-    url: 'sys/sysApp/' + AppId,
-    method: 'delete'
-
-  })
-}
-//
-export function saveAppApi(data) {
-  return request({
-    url: 'sys/sysApp',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateAppApi(data) {
-  return request({
-    url: 'sys/sysApp',
-    method: 'put',
-    data: data
-  })
-}
-
-
diff --git a/fuintAdmin_zt/src/api/sys/banner.js b/fuintAdmin_zt/src/api/sys/banner.js
deleted file mode 100644
index e3a75d7a3..000000000
--- a/fuintAdmin_zt/src/api/sys/banner.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getBannerListApi(query) {
-  return request({
-      url: 'sys/sysBanner/queryByPage',
-      method: 'get',
-      params: query
-  })
-}
-
-//
-export function deleteBannerApi(bannerId) {
-  return request({
-    url: 'sys/sysBanner/' + bannerId,
-    method: 'delete'
-  })
-}
-//
-export function saveBannerApi(data) {
-  return request({
-    url: 'sys/sysBanner',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateBannerApi(data) {
-  return request({
-    url: 'sys/sysBanner',
-    method: 'put',
-    data: data
-  })
-}
-
-
diff --git a/fuintAdmin_zt/src/api/sys/pay.js b/fuintAdmin_zt/src/api/sys/pay.js
deleted file mode 100644
index c4244608e..000000000
--- a/fuintAdmin_zt/src/api/sys/pay.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getPayListApi(query) {
-  return request({
-      url: 'api/merchantConfig/list',
-      method: 'get',
-      params: query
-
-  })
-}
-
-//
-export function deletePayApi(PayId) {
-  return request({
-    url: 'api/merchantConfig/' + PayId,
-    method: 'delete'
-
-  })
-}
-//
-export function savePayApi(data) {
-  return request({
-    url: 'api/merchantConfig',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updatePayApi(data) {
-  return request({
-    url: 'api/merchantConfig',
-    method: 'put',
-    data: data
-  })
-}
-
-
diff --git a/fuintAdmin_zt/src/api/sys/sysNotificationlog.js b/fuintAdmin_zt/src/api/sys/sysNotificationlog.js
deleted file mode 100644
index ad771e1e9..000000000
--- a/fuintAdmin_zt/src/api/sys/sysNotificationlog.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询所有的订单信息
-export function getNotificationlogList(query) {
-  return request({
-      url: 'sysNotificationlog/queryByPage',
-      method: 'get',
-      params: query
-
-  })
-}
-// 分页查询所有的订单信息
-export function getSysNotifyList(query) {
-  return request({
-      url: 'sysNotify/queryByPage',
-      method: 'get',
-      params: query
-
-  })
-}
-export function deleteSysNotifyApi(PayId) {
-  return request({
-    url: 'sysNotificationlog/' + PayId,
-    method: 'delete'
-
-  })
-}
-//
-export function saveSysNotificationApi(data) {
-  return request({
-    url: 'sysNotificationlog',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateSysNotificationApi(data) {
-  return request({
-    url: 'sysNotificationlog',
-    method: 'put',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/sys/sysNotify.js b/fuintAdmin_zt/src/api/sys/sysNotify.js
deleted file mode 100644
index e4b80ba32..000000000
--- a/fuintAdmin_zt/src/api/sys/sysNotify.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-
-// 分页查询所有的订单信息
-export function getSysNotifyList(query) {
-  return request({
-      url: 'sysNotify/queryByPage',
-      method: 'get',
-      params: query
-
-  })
-}// 分页查询所有的订单信息
-export function getSendNotifyApi(query) {
-  return request({
-      url: 'sysNotify/sendNotify',
-      method: 'get',
-      params: query
-  })
-}
-//
-export function deleteSysNotifyApi(PayId) {
-  return request({
-    url: 'sysNotify/' + PayId,
-    method: 'delete'
-
-  })
-}
-//
-export function saveSysNotifyApi(data) {
-  return request({
-    url: 'sysNotify',
-    method: 'post',
-    data: data
-  })
-}
-
-// 保存修改信息
-export function updateSysNotifyApi(data) {
-  return request({
-    url: 'sysNotify',
-    method: 'put',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/Site/compant.js b/fuintAdmin_zt/src/api/system/Site/compant.js
deleted file mode 100644
index c1cb791b4..000000000
--- a/fuintAdmin_zt/src/api/system/Site/compant.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import request from '@/utils/request'
-
-
-// 年付费接口
-export function getYearListApi(query) {
-  return request({
-    url: 'deptpay/deptPriceInfo/queryByPage',
-    method: 'get',
-    params: query
-  })
-}export function getALlInfoBydeptIdApi(query) {
-  return request({
-    url: 'deptpay/deptPriceInfo/getALlInfoBydeptId',
-    method: 'get',
-    params: query
-  })
-}
-//
-export function addYearApi(data) {
-  return request({
-    url: 'deptpay/deptPriceInfo',
-    method: 'post',
-    data: data
-  })
-}
-
-//
-export function updateYearApi(data) {
-  return request({
-    url: 'deptpay/deptPriceInfo',
-    method: 'put',
-    data: data
-  })
-}
-export function delYearApi(data) {
-  return request({
-    url: 'deptpay/deptPriceInfo/delete/',
-    method: 'delete',
-    data: data
-  })
-}
-
-
-// 预付付费接口
-export function getBeforeListApi(query) {
-  return request({
-    url: 'deptpay/deptTransactionInfo/queryByPage',
-    method: 'get',
-    params: query
-  })
-}
-//
-export function addBeforeApi(data) {
-  return request({
-    url: 'deptpay/deptTransactionInfo',
-    method: 'post',
-    data: data
-  })
-}
-
-//
-export function updateBeforeApi(data) {
-  return request({
-    url: 'deptpay/deptTransactionInfo',
-    method: 'put',
-    data: data
-  })
-}
-export function delBeforeApi(data) {
-  return request({
-    url: 'deptpay/deptTransactionInfo',
-    method: 'delete',
-    data: data
-  })
-}
-
-
-// 后付付费接口
-export function getAfterListApi(query) {
-  return request({
-    url: 'deptpay/deptServiceFeeInfo/queryByPage',
-    method: 'get',
-    params: query
-  })
-}
-//
-export function addAfterApi(data) {
-  return request({
-    url: 'deptpay/deptServiceFeeInfo',
-    method: 'post',
-    data: data
-  })
-}
-
-//
-export function updateAfterApi(data) {
-  return request({
-    url: 'deptpay/deptServiceFeeInfo',
-    method: 'put',
-    data: data
-  })
-}
-export function delAfterApi(data) {
-  return request({
-    url: 'deptpay/deptServiceFeeInfo',
-    method: 'delete',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/Site/site.js b/fuintAdmin_zt/src/api/system/Site/site.js
deleted file mode 100644
index 7ca0cfb0a..000000000
--- a/fuintAdmin_zt/src/api/system/Site/site.js
+++ /dev/null
@@ -1,245 +0,0 @@
-import request from '@/utils/request'
-
-
-// 查询用户列表
-export function listUser(query) {
-  return request({
-    url: '/backendApi/account/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询用户列表？？  获取部门信息
-export function Userlist(id) {
-  return request({
-    url: '/system/dept/'+id,
-    method: 'get',
-
-  })
-}
-// 查询用户列表？？  获取部门信息
-export function getPidInfo(id) {
-  return request({
-    url: '/system/dept/getPidInfo/'+id,
-    method: 'get',
-
-  })
-}
-
-export function getMaxNumber(data) {
-  return request({
-    url: '/system/dept/getMaxNumber',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询校色列表
-export function jklist() {
-  return request({
-    url: '/backendApi/duty/list',
-    method: 'get',
-  })
-}
-// 查询校色列表
-export function getDutyList(data) {
-  return request({
-    url: '/backendApi/duty/getDutyList',
-    method: 'get',
-    params: data
-
-  })
-}
-
-
-// 查询用户详细
-// export function getUser(userId) {
-//   return request({
-//     url: '/system/user/' + parseStrEmpty(userId),
-//     method: 'get'
-//   })
-// }
-
-// 新增用户
-export function addUser(data) {
-  return request({
-    url: '/backendApi/account/doCreate',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改用户
-export function updateUser(data) {
-  return request({
-    url: '/backendApi/account/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户
-// export function delUser(userId) {
-//   return request({
-//     url: '/system/user/' + userId,
-//     method: 'delete'
-//   })
-// }
-
-export function delUser(userId) {
-  return request({
-    url: '/backendApi/account/delete/' + userId,
-    method: 'get'
-  })
-}
-
-// 用户密码重置
-export function resetUserPwd(acctId, password) {
-  const data = {
-    acctId,
-    password
-  }
-  return request({
-    url: '/backendApi/account/resetPwd',
-    method: 'post',
-    data: data
-  })
-}
-// url: '/system/user/resetPwd',
-//
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
-}
-
-// 认证
-export function authentication(data) {
-  return request({
-    url: '/system/user/profile/authentication',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    params: data
-  })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
-  return request({
-    url: '/system/user/profile/avatar',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询授权角色
-export function getAuthRole(userId) {
-  return request({
-    url: '/system/user/authRole/' + userId,
-    method: 'get'
-  })
-}
-
-// 保存授权角色
-export function updateAuthRole(data) {
-  return request({
-    url: '/system/user/authRole',
-    method: 'put',
-    params: data
-  })
-}
-
-// 查询部门下拉树结构
-export function deptTreeSelect(data) {
-  return request({
-    url: '/system/dept/deptTree',
-    method: 'get',
-    params: data
-
-  })
-}
-// 查询部门下拉树结构
-export function selectChildByDeptId(data) {
-  return request({
-    url: '/system/dept/selectChildByDeptId',
-    method: 'get',
-    params: data
-
-  })
-}
-
-// 合作商审核
-export function partnerVerifyPass(data) {
-  return request({
-    url: '/system/user/profile/partnerVerifyPass',
-    method: 'put',
-    data: data
-  })
-}
-// 新增
-export function deptadd(data) {
-  return request({
-    url: '/system/dept/add',
-    method: 'post',
-    data: data
-  })
-}
-// 修改
-export function deptedit(data) {
-  return request({
-    url: '/system/dept/edit',
-    method: 'post',
-    data: data
-  })
-}
-// 删除
-export function deptDelete(id) {
-  return request({
-    url: '/system/dept/' + id,
-    method: 'delete',
-  })
-}
-
-export function isTopLevelNodesApi(data) {
-  return request({
-    url: '/system/dept/isTopLevelNodes',
-    method: 'get',
-    params: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/account.js b/fuintAdmin_zt/src/api/system/account.js
deleted file mode 100644
index 58201356a..000000000
--- a/fuintAdmin_zt/src/api/system/account.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/fuint";
-
-// 查询用户列表
-export function getAccountList(query) {
-  return request({
-    url: 'backendApi/account/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用户详细
-export function getAccount(userId) {
-  return request({
-    url: 'backendApi/account/info/' + parseStrEmpty(userId),
-    method: 'get'
-  })
-}
-
-// 新增用户
-export function addAccount(data) {
-  return request({
-    url: 'backendApi/account/doCreate',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改用户
-export function updateAccount(data) {
-  return request({
-    url: 'backendApi/account/update',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除用户
-export function delAccount(userId) {
-  return request({
-    url: 'backendApi/account/delete/' + userId,
-    method: 'get'
-  })
-}
-
-// 用户密码重置
-export function resetAccountPwd(userId, password) {
-  const data = {
-    userId,
-    password
-  }
-  return request({
-    url: 'backendApi/account/resetPwd',
-    method: 'post',
-    data: data
-  })
-}
-
-// 用户状态修改
-export function changeAccountStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-    url: 'backendApi/account/updateStatus',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getAccountProfile() {
-  return request({
-    url: 'backendApi/account/profile',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateAccountProfile(data) {
-  return request({
-    url: 'backendApi/account/profile',
-    method: 'post',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateAccountPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: 'backendApi/account/profile/updatePwd',
-    method: 'post',
-    params: data
-  })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
-  return request({
-    url: 'backendApi/account/profile/avatar',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询授权角色
-export function getAuthRole(userId) {
-  return request({
-    url: 'backendApi/account/authRole/' + userId,
-    method: 'get'
-  })
-}
-
-// 保存授权角色
-export function updateAuthRole(data) {
-  return request({
-    url: 'backendApi/account/authRole',
-    method: 'post',
-    params: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/config.js b/fuintAdmin_zt/src/api/system/config.js
deleted file mode 100644
index 082c7212a..000000000
--- a/fuintAdmin_zt/src/api/system/config.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import request from '@/utils/request'
-
-// 查询参数列表
-export function listConfig(query) {
-  return request({
-    url: '/system/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询参数详细
-export function getConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'get'
-  })
-}
-
-// 根据参数键名查询参数值
-export function getConfigKey(configKey) {
-  return request({
-    url: '/system/config/configKey/' + configKey,
-    method: 'get'
-  })
-}
-
-// 新增参数配置
-export function addConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改参数配置
-export function updateConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除参数配置
-export function delConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'delete'
-  })
-}
-
-
-
-// 刷新参数缓存
-export function refreshCache() {
-  return request({
-    url: '/system/config/refreshCache',
-    method: 'delete'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/dict/data.js b/fuintAdmin_zt/src/api/system/dict/data.js
deleted file mode 100644
index 6c9eb79b4..000000000
--- a/fuintAdmin_zt/src/api/system/dict/data.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 查询字典数据列表
-export function listData(query) {
-  return request({
-    url: '/system/dict/data/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典数据详细
-export function getData(dictCode) {
-  return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'get'
-  })
-}
-
-// 根据字典类型查询字典数据信息
-export function getDicts(dictType) {
-  return request({
-    url: '/system/dict/data/type/' + dictType,
-    method: 'get'
-  })
-}
-
-// 新增字典数据
-export function addData(data) {
-  return request({
-    url: '/system/dict/data',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典数据
-export function updateData(data) {
-  return request({
-    url: '/system/dict/data',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典数据
-export function delData(dictCode) {
-  return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'delete'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/dict/type.js b/fuintAdmin_zt/src/api/system/dict/type.js
deleted file mode 100644
index a7a6e01fc..000000000
--- a/fuintAdmin_zt/src/api/system/dict/type.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-// 查询字典类型列表
-export function listType(query) {
-  return request({
-    url: '/system/dict/type/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典类型详细
-export function getType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'get'
-  })
-}
-
-// 新增字典类型
-export function addType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典类型
-export function updateType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典类型
-export function delType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'delete'
-  })
-}
-
-// 刷新字典缓存
-export function refreshCache() {
-  return request({
-    url: '/system/dict/type/refreshCache',
-    method: 'delete'
-  })
-}
-
-// 获取字典选择框列表
-export function optionselect() {
-  return request({
-    url: '/system/dict/type/optionselect',
-    method: 'get'
-  })
-}
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/api/system/logs.js b/fuintAdmin_zt/src/api/system/logs.js
deleted file mode 100644
index 69ceb2589..000000000
--- a/fuintAdmin_zt/src/api/system/logs.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 查询操作日志列表
-export function list(query) {
-  return request({
-    url: 'backendApi/actlog/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除操作日志
-export function delOperlog(logId) {
-  return request({
-    url: 'backendApi/actlog/delete/' + logId,
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/menu.js b/fuintAdmin_zt/src/api/system/menu.js
deleted file mode 100644
index 505aa5106..000000000
--- a/fuintAdmin_zt/src/api/system/menu.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import request from '@/utils/request'
-
-// 查询菜单列表
-export function listMenu(query) {
-  return request({
-    url: 'backendApi/source/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询菜单详细
-export function getMenu(menuId) {
-  return request({
-    url: 'backendApi/source/info/' + menuId,
-    method: 'get'
-  })
-}
-
-// 查询菜单下拉树结构
-export function treeselect(params) {
-  return request({
-    url: 'backendApi/source/treeselect',
-    method: 'get',
-    params: params
-  })
-}
-
-// 查询菜单下拉树结构
-export function getButtonPermi(params) {
-  return request({
-    url: 'backendApi/source/getButtonPermi',
-    method: 'get',
-    params: params
-  })
-}
-
-// 根据角色ID查询菜单下拉树结构
-export function roleMenuTreeselect(roleId) {
-  return request({
-    url: 'backendApi/source/roleMenuTreeselect/' + roleId,
-    method: 'get'
-  })
-}
-
-// 新增菜单
-export function addMenu(data) {
-  return request({
-    url: 'backendApi/source/add',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改菜单
-export function updateMenu(data) {
-  return request({
-    url: 'backendApi/source/update',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除菜单
-export function delMenu(menuId) {
-  return request({
-    url: 'backendApi/source/delete/' + menuId,
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/system/notice.js b/fuintAdmin_zt/src/api/system/notice.js
deleted file mode 100644
index c274ea5ba..000000000
--- a/fuintAdmin_zt/src/api/system/notice.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询公告列表
-export function listNotice(query) {
-  return request({
-    url: '/system/notice/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询公告详细
-export function getNotice(noticeId) {
-  return request({
-    url: '/system/notice/' + noticeId,
-    method: 'get'
-  })
-}
-
-// 新增公告
-export function addNotice(data) {
-  return request({
-    url: '/system/notice',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改公告
-export function updateNotice(data) {
-  return request({
-    url: '/system/notice',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除公告
-export function delNotice(noticeId) {
-  return request({
-    url: '/system/notice/' + noticeId,
-    method: 'delete'
-  })
-}
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/api/system/role.js b/fuintAdmin_zt/src/api/system/role.js
deleted file mode 100644
index 8af7673d0..000000000
--- a/fuintAdmin_zt/src/api/system/role.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import request from '@/utils/request'
-
-// 查询角色列表
-export function listRole(query) {
-  return request({
-    url: 'backendApi/duty/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色详细
-export function getRole(roleId) {
-  return request({
-    url: 'backendApi/duty/info/' + roleId,
-    method: 'get'
-  })
-}
-
-// 新增角色
-export function addRole(data) {
-  return request({
-    url: 'backendApi/duty/add',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改角色
-export function updateRole(data) {
-  return request({
-    url: 'backendApi/duty/update',
-    method: 'post',
-    data: data
-  })
-}
-
-// 角色数据权限
-export function dataScope(data) {
-  return request({
-    url: 'backendApi/duty/dataScope',
-    method: 'post',
-    data: data
-  })
-}
-
-// 角色状态修改
-export function changeRoleStatus(roleId, status) {
-  const data = {
-    roleId,
-    status
-  }
-  return request({
-    url: 'backendApi/duty/changeStatus',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除角色
-export function delRole(roleId) {
-  return request({
-    url: 'backendApi/duty/delete/' + roleId,
-    method: 'post'
-  })
-}
-
-// 查询角色已授权用户列表
-export function getRoleUserList(query) {
-  return request({
-    url: 'backendApi/duty/getRoleUserList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色未授权用户列表
-export function unallocatedUserList(query) {
-  return request({
-    url: 'backendApi/duty/authUser/unallocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 取消用户授权角色
-export function authUserCancel(data) {
-  return request({
-    url: 'backendApi/duty/authUser/cancel',
-    method: 'post',
-    data: data
-  })
-}
-
-// 批量取消用户授权角色
-export function authUserCancelAll(data) {
-  return request({
-    url: 'backendApi/duty/authUser/cancelAll',
-    method: 'post',
-    params: data
-  })
-}
-
-// 授权用户选择
-export function authUserSelectAll(data) {
-  return request({
-    url: 'backendApi/duty/authUser/selectAll',
-    method: 'post',
-    params: data
-  })
-}
diff --git a/fuintAdmin_zt/src/api/tool/gen.js b/fuintAdmin_zt/src/api/tool/gen.js
deleted file mode 100644
index 45069278f..000000000
--- a/fuintAdmin_zt/src/api/tool/gen.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import request from '@/utils/request'
-
-// 查询生成表数据
-export function listTable(query) {
-  return request({
-    url: '/tool/gen/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询db数据库列表
-export function listDbTable(query) {
-  return request({
-    url: '/tool/gen/db/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询表详细信息
-export function getGenTable(tableId) {
-  return request({
-    url: '/tool/gen/' + tableId,
-    method: 'get'
-  })
-}
-
-// 修改代码生成信息
-export function updateGenTable(data) {
-  return request({
-    url: '/tool/gen',
-    method: 'put',
-    data: data
-  })
-}
-
-// 导入表
-export function importTable(data) {
-  return request({
-    url: '/tool/gen/importTable',
-    method: 'post',
-    params: data
-  })
-}
-
-// 预览生成代码
-export function previewTable(tableId) {
-  return request({
-    url: '/tool/gen/preview/' + tableId,
-    method: 'get'
-  })
-}
-
-// 删除表数据
-export function delTable(tableId) {
-  return request({
-    url: '/tool/gen/' + tableId,
-    method: 'delete'
-  })
-}
-
-// 生成代码（自定义路径）
-export function genCode(tableName) {
-  return request({
-    url: '/tool/gen/genCode/' + tableName,
-    method: 'get'
-  })
-}
-
-// 同步数据库
-export function synchDb(tableName) {
-  return request({
-    url: '/tool/gen/synchDb/' + tableName,
-    method: 'get'
-  })
-}
diff --git a/fuintAdmin_zt/src/api/userGrade.js b/fuintAdmin_zt/src/api/userGrade.js
deleted file mode 100644
index 0f0b64d2e..000000000
--- a/fuintAdmin_zt/src/api/userGrade.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import request from '@/utils/request'
-
-// 分页查询会员等级列表
-export function getUserGradeList(query) {
-  return request({
-      url: 'backendApi/userGrade/list',
-      method: 'get',
-      params: query
-  })
-}
-
-// 查询等级信息
-export function getUserGradeInfo(memberId) {
-  return request({
-    url: 'backendApi/userGrade/info/' + memberId,
-    method: 'get'
-  })
-}
-
-// 更新状态
-export function updateUserGradeStatus(userGradeId, status) {
-  const data = {
-    userGradeId,
-    status
-  }
-  return request({
-      url: 'backendApi/userGrade/updateStatus',
-      method: 'post',
-      data: data
-  })
-}
-
-// 删除会员等级信息
-export function deleteUserGrade(gradeId) {
-  return request({
-    url: 'backendApi/userGrade/delete/' + gradeId,
-    method: 'get'
-  })
-}
-
-// 保存数据
-export function saveUserGrade(data) {
-  return request({
-    url: 'backendApi/userGrade/save',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/fuintAdmin_zt/src/assets/401_images/401.gif b/fuintAdmin_zt/src/assets/401_images/401.gif
deleted file mode 100644
index cd6e0d943..000000000
Binary files a/fuintAdmin_zt/src/assets/401_images/401.gif and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/404_images/404.png b/fuintAdmin_zt/src/assets/404_images/404.png
deleted file mode 100644
index 3d8e2305c..000000000
Binary files a/fuintAdmin_zt/src/assets/404_images/404.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/404_images/404_cloud.png b/fuintAdmin_zt/src/assets/404_images/404_cloud.png
deleted file mode 100644
index c6281d090..000000000
Binary files a/fuintAdmin_zt/src/assets/404_images/404_cloud.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/fonts/AlimamaShuHeiTi-Bold.ttf b/fuintAdmin_zt/src/assets/fonts/AlimamaShuHeiTi-Bold.ttf
deleted file mode 100644
index 4c9f3cc56..000000000
Binary files a/fuintAdmin_zt/src/assets/fonts/AlimamaShuHeiTi-Bold.ttf and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/fonts/Source Han Sans CN Regular.otf b/fuintAdmin_zt/src/assets/fonts/Source Han Sans CN Regular.otf
deleted file mode 100644
index 886f82f87..000000000
Binary files a/fuintAdmin_zt/src/assets/fonts/Source Han Sans CN Regular.otf and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/fonts/YouSheBiaoTiHei.ttf b/fuintAdmin_zt/src/assets/fonts/YouSheBiaoTiHei.ttf
deleted file mode 100644
index 3729151a2..000000000
Binary files a/fuintAdmin_zt/src/assets/fonts/YouSheBiaoTiHei.ttf and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/icons/index.js b/fuintAdmin_zt/src/assets/icons/index.js
deleted file mode 100644
index 2c6b309c9..000000000
--- a/fuintAdmin_zt/src/assets/icons/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon'// svg component
-
-// register globally
-Vue.component('svg-icon', SvgIcon)
-
-const req = require.context('./svg', false, /\.svg$/)
-const requireAll = requireContext => requireContext.keys().map(requireContext)
-requireAll(req)
diff --git a/fuintAdmin_zt/src/assets/icons/svg/404.svg b/fuintAdmin_zt/src/assets/icons/svg/404.svg
deleted file mode 100644
index 6df50190a..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/404.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M121.718 73.272v9.953c3.957-7.584 6.199-16.05 6.199-24.995C127.917 26.079 99.273 0 63.958 0 28.644 0 0 26.079 0 58.23c0 .403.028.806.028 1.21l22.97-25.953h13.34l-19.76 27.187h6.42V53.77l13.728-19.477v49.361H22.998V73.272H2.158c5.951 20.284 23.608 36.208 45.998 41.399-1.44 3.3-5.618 11.263-12.565 12.674-8.607 1.764 23.358.428 46.163-13.178 17.519-4.611 31.938-15.849 39.77-30.513h-13.506V73.272H85.02V59.464l22.998-25.977h13.008l-19.429 27.187h6.421v-7.433l13.727-19.402v39.433h-.027zm-78.24 2.822a10.516 10.516 0 0 1-.996-4.535V44.548c0-1.613.332-3.124.996-4.535a11.66 11.66 0 0 1 2.713-3.68c1.134-1.032 2.49-1.864 4.04-2.468 1.55-.605 3.21-.908 4.982-.908h11.292c1.77 0 3.431.303 4.981.908 1.522.604 2.85 1.41 3.986 2.418l-12.26 16.303v-2.898a1.96 1.96 0 0 0-.665-1.512c-.443-.403-.996-.604-1.66-.604-.665 0-1.218.201-1.661.604a1.96 1.96 0 0 0-.664 1.512v9.071L44.364 77.606a10.556 10.556 0 0 1-.886-1.512zm35.73-4.535c0 1.613-.332 3.124-.997 4.535a11.66 11.66 0 0 1-2.712 3.68c-1.134 1.032-2.49 1.864-4.04 2.469-1.55.604-3.21.907-4.982.907H55.185c-1.77 0-3.431-.303-4.981-.907-1.55-.605-2.906-1.437-4.041-2.47a12.49 12.49 0 0 1-1.384-1.512l13.727-18.217v6.375c0 .605.222 1.109.665 1.512.442.403.996.604 1.66.604.664 0 1.218-.201 1.66-.604a1.96 1.96 0 0 0 .665-1.512V53.87L75.97 36.838c.913.932 1.66 1.99 2.214 3.175.664 1.41.996 2.922.996 4.535v27.011h.028z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/bug.svg b/fuintAdmin_zt/src/assets/icons/svg/bug.svg
deleted file mode 100644
index 05a150dc3..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/bug.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M127.88 73.143c0 1.412-.506 2.635-1.518 3.669-1.011 1.033-2.209 1.55-3.592 1.55h-17.887c0 9.296-1.783 17.178-5.35 23.645l16.609 17.044c1.011 1.034 1.517 2.257 1.517 3.67 0 1.412-.506 2.635-1.517 3.668-.958 1.033-2.155 1.55-3.593 1.55-1.438 0-2.635-.517-3.593-1.55l-15.811-16.063a15.49 15.49 0 0 1-1.196 1.06c-.532.434-1.65 1.208-3.353 2.322a50.104 50.104 0 0 1-5.192 2.974c-1.758.87-3.94 1.658-6.546 2.364-2.607.706-5.189 1.06-7.748 1.06V47.044H58.89v73.062c-2.716 0-5.417-.367-8.106-1.102-2.688-.734-5.003-1.631-6.945-2.692a66.769 66.769 0 0 1-5.268-3.179c-1.571-1.057-2.73-1.94-3.476-2.65L33.9 109.34l-14.611 16.877c-1.066 1.14-2.344 1.711-3.833 1.711-1.277 0-2.422-.434-3.434-1.304-1.012-.978-1.557-2.187-1.635-3.627-.079-1.44.333-2.705 1.236-3.794l16.129-18.51c-3.087-6.197-4.63-13.644-4.63-22.342H5.235c-1.383 0-2.58-.517-3.592-1.55S.125 74.545.125 73.132c0-1.412.506-2.635 1.518-3.668 1.012-1.034 2.21-1.55 3.592-1.55h17.887V43.939L9.308 29.833c-1.012-1.033-1.517-2.256-1.517-3.669 0-1.412.505-2.635 1.517-3.668 1.012-1.034 2.21-1.55 3.593-1.55s2.58.516 3.593 1.55l13.813 14.106h67.396l13.814-14.106c1.012-1.034 2.21-1.55 3.592-1.55 1.384 0 2.581.516 3.593 1.55 1.012 1.033 1.518 2.256 1.518 3.668 0 1.413-.506 2.636-1.518 3.67l-13.814 14.105v23.975h17.887c1.383 0 2.58.516 3.593 1.55 1.011 1.033 1.517 2.256 1.517 3.668l-.005.01zM89.552 26.175H38.448c0-7.23 2.489-13.386 7.466-18.469C50.892 2.623 56.92.082 64 .082c7.08 0 13.108 2.541 18.086 7.624 4.977 5.083 7.466 11.24 7.466 18.469z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/build.svg b/fuintAdmin_zt/src/assets/icons/svg/build.svg
deleted file mode 100644
index 97c468863..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/build.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568899741379" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2054" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M960 591.424V368.96c0-0.288 0.16-0.512 0.16-0.768S960 367.68 960 367.424V192a32 32 0 0 0-32-32H96a32 32 0 0 0-32 32v175.424c0 0.288-0.16 0.512-0.16 0.768s0.16 0.48 0.16 0.768v222.464c0 0.288-0.16 0.512-0.16 0.768s0.16 0.48 0.16 0.768V864a32 32 0 0 0 32 32h832a32 32 0 0 0 32-32v-271.04c0-0.288 0.16-0.512 0.16-0.768S960 591.68 960 591.424z m-560-31.232v-160H608v160h-208z m208 64V832h-208v-207.808H608z m-480-224h208v160H128v-160z m544 0h224v160h-224v-160zM896 224v112.192H128V224h768zM128 624.192h208V832H128v-207.808zM672 832v-207.808h224V832h-224z" p-id="2055"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/button.svg b/fuintAdmin_zt/src/assets/icons/svg/button.svg
deleted file mode 100644
index 904fddc85..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/button.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588670460195" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1314" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M230.4 307.712c13.824 0 25.088-11.264 25.088-25.088 0-100.352 81.92-182.272 182.272-182.272s182.272 81.408 182.272 182.272c0 13.824 11.264 25.088 25.088 25.088s25.088-11.264 24.576-25.088c0-127.488-103.936-231.936-231.936-231.936S205.824 154.624 205.824 282.624c-0.512 14.336 10.752 25.088 24.576 25.088z m564.736 234.496c-11.264 0-21.504 2.048-31.232 6.144 0-44.544-40.448-81.92-88.064-81.92-14.848 0-28.16 3.584-39.936 10.24-13.824-28.16-44.544-48.128-78.848-48.128-12.288 0-24.576 2.56-35.328 7.68V284.16c0-45.568-37.888-81.92-84.48-81.92s-84.48 36.864-84.48 81.92v348.672l-69.12-112.64c-18.432-28.16-58.368-36.864-91.136-19.968-26.624 14.336-46.592 47.104-30.208 88.064 3.072 8.192 76.8 205.312 171.52 311.296 0 0 28.16 24.576 43.008 58.88 4.096 9.728 13.312 15.36 22.528 15.36 3.072 0 6.656-0.512 9.728-2.048 12.288-5.12 18.432-19.968 12.8-32.256-19.456-44.544-53.76-74.752-53.76-74.752C281.6 768 209.408 573.44 208.384 570.88c-5.12-12.8-2.56-20.992 7.168-26.112 9.216-4.608 21.504-4.608 26.112 2.56l113.152 184.32c4.096 8.704 12.8 14.336 22.528 14.336 13.824 0 25.088-10.752 25.088-25.088V284.16c0-17.92 15.36-32.256 34.816-32.256s34.816 14.336 34.816 32.256v284.16c0 13.824 10.24 25.088 24.576 25.088 13.824 0 25.088-11.264 25.088-25.088v-57.344c0-17.92 15.36-32.768 34.816-32.768 19.968 0 37.376 15.36 37.376 32.768v95.232c0 7.168 3.072 13.312 7.68 17.92 4.608 4.608 10.752 7.168 17.92 7.168 13.824 0 24.576-11.264 24.576-25.088V547.84c0-18.432 13.824-32.256 32.256-32.256 20.48 0 38.912 15.36 38.912 32.256v95.232c0 13.824 11.264 25.088 25.088 25.088s24.576-11.264 25.088-25.088v-18.944c0-18.944 12.8-32.256 30.72-32.256 18.432 0 22.528 18.944 22.528 31.744 0 1.024-11.776 99.84-50.688 173.056-30.72 58.368-45.056 112.128-51.2 146.944-2.56 13.312 6.656 26.112 19.968 28.672 1.536 0 3.072 0.512 4.608 0.512 11.776 0 22.016-8.192 24.064-20.48 5.632-31.232 18.432-79.36 46.08-132.608 43.52-81.92 55.808-186.88 56.32-193.536-0.512-50.688-29.696-83.968-72.704-83.968z"></path></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/cascader.svg b/fuintAdmin_zt/src/assets/icons/svg/cascader.svg
deleted file mode 100644
index e256024f9..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/cascader.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1576153230908" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="971" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M772.87036133 734.06115723c-43.34106445 0-80.00793458 27.93273926-93.76831055 66.57714843H475.90991211c-56.60705567 0-102.66723633-46.06018067-102.66723633-102.66723633V600.82446289h305.859375c13.76037598 38.64440918 50.42724609 66.57714844 93.76831055 66.57714844 55.12390137 0 99.94812012-44.82421875 99.94812012-99.94812012S827.9942627 467.50537109 772.87036133 467.50537109c-43.34106445 0-80.00793458 27.93273926-93.76831055 66.57714844H373.24267578V401.01062011h321.92687989c55.12390137 0 99.94812012-44.82421875 99.94812011-99.94812011V190.07312011C795.11767578 134.94921875 750.29345703 90.125 695.16955567 90.125H251.12963867C196.0057373 90.125 151.18151855 134.94921875 151.18151855 190.07312011V301.0625c0 55.12390137 44.82421875 99.94812012 99.94812012 99.94812012h55.53588867v296.96044921c0 93.35632325 75.97045898 169.32678223 169.32678224 169.32678223h203.19213866c13.76037598 38.64440918 50.42724609 66.57714844 93.76831055 66.57714844 55.12390137 0 99.94812012-44.82421875 99.94812012-99.94812012s-44.90661622-99.86572266-100.03051758-99.86572265z m0-199.89624024c18.37463379 0 33.28857422 14.91394043 33.28857422 33.28857423s-14.91394043 33.28857422-33.28857422 33.28857421-33.28857422-14.91394043-33.28857422-33.28857421 14.91394043-33.28857422 33.28857422-33.28857422zM217.75866699 301.0625V190.07312011c0-18.37463379 14.91394043-33.28857422 33.28857423-33.28857421h444.03991698c18.37463379 0 33.28857422 14.91394043 33.28857422 33.28857422V301.0625c0 18.37463379-14.91394043 33.28857422-33.28857422 33.28857422H251.12963867c-18.37463379 0-33.37097168-14.91394043-33.37097168-33.28857422z m555.11169434 566.23535156c-18.37463379 0-33.28857422-14.91394043-33.28857422-33.28857422 0-18.37463379 14.91394043-33.28857422 33.28857422-33.28857422s33.28857422 14.91394043 33.28857422 33.28857422c0.08239747 18.29223633-14.91394043 33.28857422-33.28857422 33.28857422z" p-id="972"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/chart.svg b/fuintAdmin_zt/src/assets/icons/svg/chart.svg
deleted file mode 100644
index 27728fb0b..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/chart.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h36.571V128H0V54.857zM91.429 27.43H128V128H91.429V27.429zM45.714 0h36.572v128H45.714V0z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/checkbox.svg b/fuintAdmin_zt/src/assets/icons/svg/checkbox.svg
deleted file mode 100644
index 013fd3a27..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/checkbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575982282951" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="902" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M828.40625 90.125H195.59375C137.375 90.125 90.125 137.375 90.125 195.59375v632.8125c0 58.21875 47.25 105.46875 105.46875 105.46875h632.8125c58.21875 0 105.46875-47.25 105.46875-105.46875V195.59375c0-58.21875-47.25-105.46875-105.46875-105.46875z m52.734375 738.28125c0 29.16-23.57015625 52.734375-52.734375 52.734375H195.59375c-29.109375 0-52.734375-23.574375-52.734375-52.734375V195.59375c0-29.109375 23.625-52.734375 52.734375-52.734375h632.8125c29.16 0 52.734375 23.625 52.734375 52.734375v632.8125z" p-id="903"></path><path d="M421.52890625 709.55984375a36.28125 36.28125 0 0 1-27.55265625-12.66890625L205.17453125 476.613125a36.28546875 36.28546875 0 0 1 55.10109375-47.22890625l164.986875 192.4846875 342.16171875-298.48078125a36.2896875 36.2896875 0 0 1 47.70984375 54.68765625L445.3859375 700.6203125a36.3234375 36.3234375 0 0 1-23.85703125 8.93953125z" p-id="904"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/clipboard.svg b/fuintAdmin_zt/src/assets/icons/svg/clipboard.svg
deleted file mode 100644
index 90923ff62..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/clipboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.857 118.857h64V73.143H89.143c-1.902 0-3.52-.668-4.855-2.002-1.335-1.335-2.002-2.954-2.002-4.855V36.57H54.857v82.286zM73.143 16v-4.571a2.2 2.2 0 0 0-.677-1.61 2.198 2.198 0 0 0-1.609-.676H20.571c-.621 0-1.158.225-1.609.676a2.198 2.198 0 0 0-.676 1.61V16a2.2 2.2 0 0 0 .676 1.61c.451.45.988.676 1.61.676h50.285c.622 0 1.158-.226 1.61-.677.45-.45.676-.987.676-1.609zm18.286 48h21.357L91.43 42.642V64zM128 73.143v48c0 1.902-.667 3.52-2.002 4.855-1.335 1.335-2.953 2.002-4.855 2.002H52.57c-1.901 0-3.52-.667-4.854-2.002-1.335-1.335-2.003-2.953-2.003-4.855v-11.429H6.857c-1.902 0-3.52-.667-4.855-2.002C.667 106.377 0 104.759 0 102.857v-96c0-1.902.667-3.52 2.002-4.855C3.337.667 4.955 0 6.857 0h77.714c1.902 0 3.52.667 4.855 2.002 1.335 1.335 2.003 2.953 2.003 4.855V30.29c1 .622 1.856 1.29 2.569 2.003l29.147 29.147c1.335 1.335 2.478 3.145 3.429 5.43.95 2.287 1.426 4.383 1.426 6.291v-.018z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/code.svg b/fuintAdmin_zt/src/assets/icons/svg/code.svg
deleted file mode 100644
index ed4d23cf4..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" fill="#bfbfbf" p-id="2423"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/color.svg b/fuintAdmin_zt/src/assets/icons/svg/color.svg
deleted file mode 100644
index 44a81aab1..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/color.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577252187056" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2508" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M747.59340925 691.12859384c11.51396329 0.25305413 22.43746719-0.21087818 40.74171707-1.51832482 29.35428085-2.10878421 35.84933734-2.36183835 46.47761114-0.8856895 24.71495444 3.37405491 41.12129828 21.76265671 32.47528161 47.95376084-85.57447632 258.19957947-442.00123984 249.76444099-628.67084683 50.73735554-153.47733892-159.33976008-153.09775772-414.41833795 0.92786545-573.42069196 159.71934128-162.67163983 424.03439521-166.59397897 565.78689185 0.63263534 80.38686649 94.81095318 108.34934958 169.16669549 89.11723508 230.57450162-15.01454608 47.99593598-50.61082928 77.68762207-119.77896259 114.63352789-4.89237973 2.65706845-29.35428085 15.52065436-35.84933652 19.02123633-46.94154346 25.30541465-63.51659033 41.20565021-62.20914449 58.45550757 2.95229856 39.13904114 24.16667102 52.7196135 70.98168823 53.81618115z m44.41100207 50.10472101c-19.82257471 1.43397372-32.05352527 1.940082-45.63409763 1.6448519-70.34905207-1.60267593-115.98314969-30.91478165-121.38163769-101.64341492-3.45840683-46.05585397 24.7571304-73.13264758 89.24376132-107.96976837 6.7902866-3.66928501 31.37871396-16.57504688 36.06021551-19.06341229 57.69634516-30.83042972 85.15271997-53.73183005 94.76877722-84.47790866 12.77923398-40.78389304-9.10994898-98.94417051-79.24812286-181.6507002-121.17075953-142.97559219-350.14258521-139.60153647-489.2380134 2.06660824-134.49827774 138.84237405-134.79350784 362.12048163-0.42175717 501.637667 158.53842169 168.99799328 451.9968783 181.18676788 534.57688175-11.80919339-4.68150156 0.2952301-10.71262573 0.67481131-18.72600705 1.26527069z" p-id="2509"></path><path d="M346.03865637 637.18588562a78.82636652 78.82636652 0 0 0 78.32025825-79.29029883c0-43.69401562-35.005823-79.29029883-78.32025825-79.29029882a78.82636652 78.82636652 0 0 0-78.36243338 79.29029882c0 43.69401562 35.005823 79.29029883 78.36243338 79.29029883z m0-51.7495729a27.07679361 27.07679361 0 0 1-26.5706845-27.54072593c0-15.30977536 11.97789643-27.54072593 26.5706845-27.54072592 14.55061295 0 26.57068533 12.23095057 26.57068533 27.54072592a27.07679361 27.07679361 0 0 1-26.57068533 27.54072593zM475.7289063 807.11174353a78.82636652 78.82636652 0 0 0 78.3624334-79.29029882c0-43.69401562-34.96364785-79.29029883-78.32025825-79.29029883a78.82636652 78.82636652 0 0 0-78.32025742 79.29029883c0 43.69401562 34.96364785 79.29029883 78.32025742 79.29029882z m0-51.74957208a27.07679361 27.07679361 0 0 1-26.57068532-27.54072674c0-15.30977536 12.06224753-27.54072593 26.57068532-27.54072593 14.59278892 0 26.57068533 12.23095057 26.57068453 27.54072593a27.07679361 27.07679361 0 0 1-26.57068453 27.54072674zM601.24376214 377.21492718a78.82636652 78.82636652 0 0 0 78.32025742-79.29029883c0-43.69401562-34.96364785-79.29029883-78.32025742-79.29029882a78.82636652 78.82636652 0 0 0-78.32025823 79.29029883c0 43.69401562 34.96364785 79.29029883 78.32025824 79.29029883z m1e-8-51.74957208a27.07679361 27.07679361 0 0 1-26.57068534-27.54072675c0-15.30977536 11.97789643-27.54072593 26.57068534-27.54072591 14.55061295 0 26.57068533 12.23095057 26.57068451 27.54072592a27.07679361 27.07679361 0 0 1-26.57068451 27.54072674zM378.80916809 433.85687983a78.82636652 78.82636652 0 0 0 78.32025824-79.29029883c0-43.69401562-34.96364785-79.29029883-78.32025824-79.29029802a78.82636652 78.82636652 0 0 0-78.32025742 79.29029802c0 43.69401562 34.96364785 79.29029883 78.32025742 79.29029883z m0-51.74957209a27.07679361 27.07679361 0 0 1-26.57068451-27.54072674c0-15.30977536 11.97789643-27.54072593 26.57068451-27.54072593 14.55061295 0 26.57068533 12.23095057 26.57068533 27.54072593a27.07679361 27.07679361 0 0 1-26.57068533 27.54072674z" p-id="2510"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/component.svg b/fuintAdmin_zt/src/assets/icons/svg/component.svg
deleted file mode 100644
index 29c345809..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/component.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575804206892" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3145" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M826.56 470.016c-32.896 0-64.384 12.288-89.984 35.52l0-104.96c0-62.208-50.496-112.832-112.64-113.088L623.936 287.04 519.552 287.104C541.824 262.72 554.56 230.72 554.56 197.12c0-73.536-59.904-133.44-133.504-133.44-73.472 0-133.376 59.904-133.376 133.44 0 32.896 12.224 64.256 35.52 89.984L175.232 287.104l0 0.576C113.728 288.704 64 338.88 64 400.576l0.32 0 0.32 116.48C60.864 544.896 70.592 577.728 100.8 588.48c12.736 4.608 37.632 7.488 60.864-25.28 12.992-18.368 34.24-29.248 56.64-29.248 38.336 0 69.504 31.104 69.504 69.312 0 38.4-31.168 69.504-69.504 69.504-22.656 0-44.032-11.264-57.344-30.4C138.688 610.112 112.576 615.36 102.464 619.136c-29.824 10.752-39.104 43.776-38.144 67.392l0 160.384L64 846.912C64 909.248 114.752 960 177.216 960l446.272 0c62.4 0 113.152-50.752 113.152-113.152l0-145.024c24.384 22.272 56.384 35.008 89.984 35.008 73.536 0 133.44-59.904 133.44-133.504C960 529.92 900.096 470.016 826.56 470.016zM826.56 672.896c-22.72 0-44.032-11.264-57.344-30.4-22.272-32.384-48.448-27.136-58.56-23.36-29.824 10.752-39.04 43.776-38.08 67.392l0 160.384c0 27.136-22.016 49.152-49.152 49.152L177.216 896.064C150.08 896 128 873.984 128 846.848l0.32 0 0-145.024c24.384 22.272 56.384 35.008 89.984 35.008 73.6 0 133.504-59.904 133.504-133.504 0-73.472-59.904-133.376-133.504-133.376-32.896 0-64.32 12.288-89.984 35.52l0-104.96L128 400.512c0-27.072 22.08-49.152 49.216-49.152L177.216 351.04 334.656 350.72c3.776 0.512 7.616 0.832 11.52 0.832 24.896 0 50.752-10.816 60.032-37.056 4.544-12.736 7.424-37.568-25.344-60.736C362.624 240.768 351.68 219.52 351.68 197.12c0-38.272 31.104-69.44 69.376-69.44 38.336 0 69.504 31.168 69.504 69.44 0 22.72-11.264 44.032-30.528 57.472C427.968 276.736 433.088 302.784 436.8 313.024c10.752 29.888 43.072 39.232 67.392 38.08l119.232 0 0 0.384c27.136 0 49.152 22.08 49.152 49.152l0.256 116.48c-3.776 27.84 6.016 60.736 36.224 71.488 12.736 4.608 37.632 7.488 60.8-25.28 13.056-18.368 34.24-29.248 56.704-29.248C864.832 534.016 896 565.12 896 603.392 896 641.728 864.832 672.896 826.56 672.896z" p-id="3146"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/dashboard.svg b/fuintAdmin_zt/src/assets/icons/svg/dashboard.svg
deleted file mode 100644
index 5317d3702..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/dashboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="100" xmlns="http://www.w3.org/2000/svg"><path d="M27.429 63.638c0-2.508-.893-4.65-2.679-6.424-1.786-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.465 2.662-1.785 1.774-2.678 3.916-2.678 6.424 0 2.508.893 4.65 2.678 6.424 1.786 1.775 3.94 2.662 6.465 2.662 2.524 0 4.678-.887 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm13.714-31.801c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM71.714 65.98l7.215-27.116c.285-1.23.107-2.378-.536-3.443-.643-1.064-1.56-1.762-2.75-2.094-1.19-.33-2.333-.177-3.429.462-1.095.639-1.81 1.573-2.143 2.804l-7.214 27.116c-2.857.237-5.405 1.266-7.643 3.088-2.238 1.822-3.738 4.152-4.5 6.992-.952 3.644-.476 7.098 1.429 10.364 1.905 3.265 4.69 5.37 8.357 6.317 3.667.947 7.143.474 10.429-1.42 3.285-1.892 5.404-4.66 6.357-8.305.762-2.84.619-5.607-.429-8.305-1.047-2.697-2.762-4.85-5.143-6.46zm47.143-2.342c0-2.508-.893-4.65-2.678-6.424-1.786-1.775-3.94-2.662-6.465-2.662-2.524 0-4.678.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.786 1.775 3.94 2.662 6.464 2.662 2.524 0 4.679-.887 6.465-2.662 1.785-1.775 2.678-3.916 2.678-6.424zm-45.714-45.43c0-2.509-.893-4.65-2.679-6.425C68.68 10.01 66.524 9.122 64 9.122c-2.524 0-4.679.887-6.464 2.661-1.786 1.775-2.679 3.916-2.679 6.425 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm32 13.629c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM128 63.638c0 12.351-3.357 23.78-10.071 34.286-.905 1.372-2.19 2.058-3.858 2.058H13.93c-1.667 0-2.953-.686-3.858-2.058C3.357 87.465 0 76.037 0 63.638c0-8.613 1.69-16.847 5.071-24.703C8.452 31.08 13 24.312 18.714 18.634c5.715-5.68 12.524-10.199 20.429-13.559C47.048 1.715 55.333.035 64 .035c8.667 0 16.952 1.68 24.857 5.04 7.905 3.36 14.714 7.88 20.429 13.559 5.714 5.678 10.262 12.446 13.643 20.301 3.38 7.856 5.071 16.09 5.071 24.703z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/date-range.svg b/fuintAdmin_zt/src/assets/icons/svg/date-range.svg
deleted file mode 100644
index fda571e70..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/date-range.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579774833889" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1376" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M887.466667 192.853333h-100.693334V119.466667c0-10.24-6.826667-17.066667-17.066666-17.066667s-17.066667 6.826667-17.066667 17.066667v73.386666H303.786667V119.466667c0-10.24-6.826667-17.066667-17.066667-17.066667s-17.066667 6.826667-17.066667 17.066667v73.386666H168.96c-46.08 0-85.333333 37.546667-85.333333 85.333334V836.266667c0 46.08 37.546667 85.333333 85.333333 85.333333H887.466667c46.08 0 85.333333-37.546667 85.333333-85.333333V278.186667c0-47.786667-37.546667-85.333333-85.333333-85.333334z m-718.506667 34.133334h100.693333v66.56c0 10.24 6.826667 17.066667 17.066667 17.066666s17.066667-6.826667 17.066667-17.066666v-66.56h450.56v66.56c0 10.24 6.826667 17.066667 17.066666 17.066666s17.066667-6.826667 17.066667-17.066666v-66.56H887.466667c27.306667 0 51.2 22.186667 51.2 51.2v88.746666H117.76v-88.746666c0-29.013333 22.186667-51.2 51.2-51.2zM887.466667 887.466667H168.96c-27.306667 0-51.2-22.186667-51.2-51.2V401.066667H938.666667V836.266667c0 27.306667-22.186667 51.2-51.2 51.2z" p-id="1377"></path><path d="M858.453333 493.226667H327.68c-10.24 0-17.066667 6.826667-17.066667 17.066666v114.346667h-116.053333c-10.24 0-17.066667 6.826667-17.066667 17.066667v133.12c0 10.24 6.826667 17.066667 17.066667 17.066666H460.8c10.24 0 17.066667-6.826667 17.066667-17.066666v-114.346667h380.586666c10.24 0 17.066667-6.826667 17.066667-17.066667v-133.12c0-10.24-6.826667-17.066667-17.066667-17.066666z m-413.013333 34.133333v97.28h-98.986667v-97.28h98.986667z m-230.4 131.413333h98.986667v98.986667h-98.986667v-98.986667z m131.413333 97.28v-97.28h98.986667v97.28h-98.986667z m133.12-228.693333h97.28v98.986667h-97.28v-98.986667z m131.413334 0h98.986666v98.986667h-98.986666v-98.986667z m230.4 97.28h-98.986667v-98.986667h98.986667v98.986667z" p-id="1378"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/date.svg b/fuintAdmin_zt/src/assets/icons/svg/date.svg
deleted file mode 100644
index 52dc73eec..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/date.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577186573535" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1068" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M479.85714249 608.42857168h64.28571502c19.28571417 0 32.14285751-12.85714249 32.14285664-32.14285751s-12.85714249-32.14285751-32.14285664-32.14285664h-64.28571504c-19.28571417 0-32.14285751 12.85714249-32.14285664 32.14285662s12.85714249 32.14285751 32.14285664 32.14285753z m-2e-8 122.14285665h64.28571504c19.28571417 0 32.14285751-12.85714249 32.14285664-32.14285665s-12.85714249-32.14285751-32.14285664-32.14285751h-64.28571504c-19.28571417 0-32.14285751 12.85714249-32.14285664 32.14285751s12.85714249 32.14285751 32.14285664 32.14285664z m353.57142921-559.28571416h-128.57142921v-32.14285664c0-19.28571417-12.85714249-32.14285751-32.14285664-32.14285753s-32.14285751 12.85714249-32.14285751 32.14285753v32.14285664h-257.14285665v-32.14285664c0-19.28571417-12.85714249-32.14285751-32.14285752-32.14285753s-32.14285751 12.85714249-32.14285664 32.14285753v32.14285664h-128.57142919c-70.71428585 0-128.57142832 57.85714249-128.57142832 122.14285751v501.42857081c0 70.71428585 57.85714249 128.57142832 128.57142832 122.14285751h642.85714335c70.71428585 0 128.57142832-57.85714249 128.57142833-122.14285751v-501.42857081c0-70.71428585-57.85714249-122.14285753-128.57142833-122.14285751z m64.28571415 623.57142832c0 32.14285751-32.14285751 64.28571415-64.28571416 64.28571504h-642.85714335c-32.14285751 0-64.28571415-25.71428583-64.28571417-64.28571504v-372.85714249h771.42857168v372.85714249z m0-437.14285664h-771.42857168v-64.28571417c0-32.14285751 32.14285751-64.28571415 64.28571417-64.28571415h128.57142919v32.14285664c0 19.28571417 12.85714249 32.14285751 32.14285664 32.14285751s32.14285751-12.85714249 32.14285753-32.14285751v-32.14285664h257.14285665v32.14285664c0 19.28571417 12.85714249 32.14285751 32.1428575 32.14285751s32.14285751-12.85714249 32.14285664-32.14285751v-32.14285664h128.57142921c32.14285751 0 64.28571415 25.71428583 64.28571415 64.28571415v64.28571417z m-610.71428583 372.85714247h64.28571415c19.28571417 0 32.14285751-12.85714249 32.14285753-32.14285664s-12.85714249-32.14285751-32.14285753-32.14285751h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285751 32.14285751s12.85714249 32.14285751 32.14285751 32.14285665z m385.71428583-122.14285664h64.28571417c19.28571417 0 32.14285751-12.85714249 32.14285751-32.14285751s-12.85714249-32.14285751-32.14285751-32.14285664h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285753 32.14285664s12.85714249 32.14285751 32.14285753 32.14285751z m-385.71428583 0h64.28571415c19.28571417 0 32.14285751-12.85714249 32.14285753-32.14285751s-12.85714249-32.14285751-32.14285753-32.14285664h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285751 32.14285664s12.85714249 32.14285751 32.14285751 32.14285751z m385.71428583 122.14285665h64.28571417c19.28571417 0 32.14285751-12.85714249 32.14285751-32.14285665s-12.85714249-32.14285751-32.14285751-32.14285751h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285753 32.14285751s12.85714249 32.14285751 32.14285753 32.14285665z" p-id="1069"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/dict.svg b/fuintAdmin_zt/src/assets/icons/svg/dict.svg
deleted file mode 100644
index 484937730..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/dict.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035680909" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3601" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1002.0848 744.672l-33.568 10.368c0.96 7.264 2.144 14.304 2.144 21.76 0 7.328-1.184 14.432-2.368 21.568l33.792 10.56c7.936 2.24 14.496 7.616 18.336 14.752 3.84 7.328 4.672 15.808 1.952 23.552-5.376 16-23.168 24.672-39.936 19.68l-34.176-10.624c-7.136 12.8-15.776 24.672-26.208 35.2l20.8 27.488a28.96 28.96 0 0 1 5.824 22.816 29.696 29.696 0 0 1-12.704 19.616 32.544 32.544 0 0 1-44.416-6.752l-20.8-27.552c-13.696 6.56-28.192 11.2-43.008 13.888v33.632c0 16.736-14.112 30.432-31.648 30.432-17.6 0-31.872-13.696-31.872-30.432v-33.632a167.616 167.616 0 0 1-42.88-13.888l-20.928 27.552c-10.72 13.76-30.08 16.64-44.288 6.752a29.632 29.632 0 0 1-12.704-19.616 29.28 29.28 0 0 1 5.696-22.816l20.896-27.808a166.72 166.72 0 0 1-27.008-34.688l-33.376 10.432c-16.8 5.184-34.56-3.552-39.936-19.616a29.824 29.824 0 0 1 20.224-38.24l33.472-10.432c-0.8-7.264-2.016-14.304-2.016-21.824 0-7.36 1.184-14.496 2.304-21.632l-33.792-10.368c-16.672-5.376-25.632-22.496-20.224-38.432 5.376-16 23.136-24.672 39.936-19.68l34.016 10.752c7.328-12.672 15.84-24.8 26.336-35.328l-20.8-27.552a29.44 29.44 0 0 1 6.944-42.432 32.704 32.704 0 0 1 44.384 6.752l20.832 27.616c13.696-6.432 28.224-11.2 43.104-13.952v-33.568c0-16.736 14.048-30.432 31.648-30.432 17.536 0 31.808 13.568 31.808 30.432v33.504c15.072 2.688 29.344 7.808 42.848 14.016l20.992-27.616a32.48 32.48 0 0 1 44.224-6.752 29.568 29.568 0 0 1 7.136 42.432l-21.024 27.808c10.432 10.432 19.872 21.888 27.04 34.752l33.376-10.432c16.768-5.12 34.56 3.68 39.936 19.68 5.536 15.936-3.712 33.056-20.32 38.304z m-206.016-74.432c-61.344 0-111.136 47.808-111.136 106.56 0 58.88 49.792 106.496 111.136 106.496 61.312 0 111.104-47.616 111.104-106.496 0-58.752-49.792-106.56-111.104-106.56z" p-id="3602"></path><path d="M802.7888 57.152h-76.448c0-22.08-21.024-38.24-42.848-38.24H39.3968a39.68 39.68 0 0 0-39.36 40.032v795.616s41.888 120.192 110.752 120.192H673.2848a227.488 227.488 0 0 1-107.04-97.44H117.6368s-40.608-13.696-40.608-41.248l470.304-0.256 1.664 3.36a227.68 227.68 0 0 1-12.64-73.632c0-60.576 24-118.624 66.88-161.44a228.352 228.352 0 0 1 123.552-63.392l-3.2 0.288 2.144-424.672h38.208l0.576 421.024c27.04 0 52.672 4.8 76.64 13.344V101.536c0.032 0-6.304-44.384-38.368-44.384zM149.7648 514.336H72.3888v-77.408H149.7648v77.408z m0-144.32H72.3888v-77.44H149.7648v77.44z m0-137.248H72.3888v-77.44H149.7648v77.44z m501.856 281.568H206.0848v-77.408h445.536v77.408z m0-144.32H206.0848v-77.44h445.536v77.44z m0-137.248H206.0848v-77.44h445.536v77.44z" p-id="3603"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/documentation.svg b/fuintAdmin_zt/src/assets/icons/svg/documentation.svg
deleted file mode 100644
index 704312289..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/documentation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M71.984 44.815H115.9L71.984 9.642v35.173zM16.094.05h63.875l47.906 38.37v76.74c0 3.392-1.682 6.645-4.677 9.044-2.995 2.399-7.056 3.746-11.292 3.746H16.094c-4.236 0-8.297-1.347-11.292-3.746-2.995-2.399-4.677-5.652-4.677-9.044V12.84C.125 5.742 7.23.05 16.094.05zm71.86 102.32V89.58h-71.86v12.79h71.86zm23.952-25.58V64H16.094v12.79h95.812z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/download.svg b/fuintAdmin_zt/src/assets/icons/svg/download.svg
deleted file mode 100644
index c89695134..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/drag.svg b/fuintAdmin_zt/src/assets/icons/svg/drag.svg
deleted file mode 100644
index 4185d3cee..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/drag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M73.137 29.08h-9.209 29.7L63.886.093 34.373 29.08h20.49v27.035H27.238v17.948h27.625v27.133h18.274V74.063h27.41V56.115h-27.41V29.08zm-9.245 98.827l27.518-26.711H36.59l27.302 26.71zM.042 64.982l27.196 27.029V38.167L.042 64.982zm100.505-26.815V92.01l27.41-27.029-27.41-26.815z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/druid.svg b/fuintAdmin_zt/src/assets/icons/svg/druid.svg
deleted file mode 100644
index a2b4b4ed2..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/druid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036347051" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5853" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M832 128H192a64.19 64.19 0 0 0-64 64v640a64.19 64.19 0 0 0 64 64h640a64.19 64.19 0 0 0 64-64V192a64.19 64.19 0 0 0-64-64z m0 703.89l-0.11 0.11H192.11l-0.11-0.11V768h640zM832 544H720L605.6 696.54 442.18 435.07 333.25 544H192v-64h114.75l147.07-147.07L610.4 583.46 688 480h144z m0-288H192v-63.89l0.11-0.11h639.78l0.11 0.11z" p-id="5854"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/edit.svg b/fuintAdmin_zt/src/assets/icons/svg/edit.svg
deleted file mode 100644
index d26101f29..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M106.133 67.2a4.797 4.797 0 0 0-4.8 4.8c0 .187.014.36.027.533h-.027V118.4H9.6V26.667h50.133c2.654 0 4.8-2.147 4.8-4.8 0-2.654-2.146-4.8-4.8-4.8H9.6a9.594 9.594 0 0 0-9.6 9.6V118.4c0 5.307 4.293 9.6 9.6 9.6h91.733c5.307 0 9.6-4.293 9.6-9.6V72.533h-.026c.013-.173.026-.346.026-.533 0-2.653-2.146-4.8-4.8-4.8z"/><path d="M125.16 13.373L114.587 2.8c-3.747-3.747-9.854-3.72-13.6.027l-52.96 52.96a4.264 4.264 0 0 0-.907 1.36L33.813 88.533c-.746 1.76-.226 3.534.907 4.68 1.133 1.147 2.92 1.667 4.693.92l31.4-13.293c.507-.213.96-.52 1.36-.907l52.96-52.96c3.747-3.746 3.774-9.853.027-13.6zM66.107 72.4l-18.32 7.76 7.76-18.32L92.72 24.667l10.56 10.56L66.107 72.4zm52.226-52.227l-8.266 8.267-10.56-10.56 8.266-8.267.027-.026 10.56 10.56-.027.026z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/education.svg b/fuintAdmin_zt/src/assets/icons/svg/education.svg
deleted file mode 100644
index 7bfb01d18..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/education.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M88.883 119.565c-7.284 0-19.434 2.495-21.333 8.25v.127c-4.232.13-5.222 0-7.108 0-1.895-5.76-14.045-8.256-21.333-8.256H0V0h42.523c9.179 0 17.109 5.47 21.47 13.551C68.352 5.475 76.295 0 85.478 0H128v119.57l-39.113-.005h-.004zM60.442 24.763c0-9.651-8.978-16.507-17.777-16.507H7.108V111.43H39.11c7.054-.14 18.177.082 21.333 6.12v-4.628c-.134-5.722-.004-13.522 0-13.832V27.413l.004-2.655-.004.005zm60.442-16.517h-35.55c-8.802 0-17.78 6.856-17.78 16.493v74.259c.004.32.138 8.115 0 13.813v4.627c3.155-6.022 14.279-6.26 21.333-6.114h32V8.25l-.003-.005z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/email.svg b/fuintAdmin_zt/src/assets/icons/svg/email.svg
deleted file mode 100644
index 74d25e21a..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/email.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="96" xmlns="http://www.w3.org/2000/svg"><path d="M64.125 56.975L120.188.912A12.476 12.476 0 0 0 115.5 0h-103c-1.588 0-3.113.3-4.513.838l56.138 56.137z"/><path d="M64.125 68.287l-62.3-62.3A12.42 12.42 0 0 0 0 12.5v71C0 90.4 5.6 96 12.5 96h103c6.9 0 12.5-5.6 12.5-12.5v-71a12.47 12.47 0 0 0-1.737-6.35L64.125 68.287z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/example.svg b/fuintAdmin_zt/src/assets/icons/svg/example.svg
deleted file mode 100644
index 46f42b532..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/example.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M96.258 57.462h31.421C124.794 27.323 100.426 2.956 70.287.07v31.422a32.856 32.856 0 0 1 25.971 25.97zm-38.796-25.97V.07C27.323 2.956 2.956 27.323.07 57.462h31.422a32.856 32.856 0 0 1 25.97-25.97zm12.825 64.766v31.421c30.46-2.885 54.507-27.253 57.713-57.712H96.579c-2.886 13.466-13.146 23.726-26.292 26.291zM31.492 70.287H.07c2.886 30.46 27.253 54.507 57.713 57.713V96.579c-13.466-2.886-23.726-13.146-26.291-26.292z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/excel.svg b/fuintAdmin_zt/src/assets/icons/svg/excel.svg
deleted file mode 100644
index 74d97b802..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/excel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.208 16.576v8.384h38.72v5.376h-38.72v8.704h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.512h38.72v5.376h-38.72v11.136H128v-94.72H78.208zM0 114.368L72.128 128V0L0 13.632v100.736z"/><path d="M28.672 82.56h-11.2l14.784-23.488-14.08-22.592h11.52l8.192 14.976 8.448-14.976h11.136l-14.08 22.208L58.368 82.56H46.656l-8.768-15.68z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/exit-fullscreen.svg b/fuintAdmin_zt/src/assets/icons/svg/exit-fullscreen.svg
deleted file mode 100644
index 485c128b6..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/exit-fullscreen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M49.217 41.329l-.136-35.24c-.06-2.715-2.302-4.345-5.022-4.405h-3.65c-2.712-.06-4.866 2.303-4.806 5.016l.152 19.164-24.151-23.79a6.698 6.698 0 0 0-9.499 0 6.76 6.76 0 0 0 0 9.526l23.93 23.713-18.345.074c-2.712-.069-5.228 1.813-5.64 5.02v3.462c.069 2.721 2.31 4.97 5.022 5.03l35.028-.207c.052.005.087.025.133.025l2.457.054a4.626 4.626 0 0 0 3.436-1.38c.88-.874 1.205-2.096 1.169-3.462l-.262-2.465c0-.048.182-.081.182-.136h.002zm52.523 51.212l18.32-.073c2.713.06 5.224-1.609 5.64-4.815v-3.462c-.068-2.722-2.317-4.97-5.021-5.04l-34.58.21c-.053 0-.086-.021-.138-.021l-2.451-.06a4.64 4.64 0 0 0-3.445 1.381c-.885.868-1.201 2.094-1.174 3.46l.27 2.46c.005.06-.177.095-.177.141l.141 34.697c.069 2.713 2.31 4.338 5.022 4.397l3.45.006c2.705.062 4.867-2.31 4.8-5.026l-.153-18.752 24.151 23.946a6.69 6.69 0 0 0 9.494 0 6.747 6.747 0 0 0 0-9.523L101.74 92.54v.001zM48.125 80.662a4.636 4.636 0 0 0-3.437-1.382l-2.457.06c-.05 0-.082.022-.137.022l-35.025-.21c-2.712.07-4.957 2.318-5.022 5.04v3.462c.409 3.206 2.925 4.874 5.633 4.814l18.554.06-24.132 23.928c-2.62 2.626-2.62 6.89 0 9.524a6.694 6.694 0 0 0 9.496 0l24.155-23.79-.155 18.866c-.06 2.722 2.094 5.093 4.801 5.025h3.65c2.72-.069 4.962-1.685 5.022-4.406l.141-34.956c0-.05-.182-.082-.182-.136l.262-2.46c.03-1.366-.286-2.592-1.166-3.46h-.001zM80.08 47.397a4.62 4.62 0 0 0 3.443 1.374l2.45-.054c.055 0 .088-.02.143-.028l35.08.21c2.712-.062 4.953-2.312 5.021-5.033l.009-3.463c-.417-3.211-2.937-5.084-5.64-5.025l-18.615-.073 23.917-23.715c2.63-2.623 2.63-6.879.008-9.513a6.691 6.691 0 0 0-9.494 0L92.251 26.016l.155-19.312c.065-2.713-2.097-5.085-4.802-5.025h-3.45c-2.713.069-4.954 1.693-5.022 4.406l-.139 35.247c0 .054.18.088.18.136l-.267 2.465c-.028 1.366.288 2.588 1.174 3.463v.001z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/eye-open.svg b/fuintAdmin_zt/src/assets/icons/svg/eye-open.svg
deleted file mode 100644
index 88dcc98e6..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/eye-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><style/></defs><path d="M512 128q69.675 0 135.51 21.163t115.498 54.997 93.483 74.837 73.685 82.006 51.67 74.837 32.17 54.827L1024 512q-2.347 4.992-6.315 13.483T998.87 560.17t-31.658 51.669-44.331 59.99-56.832 64.34-69.504 60.16-82.347 51.5-94.848 34.687T512 896q-69.675 0-135.51-21.163t-115.498-54.826-93.483-74.326-73.685-81.493-51.67-74.496-32.17-54.997L0 513.707q2.347-4.992 6.315-13.483t18.816-34.816 31.658-51.84 44.331-60.33 56.832-64.683 69.504-60.331 82.347-51.84 94.848-34.816T512 128.085zm0 85.333q-46.677 0-91.648 12.331t-81.152 31.83-70.656 47.146-59.648 54.485-48.853 57.686-37.675 52.821-26.325 43.99q12.33 21.674 26.325 43.52t37.675 52.351 48.853 57.003 59.648 53.845T339.2 767.02t81.152 31.488T512 810.667t91.648-12.331 81.152-31.659 70.656-46.848 59.648-54.186 48.853-57.344 37.675-52.651T927.957 512q-12.33-21.675-26.325-43.648t-37.675-52.65-48.853-57.345-59.648-54.186-70.656-46.848-81.152-31.659T512 213.334zm0 128q70.656 0 120.661 50.006T682.667 512 632.66 632.661 512 682.667 391.339 632.66 341.333 512t50.006-120.661T512 341.333zm0 85.334q-35.328 0-60.33 25.002T426.666 512t25.002 60.33T512 597.334t60.33-25.002T597.334 512t-25.002-60.33T512 426.666z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/eye.svg b/fuintAdmin_zt/src/assets/icons/svg/eye.svg
deleted file mode 100644
index 16ed2d872..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/eye.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="64" xmlns="http://www.w3.org/2000/svg"><path d="M127.072 7.994c1.37-2.208.914-5.152-.914-6.87-2.056-1.717-4.797-1.226-6.396.982-.229.245-25.586 32.382-55.74 32.382-29.24 0-55.74-32.382-55.968-32.627-1.6-1.963-4.57-2.208-6.397-.49C-.17 3.086-.399 6.275 1.2 8.238c.457.736 5.94 7.36 14.62 14.72L4.17 35.96c-1.828 1.963-1.6 5.152.228 6.87.457.98 1.6 1.471 2.742 1.471s2.284-.49 3.198-1.472l12.564-13.983c5.94 4.416 13.021 8.587 20.788 11.53l-4.797 17.418c-.685 2.699.686 5.397 3.198 6.133h1.37c2.057 0 3.884-1.472 4.341-3.68L52.6 42.83c3.655.736 7.538 1.227 11.422 1.227 3.883 0 7.767-.49 11.422-1.227l4.797 17.173c.457 2.208 2.513 3.68 4.34 3.68.457 0 .914 0 1.143-.246 2.513-.736 3.883-3.434 3.198-6.133l-4.797-17.172c7.767-2.944 14.848-7.114 20.788-11.53l12.336 13.738c.913.981 2.056 1.472 3.198 1.472s2.284-.49 3.198-1.472c1.828-1.963 1.828-4.906.228-6.87l-11.65-13.001c9.366-7.36 14.849-14.474 14.849-14.474z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/form.svg b/fuintAdmin_zt/src/assets/icons/svg/form.svg
deleted file mode 100644
index dcbaa185a..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/form.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.068 23.784c-1.02 0-1.877-.32-2.572-.96a8.588 8.588 0 0 1-1.738-2.237 11.524 11.524 0 0 1-1.042-2.621c-.232-.895-.348-1.641-.348-2.238V0h.278c.834 0 1.622.085 2.363.256.742.17 1.645.575 2.711 1.214 1.066.64 2.363 1.535 3.892 2.686 1.53 1.15 3.453 2.664 5.77 4.54 2.502 2.045 4.494 3.771 5.977 5.178 1.483 1.406 2.618 2.6 3.406 3.58.787.98 1.274 1.812 1.46 2.494.185.682.277 1.278.277 1.79v2.046H84.068zM127.3 84.01c.278.682.464 1.535.556 2.558.093 1.023-.37 2.003-1.39 2.94-.463.427-.88.832-1.25 1.215-.372.384-.696.704-.974.96a6.69 6.69 0 0 1-.973.767l-11.816-10.741a44.331 44.331 0 0 0 1.877-1.535 31.028 31.028 0 0 1 1.737-1.406c1.112-.938 2.317-1.343 3.615-1.215 1.297.128 2.363.405 3.197.83.927.427 1.923 1.173 2.989 2.239 1.065 1.065 1.876 2.195 2.432 3.388zM78.23 95.902c2.038 0 3.752-.511 5.143-1.534l-26.969 25.83H18.037c-1.761 0-3.684-.47-5.77-1.407a24.549 24.549 0 0 1-5.838-3.709 21.373 21.373 0 0 1-4.518-5.306c-1.204-2.003-1.807-4.07-1.807-6.202V16.495c0-1.79.44-3.665 1.32-5.626A18.41 18.41 0 0 1 5.04 5.562a21.798 21.798 0 0 1 5.213-3.964C12.198.533 14.237 0 16.37 0h53.24v15.984c0 1.62.278 3.367.834 5.242a16.704 16.704 0 0 0 2.572 5.179c1.159 1.577 2.665 2.898 4.518 3.964 1.853 1.066 4.078 1.598 6.673 1.598h20.295v42.325L85.458 92.45c1.02-1.364 1.529-2.856 1.529-4.476 0-2.216-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1c-2.409 0-4.448.789-6.116 2.366-1.668 1.577-2.502 3.474-2.502 5.69 0 2.217.834 4.092 2.502 5.626 1.668 1.535 3.707 2.302 6.117 2.302h52.13zM26.1 47.951c-2.41 0-4.449.789-6.117 2.366-1.668 1.577-2.502 3.473-2.502 5.69 0 2.216.834 4.092 2.502 5.626 1.668 1.534 3.707 2.302 6.117 2.302h52.13c2.409 0 4.47-.768 6.185-2.302 1.715-1.534 2.572-3.41 2.572-5.626 0-2.217-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1zm52.407 64.063l1.807-1.663 3.476-3.196a479.75 479.75 0 0 0 4.587-4.284 500.757 500.757 0 0 1 5.004-4.667c3.985-3.666 8.48-7.758 13.485-12.276l11.677 10.741-13.485 12.404-5.004 4.603-4.587 4.22a179.46 179.46 0 0 0-3.267 3.068c-.88.853-1.367 1.322-1.46 1.407-.463.341-.973.703-1.529 1.087-.556.383-1.112.703-1.668.959-.556.256-1.413.575-2.572.959a83.5 83.5 0 0 1-3.545 1.087 72.2 72.2 0 0 1-3.475.895c-1.112.256-1.946.426-2.502.511-1.112.17-1.854.043-2.224-.383-.371-.426-.464-1.151-.278-2.174.092-.511.278-1.279.556-2.302.278-1.023.602-2.067.973-3.132l1.042-3.005c.325-.938.58-1.577.765-1.918a10.157 10.157 0 0 1 2.224-2.941z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/fullscreen.svg b/fuintAdmin_zt/src/assets/icons/svg/fullscreen.svg
deleted file mode 100644
index 0e86b6fa8..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/fullscreen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M38.47 52L52 38.462l-23.648-23.67L43.209 0H.035L0 43.137l14.757-14.865L38.47 52zm74.773 47.726L89.526 76 76 89.536l23.648 23.672L84.795 128h43.174L128 84.863l-14.757 14.863zM89.538 52l23.668-23.648L128 43.207V.038L84.866 0 99.73 14.76 76 38.472 89.538 52zM38.46 76L14.792 99.651 0 84.794v43.173l43.137.033-14.865-14.757L52 89.53 38.46 76z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/github.svg b/fuintAdmin_zt/src/assets/icons/svg/github.svg
deleted file mode 100644
index db0a0d430..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1581238998885" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4187" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M511.542857 14.057143C228.914286 13.942857 0 242.742857 0 525.142857 0 748.457143 143.2 938.285714 342.628571 1008c26.857143 6.742857 22.742857-12.342857 22.742858-25.371429v-88.571428c-155.085714 18.171429-161.371429-84.457143-171.771429-101.6C172.571429 756.571429 122.857143 747.428571 137.714286 730.285714c35.314286-18.171429 71.314286 4.571429 113.028571 66.171429 30.171429 44.685714 89.028571 37.142857 118.857143 29.714286 6.514286-26.857143 20.457143-50.857143 39.657143-69.485715-160.685714-28.8-227.657143-126.857143-227.657143-243.428571 0-56.571429 18.628571-108.571429 55.2-150.514286-23.314286-69.142857 2.171429-128.342857 5.6-137.142857 66.4-5.942857 135.428571 47.542857 140.8 51.771429 37.714286-10.171429 80.8-15.542857 129.028571-15.542858 48.457143 0 91.657143 5.6 129.714286 15.885715 12.914286-9.828571 76.914286-55.771429 138.628572-50.171429 3.314286 8.8 28.228571 66.628571 6.285714 134.857143 37.028571 42.057143 55.885714 94.514286 55.885714 151.2 0 116.8-67.428571 214.971429-228.571428 243.314286a145.714286 145.714286 0 0 1 43.542857 104v128.571428c0.914286 10.285714 0 20.457143 17.142857 20.457143 202.4-68.228571 348.114286-259.428571 348.114286-484.685714 0-282.514286-229.028571-511.2-511.428572-511.2z" p-id="4188"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/guide.svg b/fuintAdmin_zt/src/assets/icons/svg/guide.svg
deleted file mode 100644
index b27100179..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/guide.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.482 70.131l36.204 16.18 69.932-65.485-61.38 70.594 46.435 18.735c1.119.425 2.397-.17 2.797-1.363v-.085L127.998.047 1.322 65.874c-1.12.597-1.519 1.959-1.04 3.151.32.511.72.937 1.2 1.107zm44.676 57.821L64.22 107.26l-18.062-7.834v28.527z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/icon.svg b/fuintAdmin_zt/src/assets/icons/svg/icon.svg
deleted file mode 100644
index 82be8eeed..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.147.062a13 13 0 0 1 4.94.945c1.55.63 2.907 1.526 4.069 2.688a13.148 13.148 0 0 1 2.761 4.069c.678 1.55 1.017 3.245 1.017 5.086v102.3c0 3.681-1.187 6.733-3.56 9.155-2.373 2.422-5.352 3.633-8.937 3.633H12.992c-3.875 0-7-1.26-9.373-3.779-2.373-2.518-3.56-5.667-3.56-9.445V12.704c0-3.39 1.163-6.345 3.488-8.863C5.872 1.32 8.972.062 12.847.062h102.3zM81.434 109.047c1.744 0 3.003-.412 3.778-1.235.775-.824 1.163-1.914 1.163-3.27 0-1.26-.388-2.325-1.163-3.197-.775-.872-2.034-1.307-3.778-1.307H72.57c.097-.194.145-.485.145-.872V27.09h9.01c1.743 0 2.954-.436 3.633-1.308.678-.872 1.017-1.938 1.017-3.197 0-1.26-.34-2.325-1.017-3.197-.679-.872-1.89-1.308-3.633-1.308H46.268c-1.743 0-2.954.436-3.632 1.308-.678.872-1.018 1.938-1.018 3.197 0 1.26.34 2.325 1.018 3.197.678.872 1.889 1.308 3.632 1.308h8.138v72.075c0 .193.024.339.073.436.048.096.072.242.072.436H46.56c-1.744 0-3.003.435-3.778 1.307-.775.872-1.163 1.938-1.163 3.197 0 1.356.388 2.446 1.163 3.27.775.823 2.034 1.235 3.778 1.235h34.875z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/input.svg b/fuintAdmin_zt/src/assets/icons/svg/input.svg
deleted file mode 100644
index ab91381e6..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/input.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802859706" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3102" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 224H128c-35.2 0-64 28.8-64 64v448c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V288c0-35.2-28.8-64-64-64z m0 480c0 19.2-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V320c0-19.2 12.8-32 32-32h704c19.2 0 32 12.8 32 32v384z" p-id="3103"></path><path d="M224 352c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V384c0-16-12.8-32-32-32z" p-id="3104"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/international.svg b/fuintAdmin_zt/src/assets/icons/svg/international.svg
deleted file mode 100644
index e9b56eee2..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/international.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M83.287 103.01c-1.57-3.84-6.778-10.414-15.447-19.548-2.327-2.444-2.182-4.306-1.338-9.862v-.64c.553-3.81 1.513-6.05 14.313-8.087 6.516-1.018 8.203 1.57 10.589 5.178l.785 1.193a12.625 12.625 0 0 0 6.43 5.207c1.134.524 2.53 1.164 4.421 2.24 4.596 2.53 4.596 5.41 4.596 11.753v.727a26.91 26.91 0 0 1-5.178 17.454 59.055 59.055 0 0 1-19.025 11.026c3.49-6.546.814-14.313 0-16.553l-.146-.087zM64 5.12a58.502 58.502 0 0 1 25.484 5.818 54.313 54.313 0 0 0-12.859 10.327c-.93 1.28-1.716 2.473-2.472 3.579-2.444 3.694-3.637 5.352-5.818 5.614a25.105 25.105 0 0 1-4.219 0c-4.276-.29-10.094-.64-11.956 4.422-1.193 3.23-1.396 11.956 2.444 16.495.66 1.077.778 2.4.32 3.578a7.01 7.01 0 0 1-2.066 3.229 18.938 18.938 0 0 1-2.909-2.91 18.91 18.91 0 0 0-8.32-6.603c-1.25-.349-2.647-.64-3.985-.93-3.782-.786-8.03-1.688-9.019-3.812a14.895 14.895 0 0 1-.727-5.818 21.935 21.935 0 0 0-1.396-9.25 8.873 8.873 0 0 0-5.557-4.946A58.705 58.705 0 0 1 64 5.12zM0 64c0 35.346 28.654 64 64 64 35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/job.svg b/fuintAdmin_zt/src/assets/icons/svg/job.svg
deleted file mode 100644
index 2a93a2519..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/job.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036191400" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5472" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M934.912 1016.832H192c-14.336 0-25.6-11.264-25.6-25.6v-189.44c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v163.84h691.712V64H217.6v148.48c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6v-174.08c0-14.336 11.264-25.6 25.6-25.6h742.912c14.336 0 25.6 11.264 25.6 25.6v952.832c0 14.336-11.264 25.6-25.6 25.6z" p-id="5473"></path><path d="M232.96 371.2h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM232.96 540.16h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM232.96 698.88h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM574.464 762.88c-134.144 0-243.2-109.056-243.2-243.2S440.32 276.48 574.464 276.48s243.2 109.056 243.2 243.2-109.056 243.2-243.2 243.2z m0-435.2c-105.984 0-192 86.016-192 192S468.48 711.68 574.464 711.68s192-86.016 192-192S680.448 327.68 574.464 327.68z" p-id="5474"></path><path d="M663.04 545.28h-87.04c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h87.04c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="5475"></path><path d="M576 545.28c-14.336 0-25.6-11.264-25.6-25.6v-87.04c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v87.04c0 14.336-11.264 25.6-25.6 25.6z" p-id="5476"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/language.svg b/fuintAdmin_zt/src/assets/icons/svg/language.svg
deleted file mode 100644
index 0082b577a..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/language.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.742 36.8c2.398 7.2 5.595 12.8 11.19 18.4 4.795-4.8 7.992-11.2 10.39-18.4h-21.58zm-52.748 40h20.78l-10.39-28-10.39 28z"/><path d="M111.916 0H16.009C7.218 0 .025 7.2.025 16v96c0 8.8 7.193 16 15.984 16h95.907c8.791 0 15.984-7.2 15.984-16V16c0-8.8-6.394-16-15.984-16zM72.754 103.2c-1.598 1.6-3.197 1.6-4.795 1.6-.8 0-2.398 0-3.197-.8-.8-.8-1.599 0-1.599-.8s-.799-1.6-1.598-3.2c-.8-1.6-.8-2.4-1.599-4l-3.196-8.8H28.797L25.6 96c-1.598 3.2-2.398 5.6-3.197 7.2-.8 1.6-2.398 1.6-4.795 1.6-1.599 0-3.197-.8-4.796-1.6-1.598-1.6-2.397-2.4-2.397-4 0-.8 0-1.6.799-3.2.8-1.6.8-2.4 1.598-4l17.583-44.8c.8-1.6.8-3.2 1.599-4.8.799-1.6 1.598-3.2 2.397-4 .8-.8 1.599-2.4 3.197-3.2 1.599-.8 3.197-.8 4.796-.8 1.598 0 3.196 0 4.795.8 1.598.8 2.398 1.6 3.197 3.2.799.8 1.598 2.4 2.397 4 .8 1.6 1.599 3.2 2.398 5.6l17.583 44c1.598 3.2 2.398 5.6 2.398 7.2-.8.8-1.599 2.4-2.398 4zM116.711 72c-8.791-3.2-15.185-7.2-20.78-12-5.594 5.6-12.787 9.6-21.579 12l-2.397-4c8.791-2.4 15.984-5.6 21.579-11.2C87.939 51.2 83.144 44 81.545 36h-7.992v-3.2h21.58c-1.6-2.4-3.198-5.6-4.796-8l2.397-.8c1.599 2.4 3.997 5.6 5.595 8.8h19.98v4h-7.992c-2.397 8-6.393 15.2-11.189 20 5.595 4.8 11.988 8.8 20.78 11.2l-3.197 4z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/link.svg b/fuintAdmin_zt/src/assets/icons/svg/link.svg
deleted file mode 100644
index 48197ba4d..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.625 127.937H.063V12.375h57.781v12.374H12.438v90.813h90.813V70.156h12.374z"/><path d="M116.426 2.821l8.753 8.753-56.734 56.734-8.753-8.745z"/><path d="M127.893 37.982h-12.375V12.375H88.706V0h39.187z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/list.svg b/fuintAdmin_zt/src/assets/icons/svg/list.svg
deleted file mode 100644
index 20259eddb..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.585 12.087c0 6.616 3.974 11.98 8.877 11.98 4.902 0 8.877-5.364 8.877-11.98 0-6.616-3.975-11.98-8.877-11.98-4.903 0-8.877 5.364-8.877 11.98zM125.86.107H35.613c-1.268 0-2.114 1.426-2.114 2.852v18.255c0 1.712 1.057 2.853 2.114 2.853h90.247c1.268 0 2.114-1.426 2.114-2.853V2.96c0-1.711-1.057-2.852-2.114-2.852zM.106 62.86c0 6.615 3.974 11.979 8.876 11.979 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zM124.17 50.88H33.921c-1.268 0-2.114 1.425-2.114 2.851v18.256c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852V53.73c0-1.426-.846-2.852-2.114-2.852zM.106 115.913c0 6.616 3.974 11.98 8.876 11.98 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zm124.064-11.98H33.921c-1.268 0-2.114 1.426-2.114 2.853v18.255c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852v-18.255c0-1.427-.846-2.853-2.114-2.853z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/lock.svg b/fuintAdmin_zt/src/assets/icons/svg/lock.svg
deleted file mode 100644
index 74fee543d..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M119.88 49.674h-7.987V39.52C111.893 17.738 90.45.08 63.996.08 37.543.08 16.1 17.738 16.1 39.52v10.154H8.113c-4.408 0-7.987 2.94-7.987 6.577v65.13c0 3.637 3.57 6.577 7.987 6.577H119.88c4.407 0 7.987-2.94 7.987-6.577v-65.13c-.008-3.636-3.58-6.577-7.987-6.577zm-23.953 0H32.065V39.52c0-14.524 14.301-26.295 31.931-26.295 17.63 0 31.932 11.777 31.932 26.295v10.153z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/log.svg b/fuintAdmin_zt/src/assets/icons/svg/log.svg
deleted file mode 100644
index d879d33b6..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/log.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035943711" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4805" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M208.736 566.336H64.384v59.328h144.352v-59.328z m0-336.096H165.44V74.592c0-7.968 4.896-14.848 10.464-14.848h502.016V0.448H175.936c-38.72 1.248-69.248 34.368-68.192 74.144v155.648H64.384V289.6h144.352V230.24z m0 168.096H64.384v59.328h144.352v-59.328z m714.656 76.576h-57.76v474.496c0 7.936-4.896 14.848-10.464 14.848H175.936c-5.568 0-10.464-6.912-10.464-14.848v-155.68h43.296v-59.296H64.384v59.296h43.328v155.68c-1.024 39.776 29.472 72.896 68.192 74.144h679.232c38.72-1.184 69.248-34.368 68.256-74.144V474.912z m14.944-290.336l-83.072-85.312a71.264 71.264 0 0 0-52.544-21.728 71.52 71.52 0 0 0-51.616 23.872L386.528 507.264a30.496 30.496 0 0 0-6.176 10.72L308.16 740.512a30.016 30.016 0 0 0 6.976 30.24c7.712 7.968 19.2 10.752 29.568 7.2l216.544-74.112a28.736 28.736 0 0 0 12.128-7.936L940.448 287.456a75.552 75.552 0 0 0-2.112-102.88z m-557.12 518.272l39.104-120.64 78.336 80.416-117.44 40.224z m170.048-70.016l-103.552-106.016 200.16-222.4 103.52 106.304-200.128 222.112zM897.952 247.072l-0.256 0.224-107.136 119.168-103.52-106.528 106.432-118.624a14.144 14.144 0 0 1 10.304-4.736 13.44 13.44 0 0 1 10.464 4.288l83.264 85.696c5.472 5.6 5.664 14.72 0.448 20.512z" p-id="4806"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/logininfor.svg b/fuintAdmin_zt/src/assets/icons/svg/logininfor.svg
deleted file mode 100644
index 267f84474..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/logininfor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036016814" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5261" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 128h-85.333333a42.666667 42.666667 0 0 0 0 85.333333h42.666666v640H170.666667V213.333333h42.666666a42.666667 42.666667 0 0 0 0-85.333333H128a42.666667 42.666667 0 0 0-42.666667 42.666667v725.333333a42.666667 42.666667 0 0 0 42.666667 42.666667h768a42.666667 42.666667 0 0 0 42.666667-42.666667V170.666667a42.666667 42.666667 0 0 0-42.666667-42.666667z" p-id="5262"></path><path d="M341.333333 298.666667a42.666667 42.666667 0 0 0 42.666667-42.666667V128a42.666667 42.666667 0 0 0-85.333333 0v128a42.666667 42.666667 0 0 0 42.666666 42.666667zM512 298.666667a42.666667 42.666667 0 0 0 42.666667-42.666667V128a42.666667 42.666667 0 0 0-85.333334 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667zM682.666667 298.666667a42.666667 42.666667 0 0 0 42.666666-42.666667V128a42.666667 42.666667 0 0 0-85.333333 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667zM341.333333 768a42.666667 42.666667 0 0 0 42.666667-42.666667 128 128 0 0 1 256 0 42.666667 42.666667 0 0 0 85.333333 0 213.333333 213.333333 0 0 0-107.52-184.32A128 128 0 0 0 640 469.333333a128 128 0 0 0-256 0 128 128 0 0 0 22.186667 71.68A213.333333 213.333333 0 0 0 298.666667 725.333333a42.666667 42.666667 0 0 0 42.666666 42.666667z m128-298.666667a42.666667 42.666667 0 1 1 42.666667 42.666667 42.666667 42.666667 0 0 1-42.666667-42.666667z" p-id="5263"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/message.svg b/fuintAdmin_zt/src/assets/icons/svg/message.svg
deleted file mode 100644
index 14ca81728..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/message.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 20.967v59.59c0 11.59 8.537 20.966 19.075 20.966h28.613l1 26.477L76.8 101.523h32.125c10.538 0 19.075-9.377 19.075-20.966v-59.59C128 9.377 119.463 0 108.925 0h-89.85C8.538 0 0 9.377 0 20.967zm82.325 33.1c0-5.524 4.013-9.935 9.037-9.935 5.026 0 9.038 4.41 9.038 9.934 0 5.524-4.025 9.934-9.038 9.934-5.024 0-9.037-4.41-9.037-9.934zm-27.613 0c0-5.524 4.013-9.935 9.038-9.935s9.037 4.41 9.037 9.934c0 5.524-4.025 9.934-9.037 9.934-5.025 0-9.038-4.41-9.038-9.934zm-27.1 0c0-5.524 4.013-9.935 9.038-9.935s9.038 4.41 9.038 9.934c0 5.524-4.026 9.934-9.05 9.934-5.013 0-9.025-4.41-9.025-9.934z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/money.svg b/fuintAdmin_zt/src/assets/icons/svg/money.svg
deleted file mode 100644
index c1580de10..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/money.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.122 127.892v-28.68H7.513V87.274h46.609v-12.4H7.513v-12.86h38.003L.099 0h22.6l32.556 45.07c3.617 5.144 6.44 9.611 8.487 13.385 1.788-3.05 4.89-7.779 9.301-14.186L103.93 0h24.01L82.385 62.013h38.34v12.862h-46.41v12.4h46.41v11.937h-46.41v28.68H54.123z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/monitor.svg b/fuintAdmin_zt/src/assets/icons/svg/monitor.svg
deleted file mode 100644
index bc308cb0f..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/monitor.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827393750" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4695" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
-</style></defs><path d="M64 64V640H896V64H64zM0 0h960v704H0V0z" p-id="4696"></path><path d="M192 896H768v64H192zM448 640H512v256h-64z" p-id="4697"></path><path d="M479.232 561.604267l309.9904-348.330667-47.803733-42.5472-259.566934 291.669333L303.957333 240.008533 163.208533 438.6048l52.224 37.009067 91.6224-129.28z" p-id="4698"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/nested.svg b/fuintAdmin_zt/src/assets/icons/svg/nested.svg
deleted file mode 100644
index 06713a86c..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/nested.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.002 9.2c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-5.043-3.58-9.132-7.997-9.132S.002 4.157.002 9.2zM31.997.066h95.981V18.33H31.997V.066zm0 45.669c0 5.044 3.58 9.132 7.998 9.132 4.417 0 7.997-4.088 7.997-9.132 0-3.263-1.524-6.278-3.998-7.91-2.475-1.63-5.524-1.63-7.998 0-2.475 1.632-4 4.647-4 7.91zM63.992 36.6h63.986v18.265H63.992V36.6zm-31.995 82.2c0 5.043 3.58 9.132 7.998 9.132 4.417 0 7.997-4.089 7.997-9.132 0-5.044-3.58-9.133-7.997-9.133s-7.998 4.089-7.998 9.133zm31.995-9.131h63.986v18.265H63.992V109.67zm0-27.404c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-3.263-1.524-6.277-3.998-7.909-2.475-1.631-5.524-1.631-7.998 0-2.475 1.632-4 4.646-4 7.91zm31.995-9.13h31.991V91.4H95.987V73.135z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/number.svg b/fuintAdmin_zt/src/assets/icons/svg/number.svg
deleted file mode 100644
index ad5ce9af2..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/number.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802851180" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2867" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M279.272727 791.272727h512a46.545455 46.545455 0 0 1 0 93.090909H279.272727a46.545455 46.545455 0 0 1 0-93.090909z m33.838546-617.984V651.636364H193.722182V395.170909c0-37.003636-0.884364-59.298909-2.653091-66.746182a24.948364 24.948364 0 0 0-14.615273-16.989091c-8.005818-3.863273-25.786182-5.771636-53.341091-5.771636h-11.822545v-55.854545c57.716364-12.381091 101.562182-37.888 131.490909-76.520728h70.283636z m303.709091 396.8V651.636364H354.164364v-68.235637c77.777455-127.255273 124.043636-206.010182 138.705454-236.218182 14.661818-30.254545 22.016-53.853091 22.016-70.74909 0-13.032727-2.234182-22.714182-6.656-29.137455-4.421818-6.376727-11.170909-9.588364-20.247273-9.588364a22.248727 22.248727 0 0 0-20.200727 10.612364c-4.468364 7.121455-6.656 21.178182-6.656 42.263273v45.521454H354.164364v-17.454545c0-26.763636 1.396364-47.941818 4.142545-63.348364 2.746182-15.499636 9.541818-30.72 20.386909-45.661091 10.798545-14.987636 24.901818-26.298182 42.216727-33.978182 17.361455-7.68 38.167273-11.543273 62.37091-11.543272 47.476364 0 83.316364 11.776 107.706181 35.328 24.296727 23.552 36.445091 53.341091 36.445091 89.367272 0 27.368727-6.842182 56.32-20.48 86.853819-13.730909 30.533818-54.039273 95.325091-121.018182 194.420363h130.885819z m270.615272-189.393454c18.152727 6.097455 31.650909 16.104727 40.494546 29.975272 8.843636 13.917091 13.312 46.452364 13.312 97.652364 0 38.027636-4.328727 67.490909-13.032727 88.529455-8.657455 20.945455-23.598545 36.910545-44.869819 47.848727-21.271273 10.938182-48.593455 16.384-81.873454 16.384-37.794909 0-67.490909-6.330182-89.088-19.083636-21.550545-12.660364-35.746909-28.253091-42.542546-46.638546-6.795636-18.432-10.193455-50.362182-10.193454-95.883636v-37.841455h119.389091v77.730909c0 20.666182 1.210182 33.838545 3.723636 39.424 2.420364 5.585455 7.912727 8.424727 16.337455 8.424728 9.309091 0 15.36-3.537455 18.338909-10.612364 2.932364-7.121455 4.421818-25.6 4.421818-55.575273v-33.047273c0-18.338909-2.048-31.744-6.190546-40.215272a30.72 30.72 0 0 0-18.338909-16.709818c-8.052364-2.653091-23.738182-4.189091-46.964363-4.561455V357.050182c28.392727 0 45.893818-1.070545 52.596363-3.258182a22.946909 22.946909 0 0 0 14.475637-14.149818c2.932364-7.307636 4.421818-18.711273 4.421818-34.257455v-26.624c0-16.756364-1.722182-27.741091-5.12-33.047272-3.490909-5.352727-8.843636-8.005818-16.151273-8.005819-8.285091 0-13.963636 2.792727-16.989091 8.378182-3.025455 5.632-4.561455 17.640727-4.561454 35.933091v39.284364h-119.389091v-40.773818c0-45.661091 10.472727-76.567273 31.325091-92.625455 20.898909-16.058182 54.085818-24.064 99.607272-24.064 56.878545 0 95.511273 11.170909 115.805091 33.373091 20.293818 22.248727 30.394182 53.201455 30.394182 92.765091 0 26.810182-3.630545 46.173091-10.891636 58.088727-7.307636 11.915636-20.107636 22.807273-38.446546 32.628364z" p-id="2868"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/online.svg b/fuintAdmin_zt/src/assets/icons/svg/online.svg
deleted file mode 100644
index 330a20293..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/online.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568899557259" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="535" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M356.246145 681.56286c-68.156286-41.949414-107.246583-103.84102-107.246583-169.805384 0-65.966411 39.090297-127.860063 107.246583-169.809477 12.046361-7.414877 15.800871-23.190165 8.385994-35.236526-7.413853-12.046361-23.191188-15.801894-35.236526-8.387018-39.640836 24.399713-72.539106 56.044434-95.137801 91.515297-23.86657 37.461193-36.481889 79.620385-36.481889 121.917724 0 42.297338 12.615319 84.454484 36.481889 121.914654 22.598694 35.469839 55.496965 67.11456 95.137801 91.51325 4.185322 2.576685 8.821923 3.804652 13.400195 3.804652 8.598842 0 16.998139-4.329609 21.836331-12.190647C372.047016 704.752002 368.291482 688.976714 356.246145 681.56286zM263.943926 754.580874c-92.603071-61.111846-145.713686-149.623739-145.713686-242.840794 0-93.195565 53.094242-181.682899 145.667637-242.774279 11.805884-7.79043 15.061021-23.677259 7.269567-35.483142-7.79043-11.805884-23.677259-15.062044-35.483142-7.269567C128.487861 296.954249 67.006602 401.024489 67.006602 511.74008c0 110.73708 61.496609 214.830857 168.721703 285.593504 4.343935 2.867304 9.240455 4.238534 14.08274 4.238534 8.317433 0 16.476253-4.046153 21.400403-11.507078C279.003923 778.258133 275.748786 762.372328 263.943926 754.580874zM788.660552 226.213092c-11.80486-7.791453-27.692712-4.536316-35.483142 7.269567-7.79043 11.805884-4.536316 27.692712 7.269567 35.483142 92.575442 61.092403 145.670707 149.579737 145.670707 242.774279 0 93.216032-53.111638 181.727924-145.715733 242.840794-11.805884 7.79043-15.059997 23.678282-7.269567 35.484166 4.925173 7.461949 13.081946 11.507078 21.400403 11.507078 4.841262 0 9.739828-1.37123 14.083763-4.238534 107.22714-70.761624 168.724773-174.857447 168.724773-285.593504C957.341323 401.025513 895.860063 296.955272 788.660552 226.213092zM790.090111 633.67213c23.865547-37.459147 36.480866-79.617315 36.480866-121.914654 0-42.298362-12.615319-84.45653-36.480866-121.917724-22.598694-35.470863-55.496965-67.115584-95.139847-91.515297-12.047384-7.413853-27.821649-3.659343-35.236526 8.387018-7.414877 12.045337-3.659343 27.821649 8.385994 35.236526 68.156286 41.949414 107.247606 103.842043 107.247606 169.809477 0 65.964364-39.090297 127.85597-107.247606 169.804361-12.045337 7.414877-15.800871 23.190165-8.385994 35.237549 4.838192 7.861038 13.236466 12.190647 21.835308 12.190647 4.579295 0 9.215896-1.227967 13.400195-3.804652C734.591099 700.786691 767.490394 669.142993 790.090111 633.67213zM567.129086 518.274914c24.12342-17.150612 39.887452-45.305859 39.887452-77.07133 0-52.128241-42.452881-94.538143-94.634334-94.538143-52.18043 0-94.633311 42.408879-94.633311 94.538143 0 31.695886 15.696494 59.797921 39.730886 76.958766-49.875944 21.128203-84.917018 70.234621-84.917018 127.301338 0 2.366907 0.061398 4.762467 0.182149 7.119141l1.249457 24.296359 276.373515 0 1.238201-24.308639c0.119727-2.358721 0.181125-4.750187 0.181125-7.106862C651.786185 588.497255 616.865861 539.465538 567.129086 518.274914zM512.381182 397.889079c23.937179 0 43.411719 19.430538 43.411719 43.314505 0 23.882943-19.47454 43.313481-43.411719 43.313481-23.936155 0-43.409672-19.430538-43.409672-43.313481C468.971509 417.320641 488.445026 397.889079 512.381182 397.889079zM426.08884 625.656573c9.119705-38.542828 44.254923-67.337641 86.085634-67.337641s76.966952 28.794813 86.085634 67.337641L426.08884 625.656573z" p-id="536"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/password.svg b/fuintAdmin_zt/src/assets/icons/svg/password.svg
deleted file mode 100644
index 6c64defe3..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/password.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802846045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2750" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M868.593046 403.832442c-30.081109-28.844955-70.037123-44.753273-112.624057-44.753273L265.949606 359.079168c-42.554188 0-82.510202 15.908318-112.469538 44.690852-30.236652 28.782533-46.857191 67.222007-46.857191 108.198258l0 294.079782c0 40.977273 16.619516 79.414701 46.702672 108.136859 29.959336 28.844955 70.069869 44.814672 112.624057 44.814672l490.019383 0c42.585911 0 82.696444-15.969717 112.624057-44.814672 30.082132-28.844955 46.579875-67.222007 46.579875-108.136859L915.172921 511.968278C915.171897 471.053426 898.675178 432.677397 868.593046 403.832442zM841.821309 806.049083c0 22.098297-8.882298 42.772152-25.099654 58.306964-16.154935 15.661701-37.81935 24.203238-60.752666 24.203238L265.949606 888.559285c-22.934339 0-44.567032-8.54256-60.877509-24.264637-16.186657-15.474436-25.067932-36.148291-25.067932-58.246589L180.004165 511.968278c0-22.035876 8.881274-42.772152 25.192775-58.307987 16.186657-15.536858 37.81935-24.139793 60.753689-24.139793l490.019383 0c22.933315 0 44.597731 8.602935 60.752666 24.139793 16.21838 15.535835 25.099654 36.272112 25.099654 58.307987L841.822332 806.049083zM510.974136 135.440715c114.914216 0 208.318536 89.75214 208.318536 200.055338l73.350588 0c0-149.113109-126.366036-270.496667-281.669124-270.496667-155.333788 0-281.699824 121.383558-281.699824 270.496667l73.350588 0C302.623877 225.193879 396.059919 135.440715 510.974136 135.440715zM474.299865 747.244792l73.350588 0L547.650453 629.576859l-73.350588 0L474.299865 747.244792z" p-id="2751"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/pdf.svg b/fuintAdmin_zt/src/assets/icons/svg/pdf.svg
deleted file mode 100644
index 957aa0cc3..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/pdf.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path d="M869.073 277.307H657.111V65.344l211.962 211.963zm-238.232 26.27V65.344l-476.498-.054v416.957h714.73v-178.67H630.841zm-335.836 360.57c-5.07-3.064-10.944-5.133-17.61-6.201-6.67-1.064-13.603-1.6-20.81-1.6h-48.821v85.641h48.822c7.206 0 14.14-.532 20.81-1.6 6.665-1.065 12.54-3.133 17.609-6.202 5.064-3.063 9.134-7.406 12.208-13.007 3.065-5.602 4.6-12.937 4.6-22.011 0-9.07-1.535-16.408-4.6-22.01-3.074-5.603-7.144-9.94-12.208-13.01zM35.82 541.805v416.904h952.358V541.805H35.821zm331.421 191.179c-3.6 11.071-9.343 20.879-17.209 29.413-7.874 8.542-18.078 15.408-30.617 20.61-12.544 5.206-27.747 7.807-45.621 7.807h-66.036v102.45h-62.831V607.517h128.867c17.874 0 33.077 2.6 45.62 7.802 12.541 5.207 22.745 12.076 30.618 20.615 7.866 8.538 13.604 18.277 17.21 29.212 3.6 10.943 5.401 22.278 5.401 34.018 0 11.477-1.8 22.752-5.402 33.819zM644.9 806.417c-5.343 17.61-13.408 32.818-24.212 45.627-10.807 12.803-24.283 22.879-40.423 30.213-16.146 7.343-35.155 11.007-57.03 11.007h-123.26V607.518h123.26c18.41 0 35.552 2.941 51.428 8.808 15.873 5.869 29.618 14.671 41.22 26.412 11.608 11.744 20.674 26.411 27.217 44.02 6.535 17.61 9.803 38.288 9.803 62.035 0 20.81-2.67 40.02-8.003 57.624zm245.362-146.07h-138.07v66.03h119.66v48.829h-119.66v118.058h-62.83V607.518h200.9v52.829h-.001zm-318.2 25.611c-6.402-8.266-14.877-14.604-25.412-19.01-10.544-4.402-23.551-6.602-39.019-6.602h-44.825v180.088h56.029c9.07 0 17.872-1.463 26.415-4.401 8.535-2.932 16.14-7.802 22.812-14.609 6.665-6.8 12.007-15.667 16.007-26.61 4.003-10.94 6.003-24.275 6.003-40.021 0-14.408-1.4-27.416-4.202-39.019-2.8-11.607-7.406-21.542-13.808-29.816zm0 0"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/people.svg b/fuintAdmin_zt/src/assets/icons/svg/people.svg
deleted file mode 100644
index 2bd54aeb7..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/people.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M104.185 95.254c8.161 7.574 13.145 17.441 13.145 28.28 0 1.508-.098 2.998-.285 4.466h-10.784c.238-1.465.403-2.948.403-4.465 0-8.983-4.36-17.115-11.419-23.216C86 104.66 75.355 107.162 64 107.162c-11.344 0-21.98-2.495-31.22-6.83-7.064 6.099-11.444 14.218-11.444 23.203 0 1.517.165 3 .403 4.465H10.955a35.444 35.444 0 0 1-.285-4.465c0-10.838 4.974-20.713 13.127-28.291C9.294 85.42.003 70.417.003 53.58.003 23.99 28.656.001 64 .001s63.997 23.988 63.997 53.58c0 16.842-9.299 31.85-23.812 41.673zM64 36.867c-29.454 0-53.33-10.077-53.33 15.342 0 25.418 23.876 46.023 53.33 46.023 29.454 0 53.33-20.605 53.33-46.023 0-25.419-23.876-15.342-53.33-15.342zm24.888 25.644c-3.927 0-7.111-2.665-7.111-5.953 0-3.288 3.184-5.954 7.11-5.954 3.928 0 7.111 2.666 7.111 5.954s-3.183 5.953-7.11 5.953zm-3.556 16.372c0 4.11-9.55 7.442-21.332 7.442-11.781 0-21.332-3.332-21.332-7.442 0-1.06.656-2.064 1.8-2.976 3.295 2.626 10.79 4.465 19.532 4.465 8.743 0 16.237-1.84 19.531-4.465 1.145.912 1.801 1.916 1.801 2.976zm-46.22-16.372c-3.927 0-7.11-2.665-7.11-5.953 0-3.288 3.183-5.954 7.11-5.954 3.927 0 7.111 2.666 7.111 5.954s-3.184 5.953-7.11 5.953z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/peoples.svg b/fuintAdmin_zt/src/assets/icons/svg/peoples.svg
deleted file mode 100644
index aab852e52..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/peoples.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M95.648 118.762c0 5.035-3.563 9.121-7.979 9.121H7.98c-4.416 0-7.979-4.086-7.979-9.121C0 100.519 15.408 83.47 31.152 76.75c-9.099-6.43-15.216-17.863-15.216-30.987v-9.128c0-20.16 14.293-36.518 31.893-36.518s31.894 16.358 31.894 36.518v9.122c0 13.137-6.123 24.556-15.216 30.993 15.738 6.726 31.141 23.769 31.141 42.012z"/><path d="M106.032 118.252h15.867c3.376 0 6.101-3.125 6.101-6.972 0-13.957-11.787-26.984-23.819-32.123 6.955-4.919 11.638-13.66 11.638-23.704v-6.985c0-15.416-10.928-27.926-24.39-27.926-1.674 0-3.306.193-4.89.561 1.936 4.713 3.018 9.974 3.018 15.526v9.121c0 13.137-3.056 23.111-11.066 30.993 14.842 4.41 27.312 23.42 27.541 41.509z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/phone.svg b/fuintAdmin_zt/src/assets/icons/svg/phone.svg
deleted file mode 100644
index ab8e8c4e5..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/phone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1567417214476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2266" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M761.503029 2.90619 242.121921 2.90619c-32.405037 0-58.932204 26.060539-58.932204 58.527998l0 902.302287c0 32.156374 26.217105 58.216913 58.932204 58.216913l519.381108 0c32.344662 0 58.591443-26.060539 58.591443-58.216913L820.094472 61.123103C820.094472 28.966729 793.847691 2.90619 761.503029 2.90619M452.878996 61.123103l98.147344 0c6.780427 0 12.31549 5.536087 12.31549 12.253068 0 6.748704-5.535063 12.253068-12.31549 12.253068l-98.147344 0c-6.779404 0-12.345166-5.504364-12.345166-12.253068C440.532807 66.659189 446.099592 61.123103 452.878996 61.123103M501.641583 980.593398c-29.636994 0-53.987588-23.946388-53.987588-53.677527 0-29.356608 24.039509-53.614082 53.987588-53.614082 29.91738 0 53.987588 23.883967 53.987588 53.614082C555.629171 956.647009 531.559986 980.593398 501.641583 980.593398M766.35657 803.142893c0 16.23373-13.186324 29.107945-29.233811 29.107945l-470.618521 0c-16.35755 0-29.325909-13.186324-29.325909-29.107945L237.178329 163.500794c0-16.232706 13.279445-29.138644 29.325909-29.138644l470.246037 0c16.420995 0 29.357632 13.1853 29.357632 29.138644l0 639.642099L766.35657 803.142893zM766.35657 803.142893" p-id="2267"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/post.svg b/fuintAdmin_zt/src/assets/icons/svg/post.svg
deleted file mode 100644
index 2922c613b..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/post.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035724641" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3998" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M136.4 434.3h77.7c21.5 0 38.9-17.4 38.9-38.9s-17.4-38.9-38.9-38.9h-77.7c-21.5 0-38.9 17.4-38.9 38.9s17.4 38.9 38.9 38.9zM252.9 628.6c0-21.5-17.4-38.9-38.9-38.9h-77.7c-21.5 0-38.9 17.4-38.9 38.9s17.4 38.9 38.9 38.9H214c21.5-0.1 38.9-17.5 38.9-38.9z" p-id="3999"></path><path d="M874.7 97.5H227c-28.6 0-51.8 23.2-51.8 51.8v194.3h38.9c28.6 0 51.8 23.2 51.8 51.8 0 28.6-23.2 51.8-51.8 51.8h-38.9v129.5h38.9c28.6 0 51.8 23.2 51.8 51.8 0 28.6-23.2 51.8-51.8 51.8h-38.9v194.3c0 28.6 23.2 51.8 51.8 51.8h647.7c28.6 0 51.8-23.2 51.8-51.8V149.3c0-28.6-23.2-51.8-51.8-51.8z m-311.3 723c-15.6 0-146.7-71.6-146.7-91 0-19.4 102-368.6 102-368.6l-83.6-104s-12.3-23.1 24.6-23.1h208.9c36.9 0 18.4 23.1 18.4 23.1l-79 104s102 351.3 102 368.6c0.1 17.3-131 91-146.6 91z m169.2-253.6l-27.9 40.2-74.5-240 103.4 171.7c4.6 7.9 4.2 20.6-1 28.1z" p-id="4000"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/qq.svg b/fuintAdmin_zt/src/assets/icons/svg/qq.svg
deleted file mode 100644
index ee13d4ec2..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/qq.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M18.448 57.545l-.244-.744-.198-.968-.132-.53v-2.181l.236-.859.24-.908.317-.953.428-1.06.561-1.103.794-1.104v-.773l.077-.724.123-.984.34-1.106.313-1.194.25-.548.289-.511.371-.569.405-.423v-2.73l.234-1.407.236-1.633.42-1.955.577-2.035.43-1.118.426-1.217.468-1.135.559-1.216.57-1.332.655-1.247.737-1.331.929-1.33.43-.762.457-.624.995-1.406 1.025-1.403 1.163-1.444 1.246-1.405 1.352-1.384 1.41-1.423 1.708-1.536 1.083-.934 1.322-1.008 1.34-.89 1.448-.855 1.392-.76 1.57-.63 1.667-.775 1.657-.532 1.653-.552 1.787-.548 1.785-.417 1.876-.347L59.128.68l1.879-.245 1.876-.252 2.002-.106h5.912l1.97.243 1.981.231 2.019.207 1.874.441 1.979.413 1.857.475 2.035.53 1.862.646 1.782.738 1.904.78 1.736.853 1.689.95 1.655 1.044 1.425.971.662.548.693.401 1.323 1.1 1.115 1.064 1.112 1.1 1.083 1.214.894 1.178 1.064 1.217.74 1.306.752 1.162.798 1.352.661 1.175 1.113 2.489.546 1.286.428 1.192.428 1.294.384 1.217.267 1.047.347 1.231.607 2.198.388 1.924.253 1.861.217 1.497.342 2.28.077.362.274.41.737 1.18.473.8.42.832.534.892.472 1.07.307 1.093.334 1.2.252 1.232.115.605.106.746v.648l-.106.643v.8l-.192.774-.35 1.5-.403.76-.299.852v.213l.142.264.4.623 1.746 2.53 1.377 1.9.66 1.267.889 1.389.774 1.52.893 1.627.894 1.828 1.006 2.069.567 1.268.518 1.239.447 1.307.44 1.175.336 1.235.342 1.16.432 2.261.343 2.31.235 2.05v2.891l-.158 1.025-.226 1.768-.308 1.59-.48 1.44-.18.588-.336.707-.28.493-.375.607-.33.383-.42.494-.375.4-.401.34-.48.207-.432.207-.355.114h-.543l-.346-.114-.66-.32-.302-.212-.317-.223-.347-.304-.35-.342-.579-.63-.684-.89-.539-.917-.538-.734-.526-.855-.741-1.517-.833-1.579-.098-.055h-.138l-.338.247-.196.415-.326.516-.567 1.533-.856 2.182-1.096 2.626-.824 1.308-.864 1.366-1.027 1.536-1.09 1.503-.557.68-.676.743-1.555 1.497.136.135.21.214.777.446 3.235 1.524 1.41.779 1.347.756 1.332.953 1.187.982.574.443.432.511.445.593.367.643.198.533.242.64.105.554.115.647-.115.433v.44l-.105.454-.242.415-.092.325-.22.394-.587.784-.543.627-.42.47-.35.348-.893.638-1.01.556-1.077.532-1.155.511-1.287.495-.693.207-.608.167-1.496.342-1.545.325-1.552.323-1.689.27-1.74.072-1.785.21h-5.539l-1.998-.114-1.86-.168-2.005-.27-1.99-.209-2.095-.286-2.03-.495-1.981-.374-1.968-.552-2.019-.707-1.98-.585-1.044-.342-.927-.323-.586-.223-.582-.12h-1.647l-1.904-.131-.962-.096-1.24-.135-.795.705-1.085.665-1.471.701-1.628.875-.99.475-1.033.376-2.281.914-1.24.305-1.3.343-1.803.344-1.13.086-1.193.1-1.246.135-1.45.053h-5.926l-3.346-.053-3.25-.321-1.644-.23-1.589-.23-1.546-.227-1.547-.305-1.442-.456-1.434-.325-1.294-.51-1.223-.474-1.142-.533-.99-.583-.984-.71-.336-.343-.44-.415-.334-.362-.3-.417-.278-.415-.215-.42-.311-.89-.109-.46-.138-.51v-.473l.138-.533v-.53l.109-.53v-1.069l.052-.564.259-.647.215-.646.39-.779.286-.3.236-.348.615-.738.49-.38.464-.266.428-.338.676-.21.543-.324.676-.341.77-.227.775-.231.897-.192.85-.11 1.008-.13 1.093-.081.284-.092h.063l.137-.115v-.13l-.2-.266-.58-.27-1.45-1.231-.975-.761-1.127-.967-1.136-1.082-1.181-1.382-1.36-1.558-.508-.843-.672-.87-.58-1.007-.522-1.1-.704-1.047-.459-1.194-.547-1.192-.546-1.33-.397-1.273-.378-1.575-.112-.057h-.115l-.059-.113h-.14l-.23.113-.114.057-.158.264-.057.321-.119.286-.206.477-.664 1.157-.345.701-.546.612-.58.736-.641.816-.677.724-.795.701-.734.658-.814.524-.89.546-.855.325-1.008.247-.99.095h-.233l-.228-.095-.18-.384-.29-.188-.38-.912-.237-.493-.255-.707-.21-.734-.113-.724-.313-1.648-.12-.972v-3.185l.12-2.379.196-1.214.23-1.252.21-1.347.374-1.254.42-1.443.431-1.407.578-1.448.545-1.38.754-1.4.699-1.52.855-1.425 1.006-1.538 1.023-1.382 1.069-1.538.891-1.071 1.142-1.227 1.202-1.237.56-.59.678-.662.985-.836 1.012-.853 1.647-1.446 1.242-.889z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/question.svg b/fuintAdmin_zt/src/assets/icons/svg/question.svg
deleted file mode 100644
index cf75bd4be..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/question.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1581238842264" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1409" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 0C229.233778 0 0 229.233778 0 512s229.233778 512 512 512 512-229.233778 512-512A512 512 0 0 0 512 0z m0 938.666667C276.366222 938.666667 85.333333 747.633778 85.333333 512 85.333333 276.366222 276.366222 85.333333 512 85.333333c235.633778 0 426.666667 191.032889 426.666667 426.666667a426.666667 426.666667 0 0 1-426.666667 426.666667z m0-717.653334a170.666667 170.666667 0 0 0-170.666667 170.666667 42.666667 42.666667 0 0 0 85.333334 0 85.333333 85.333333 0 1 1 85.333333 85.333333 42.666667 42.666667 0 0 0-42.666667 42.666667v111.36a42.666667 42.666667 0 0 0 85.333334 0v-74.24A170.666667 170.666667 0 0 0 512 221.013333z m-42.666667 542.293334a42.666667 42.666667 0 1 0 85.333334 0 42.666667 42.666667 0 0 0-85.333334 0z" p-id="1410"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/radio.svg b/fuintAdmin_zt/src/assets/icons/svg/radio.svg
deleted file mode 100644
index 0cde34521..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/radio.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575966775973" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="879" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M507.39346659 71.84873358c241.53533667 0 437.39770766 195.85422109 437.39770767 437.37442191 0 241.53766571-195.86237099 437.38955776-437.39770767 437.38955776-241.50040803 0-437.34997219-195.85189205-437.34997219-437.38955776C70.0434944 267.70295467 265.89189347 71.84873358 507.39346659 71.84873358L507.39346659 71.84873358zM507.39346659 282.81899805c-125.00686734 0-226.37039389 101.38914133-226.37039388 226.41813048 0 125.01268821 101.36352768 226.39717262 226.37039388 226.39717262 125.04295993 0 226.42395136-101.38448441 226.42395136-226.39717262C733.81625401 384.20813938 632.43642653 282.81899805 507.39346659 282.81899805L507.39346659 282.81899805zM507.39346659 120.78172615c-214.46664192 0-388.42047261 173.95150279-388.4204726 388.44026539 0 214.51204949 173.95499463 388.46122325 388.4204726 388.46122325 214.52369237 0 388.46005817-173.94800981 388.46005818-388.46122325C895.85236082 294.73322894 721.91715897 120.78172615 507.39346659 120.78172615z" p-id="880"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/rate.svg b/fuintAdmin_zt/src/assets/icons/svg/rate.svg
deleted file mode 100644
index aa3b14d7d..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/rate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577246781606" class="icon" viewBox="0 0 1069 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1098" xmlns:xlink="http://www.w3.org/1999/xlink" width="84.5595703125" height="81"><defs><style type="text/css"></style></defs><path d="M633.72929961 378.02038203l9.49872568 18.68789795 20.78025469 2.79745225 206.61592412 27.33248408a11.46496817 11.46496817 0 0 1 6.6095543 19.47324902l-147.2675168 147.35350284-14.89299345 14.89299345 3.8006376 20.68280244 37.84585956 204.89044571a11.46496817 11.46496817 0 0 1-16.4808914 12.2961788L554.68980898 751.84713388l-18.68789794-9.49299345-18.48726123 9.99171915-183.23885392 99.34968163a11.46496817 11.46496817 0 0 1-16.78471347-11.8662416l32.5433127-205.79617881 3.29617793-20.78598692-15.19108243-14.49172002-151.03375839-143.48407587a11.46496817 11.46496817 0 0 1 6.09936328-19.63949062l205.79617881-32.63503185 20.78598691-3.2961788L428.87898125 380.72038203 518.59235674 192.64331182a11.46496817 11.46496817 0 0 1 20.56815264-0.26369385l94.56879023 185.63503183zM496.64840732 85.52038203l-121.75796162 254.98089229L95.76433145 384.76178369A34.3949045 34.3949045 0 0 0 77.46050938 443.66879023l204.87324901 194.66369385-44.16879023 279.1146498a34.3949045 34.3949045 0 0 0 50.36560489 35.61592325l248.4-134.67898038 251.84522285 128.27579591a34.3949045 34.3949045 0 0 0 49.43694287-36.89426777l-51.30573223-277.85350284 199.73120977-199.90891758a34.3949045 34.3949045 0 0 0-19.82866201-58.40827998l-280.11783428-37.03184736L558.32993633 84.71210205a34.3949045 34.3949045 0 0 0-61.68152901 0.80254775z" p-id="1099"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/redis.svg b/fuintAdmin_zt/src/assets/icons/svg/redis.svg
deleted file mode 100644
index 2f1d62dfc..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/redis.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1605865043777" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="856" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1023.786667 611.84c-0.426667 9.770667-13.354667 20.693333-39.893334 34.56-54.613333 28.458667-337.749333 144.896-397.994666 176.298667-60.288 31.402667-93.738667 31.104-141.354667 8.32-47.616-22.741333-348.842667-144.469333-403.114667-170.368-27.093333-12.970667-40.917333-23.893333-41.386666-34.218667v103.509333c0 10.325333 14.250667 21.290667 41.386666 34.261334 54.272 25.941333 355.541333 147.626667 403.114667 170.368 47.616 22.784 81.066667 23.082667 141.354667-8.362667 60.245333-31.402667 343.338667-147.797333 397.994666-176.298667 27.776-14.464 40.106667-25.728 40.106667-35.925333v-102.058667l-0.213333-0.085333z m0-168.746667c-0.512 9.770667-13.397333 20.650667-39.893334 34.517334-54.613333 28.458667-337.749333 144.896-397.994666 176.298666-60.288 31.402667-93.738667 31.104-141.354667 8.362667-47.616-22.741333-348.842667-144.469333-403.114667-170.410667-27.093333-12.928-40.917333-23.893333-41.386666-34.176v103.509334c0 10.325333 14.250667 21.248 41.386666 34.218666 54.272 25.941333 355.498667 147.626667 403.114667 170.368 47.616 22.784 81.066667 23.082667 141.354667-8.32 60.245333-31.402667 343.338667-147.84 397.994666-176.298666 27.776-14.506667 40.106667-25.770667 40.106667-35.968v-102.058667l-0.256-0.042667z m0-175.018666c0.469333-10.410667-13.141333-19.541333-40.533334-29.610667-53.248-19.498667-334.634667-131.498667-388.522666-151.253333-53.888-19.712-75.818667-18.901333-139.093334 3.84C392.234667 113.706667 92.629333 231.253333 39.338667 252.074667c-26.666667 10.496-39.68 20.181333-39.253334 30.506666V386.133333c0 10.325333 14.250667 21.248 41.386667 34.218667 54.272 25.941333 355.498667 147.669333 403.114667 170.410667 47.616 22.741333 81.066667 23.04 141.354666-8.362667 60.245333-31.402667 343.338667-147.84 397.994667-176.298667 27.776-14.506667 40.106667-25.770667 40.106667-35.968V268.074667h-0.341334zM366.677333 366.08l237.269334-36.437333-71.68 105.088-165.546667-68.650667z m524.8-94.634667l-140.330666 55.466667-15.232 5.973333-140.245334-55.466666 155.392-61.44 140.373334 55.466666z m-411.989333-101.674666l-22.954667-42.325334 71.594667 27.989334 67.498667-22.101334-18.261334 43.733334 68.778667 25.770666-88.704 9.216-19.882667 47.786667-32.085333-53.290667-102.4-9.216 76.416-27.562666z m-176.768 59.733333c70.058667 0 126.805333 21.973333 126.805333 49.109333s-56.746667 49.152-126.805333 49.152-126.848-22.058667-126.848-49.152c0-27.136 56.789333-49.152 126.848-49.152z" p-id="857"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/row.svg b/fuintAdmin_zt/src/assets/icons/svg/row.svg
deleted file mode 100644
index 078099222..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/row.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579339929870" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1182" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M152 854.856875h325.7146875V237.715625H134.856875v600q0 6.99375 5.0746875 12.0684375T152 854.856875z m737.143125-17.1421875v-600H546.284375v617.1421875H872q6.99375 0 12.0684375-5.07375t5.0746875-12.0684375z m68.5715625-651.429375V837.715625q0 35.3821875-25.16625 60.5484375T872 923.4284375H152q-35.383125 0-60.5484375-25.1653125T66.284375 837.7146875V186.284375q0-35.3821875 25.16625-60.5484375T152 100.5715625h720q35.383125 0 60.5484375 25.1653125t25.16625 60.5484375z" p-id="1183"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/search.svg b/fuintAdmin_zt/src/assets/icons/svg/search.svg
deleted file mode 100644
index 84233ddaa..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M124.884 109.812L94.256 79.166c-.357-.357-.757-.629-1.129-.914a50.366 50.366 0 0 0 8.186-27.59C101.327 22.689 78.656 0 50.67 0 22.685 0 0 22.688 0 50.663c0 27.989 22.685 50.663 50.656 50.663 10.186 0 19.643-3.03 27.6-8.201.286.385.557.771.9 1.114l30.628 30.632a10.633 10.633 0 0 0 7.543 3.129c2.728 0 5.457-1.043 7.543-3.115 4.171-4.157 4.171-10.915.014-15.073M50.671 85.338C31.557 85.338 16 69.78 16 50.663c0-19.102 15.557-34.661 34.67-34.661 19.115 0 34.657 15.559 34.657 34.675 0 19.102-15.557 34.661-34.656 34.661"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/select.svg b/fuintAdmin_zt/src/assets/icons/svg/select.svg
deleted file mode 100644
index d6283828b..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/select.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575803481213" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="804" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M62 511.97954521C62 263.86590869 263.90681826 62 511.97954521 62s449.97954521 201.825 449.97954521 449.97954521c0 248.19545479-201.90681826 449.97954521-449.97954521 449.97954521C263.90681826 962 62 760.175 62 511.97954521M901.98636348 511.97954521c0-215.24318174-175.00909131-390.41590869-390.00681827-390.41590869-215.03863652 0-389.96590869 175.17272695-389.96590868 390.41590869 0 215.28409131 175.00909131 390.45681826 389.96590868 390.45681826C727.01818174 902.47727305 901.98636348 727.30454521 901.98636348 511.97954521M264.17272695 430.28409131c0-5.76818174 2.12727305-11.51590869 6.64772696-15.87272696 8.71363652-8.75454521 22.88863652-8.75454521 31.725 0l209.4340913 208.22727305L721.45454521 414.53409131c8.75454521-8.71363652 22.97045479-8.71363652 31.90909132 0 8.71363652 8.75454521 8.71363652 22.88863652 0 31.60227304L511.97954521 685.74090869 270.71818174 446.01363653C266.27954521 441.77954521 264.17272695 436.05227305 264.17272695 430.28409131" p-id="805"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/server.svg b/fuintAdmin_zt/src/assets/icons/svg/server.svg
deleted file mode 100644
index ca37b001e..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/server.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1547360688278" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6717" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M890 120H134a70 70 0 0 0-70 70v500a70 70 0 0 0 70 70h756a70 70 0 0 0 70-70V190a70 70 0 0 0-70-70z m-10 520a40 40 0 0 1-40 40H712V448a40 40 0 0 0-80 0v232h-80V368a40 40 0 0 0-80 0v312h-80V512a40 40 0 0 0-80 0v168H184a40 40 0 0 1-40-40V240a40 40 0 0 1 40-40h656a40 40 0 0 1 40 40zM696 824H328a40 40 0 0 0 0 80h368a40 40 0 0 0 0-80z" fill="#bfbfbf" p-id="6718"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/shopping.svg b/fuintAdmin_zt/src/assets/icons/svg/shopping.svg
deleted file mode 100644
index 87513e7c5..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/shopping.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M42.913 101.36c1.642 0 3.198.332 4.667.996a12.28 12.28 0 0 1 3.89 2.772c1.123 1.184 1.987 2.582 2.592 4.193.605 1.612.908 3.318.908 5.118 0 1.8-.303 3.507-.908 5.118-.605 1.611-1.469 3.01-2.593 4.194a13.3 13.3 0 0 1-3.889 2.843 10.582 10.582 0 0 1-4.667 1.066c-1.729 0-3.306-.355-4.732-1.066a13.604 13.604 0 0 1-3.825-2.843c-1.123-1.185-1.988-2.583-2.593-4.194a14.437 14.437 0 0 1-.907-5.118c0-1.8.302-3.506.907-5.118.605-1.61 1.47-3.009 2.593-4.193a12.515 12.515 0 0 1 3.825-2.772c1.426-.664 3.003-.996 4.732-.996zm53.932.285c1.643 0 3.22.331 4.733.995a11.386 11.386 0 0 1 3.889 2.772c1.08 1.185 1.945 2.583 2.593 4.194.648 1.61.972 3.317.972 5.118 0 1.8-.324 3.506-.972 5.117-.648 1.611-1.513 3.01-2.593 4.194a12.253 12.253 0 0 1-3.89 2.843 11 11 0 0 1-4.732 1.066 10.58 10.58 0 0 1-4.667-1.066 12.478 12.478 0 0 1-3.824-2.843c-1.08-1.185-1.945-2.583-2.593-4.194a13.581 13.581 0 0 1-.973-5.117c0-1.801.325-3.507.973-5.118.648-1.611 1.512-3.01 2.593-4.194a11.559 11.559 0 0 1 3.824-2.772 11.212 11.212 0 0 1 4.667-.995zm21.781-80.747c2.42 0 4.3.355 5.64 1.066 1.34.71 2.29 1.587 2.852 2.63a6.427 6.427 0 0 1 .778 3.34c-.044 1.185-.195 2.204-.454 3.057-.26.853-.8 2.606-1.62 5.26a589.268 589.268 0 0 1-2.788 8.743 1236.373 1236.373 0 0 0-3.047 9.453c-.994 3.128-1.75 5.592-2.269 7.393-1.123 3.79-2.55 6.42-4.278 7.89-1.728 1.469-3.846 2.203-6.352 2.203H39.023l1.945 12.795h65.342c4.148 0 6.223 1.943 6.223 5.828 0 1.896-.41 3.53-1.232 4.905-.821 1.374-2.442 2.061-4.862 2.061H38.505c-1.729 0-3.176-.426-4.343-1.28-1.167-.852-2.14-1.966-2.917-3.34a21.277 21.277 0 0 1-1.88-4.478 44.128 44.128 0 0 1-1.102-4.55c-.087-.568-.324-1.942-.713-4.122-.39-2.18-.865-4.904-1.426-8.174l-1.88-10.947c-.692-4.027-1.383-8.079-2.075-12.154-1.642-9.572-3.5-20.234-5.574-31.986H6.87c-1.296 0-2.377-.356-3.24-1.067a9.024 9.024 0 0 1-2.14-2.558 10.416 10.416 0 0 1-1.167-3.2C.108 8.53 0 7.488 0 6.54c0-1.896.583-3.46 1.75-4.69C2.917.615 4.494 0 6.482 0h13.095c1.728 0 3.111.284 4.148.853 1.037.569 1.858 1.28 2.463 2.132a8.548 8.548 0 0 1 1.297 2.701c.26.948.475 1.754.648 2.417.173.758.346 1.825.519 3.199.173 1.374.345 2.772.518 4.193.26 1.706.519 3.507.778 5.403h88.678z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/size.svg b/fuintAdmin_zt/src/assets/icons/svg/size.svg
deleted file mode 100644
index ddb25b8d5..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/size.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h54.796v18.286H36.531V128H18.265V73.143H0V54.857zm127.857-36.571H91.935V128H72.456V18.286H36.534V0h91.326l-.003 18.286z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/skill.svg b/fuintAdmin_zt/src/assets/icons/svg/skill.svg
deleted file mode 100644
index a3b731218..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/skill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M31.652 93.206h33.401c1.44 2.418 3.077 4.663 4.93 6.692h-38.33v-6.692zm0-10.586h28.914a44.8 44.8 0 0 1-1.264-6.688h-27.65v6.688zm0-17.27H59.39c.288-2.286.714-4.532 1.34-6.687H31.65v6.687h.003zm53.913 44.84v5.85c0 2.798-2.095 5.075-4.667 5.075h-70.07c-2.576 0-4.663-2.277-4.663-5.075V31.26l23.22-20.96v22.25H17.16v6.688h18.39V6.688h45.348c2.576 0 4.667 2.277 4.667 5.066v20.009c1.987-.675 4.053-1.128 6.17-1.445v-18.56C91.738 5.28 86.874 0 80.902 0H31.15L0 28.118v87.917c0 6.48 4.859 11.759 10.832 11.759h70.07c5.974 0 10.837-5.27 10.837-11.759v-4.41c-2.117-.312-4.183-.765-6.17-1.435h-.004zM23.279 58.667h-7.96v6.688h7.96v-6.688zm-7.956 41.23h7.96v-6.691h-7.96v6.692zm7.956-23.96h-7.96v6.687h7.96v-6.688zm89.718-15.042l-4.896-4.07-12.447 17.613-11.19-9.305-3.762 5.311 16.091 13.38 16.204-22.929zM128 70.978c0-18.632-13.97-33.782-31.147-33.782-17.168 0-31.135 15.155-31.135 33.782 0 18.628 13.97 33.783 31.135 33.783 17.172 0 31.143-15.15 31.143-33.783H128zm-6.17 0c0 14.933-11.203 27.1-24.981 27.1-13.77 0-24.987-12.158-24.987-27.1 0-14.941 11.195-27.099 24.987-27.099 13.778 0 24.982 12.158 24.982 27.1z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/slider.svg b/fuintAdmin_zt/src/assets/icons/svg/slider.svg
deleted file mode 100644
index fbe4f39f0..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/slider.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577185310368" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1238" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M951.453125 476.84375H523.671875a131.8359375 131.8359375 0 0 0-254.1796875 0H72.546875v70.3125h196.9453125a131.8359375 131.8359375 0 0 0 254.1796875 0H951.453125z" p-id="1239"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/star.svg b/fuintAdmin_zt/src/assets/icons/svg/star.svg
deleted file mode 100644
index 6cf86e66a..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M70.66 4.328l14.01 29.693c1.088 2.29 3.177 3.882 5.603 4.25l31.347 4.76c6.087.926 8.528 8.756 4.117 13.247L103.05 79.395c-1.75 1.78-2.544 4.352-2.132 6.867l5.352 32.641c1.043 6.337-5.33 11.182-10.778 8.19l-28.039-15.409a7.13 7.13 0 0 0-6.91 0l-28.039 15.41c-5.448 2.99-11.821-1.854-10.777-8.19l5.352-32.642c.415-2.515-.387-5.088-2.136-6.867L2.264 56.278C-2.146 51.787.286 43.957 6.38 43.031l31.343-4.76c2.419-.368 4.51-1.96 5.595-4.25L57.334 4.328c2.728-5.77 10.605-5.77 13.325 0z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/swagger.svg b/fuintAdmin_zt/src/assets/icons/svg/swagger.svg
deleted file mode 100644
index 05d4e7bce..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/swagger.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036776944" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6463" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M64 223.995345h168.001164v47.997673c0 26.428509 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.569164 41.984-47.997673v-47.997673h504.003491a32.004655 32.004655 0 0 0 0-64.009309H455.996509V111.988364c0-26.428509-18.878836-47.997673-41.984-47.997673H273.985164c-23.095855 0-41.984 21.569164-41.984 47.997673v47.997672H64a32.004655 32.004655 0 0 0 0 64.009309zM288.004655 128h111.997672V256H288.004655V128zM960 479.995345H791.998836v-47.997672c0-26.372655-18.878836-47.997673-41.984-47.997673H609.978182c-23.095855 0-41.984 21.634327-41.984 47.997673v47.997672H64a32.004655 32.004655 0 0 0 0 64.00931h504.003491v47.997672c0 26.363345 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.634327 41.984-47.997673v-47.997672h168.001164a32.004655 32.004655 0 1 0-0.009309-64.00931zM735.995345 576H623.997673v-128h111.997672v128zM960 800.293236v-0.288581H455.996509v-47.997673c0-26.363345-18.878836-47.997673-41.984-47.997673H274.050327c-23.105164 0-41.984 21.634327-41.984 47.997673v47.997673H64v0.288581a32.004655 32.004655 0 0 0 0 64.009309c0.986764 0 1.917673-0.195491 2.885818-0.288581h165.115346v47.997672c0 26.363345 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.634327 41.984-47.997673v-47.997672h501.108364c0.968145 0.093091 1.899055 0.288582 2.895127 0.288581a32.004655 32.004655 0 1 0-0.009309-64.009309zM400.002327 896H288.004655V768h111.997672v128z" fill="" p-id="6464"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/switch.svg b/fuintAdmin_zt/src/assets/icons/svg/switch.svg
deleted file mode 100644
index 0ba61e38d..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/switch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1576042673958" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1110" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M692 792H332c-150 0-270-120-270-270s120-270 270-270h360c150 0 270 120 270 270 0 147-120 270-270 270zM332 312c-117 0-210 93-210 210s93 210 210 210h360c117 0 210-93 210-210s-93-210-210-210H332z" p-id="1111"></path><path d="M341 522m-150 0a150 150 0 1 0 300 0 150 150 0 1 0-300 0Z" p-id="1112"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/system.svg b/fuintAdmin_zt/src/assets/icons/svg/system.svg
deleted file mode 100644
index dba28cf6f..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/system.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
-</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/tab.svg b/fuintAdmin_zt/src/assets/icons/svg/tab.svg
deleted file mode 100644
index b4b48e480..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/tab.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.921.052H49.08c-1.865 0-3.198 1.599-3.198 3.464v6.661c0 1.865 1.6 3.464 3.198 3.464h29.84c1.865 0 3.198-1.599 3.198-3.464V3.516C82.385 1.65 80.786.052 78.92.052zm45.563 0H94.642c-1.865 0-3.464 1.599-3.464 3.464v6.661c0 1.865 1.599 3.464 3.464 3.464h29.842c1.865-.266 3.464-1.599 3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464zm0 22.382H40.02c-1.866 0-3.464-1.599-3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464H3.516C1.65.052.052 1.651.052 3.516V124.75c0 1.598 1.599 3.197 3.464 3.197h120.968c1.865 0 3.464-1.599 3.464-3.464V25.898c0-1.865-1.599-3.464-3.464-3.464z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/table.svg b/fuintAdmin_zt/src/assets/icons/svg/table.svg
deleted file mode 100644
index 0e3dc9dea..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/table.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/textarea.svg b/fuintAdmin_zt/src/assets/icons/svg/textarea.svg
deleted file mode 100644
index 2709f292e..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/textarea.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802855098" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2984" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 160H128c-35.2 0-64 28.8-64 64v576c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V224c0-35.2-28.8-64-64-64z m0 608c0 16-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V256c0-16 12.8-32 32-32h704c19.2 0 32 12.8 32 32v512z" p-id="2985"></path><path d="M224 288c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V320c0-16-12.8-32-32-32z m608 480c19.2 0 32-12.8 32-32V608L704 768h128z" p-id="2986"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/theme.svg b/fuintAdmin_zt/src/assets/icons/svg/theme.svg
deleted file mode 100644
index 5982a2f78..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/theme.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M125.5 36.984L95.336 2.83C93.735 1.018 91.565 0 89.3 0c-2.263 0-4.433 1.018-6.033 2.83l-3.786 4.286c-1.6 1.812-3.77 2.83-6.032 2.831H54.553c-2.263 0-4.434-1.018-6.033-2.83L44.734 2.83C43.134 1.018 40.964 0 38.701 0c-2.263 0-4.434 1.018-6.034 2.83L2.5 36.984C.9 38.796 0 41.254 0 43.815c0 2.562.899 5.02 2.5 6.831L14.565 64.31c2.178 2.468 5.367 3.403 8.33 2.444 1.35-.435 2.709.592 2.709 2.18v49.407c0 5.313 3.84 9.66 8.532 9.66h59.726c4.693 0 8.532-4.347 8.532-9.66V68.934c0-1.59 1.36-2.616 2.71-2.181 2.962.96 6.15.024 8.329-2.444L125.5 50.646c1.6-1.811 2.499-4.269 2.499-6.83 0-2.563-.899-5.02-2.5-6.832z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/time-range.svg b/fuintAdmin_zt/src/assets/icons/svg/time-range.svg
deleted file mode 100644
index 13c1202bd..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/time-range.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579774825624" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1248" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M498.595712 482.290351 345.420077 482.290351l0 57.307194 210.477712 0L555.897789 274.196942l-57.301054 0L498.596735 482.290351zM498.595712 482.290351" p-id="1249"></path><path d="M577.685002 644.98478l379.879913 0 0 57.302077L577.685002 702.286858 577.685002 644.98478 577.685002 644.98478zM577.685002 644.98478" p-id="1250"></path><path d="M577.685002 773.764795l379.879913 0 0 57.307194L577.685002 831.071989 577.685002 773.764795 577.685002 773.764795zM577.685002 773.764795" p-id="1251"></path><path d="M577.685002 902.549927l379.879913 0 0 57.307194L577.685002 959.857121 577.685002 902.549927 577.685002 902.549927zM577.685002 902.549927" p-id="1252"></path><path d="M102.523001 382.290823c4.450359 2.615571 9.470699 3.954055 14.530948 3.954055 2.969635 0 5.952572-0.461511 8.836249-1.394766l190.809767-61.886489c15.052834-4.882194 23.297612-21.040199 18.415418-36.08894-4.882194-15.052834-21.040199-23.297612-36.093033-18.415418L175.676092 308.458257c15.994276-26.115797 35.170011-50.537 57.370639-72.743768 73.767074-73.767074 171.845857-114.388237 276.16783-114.388237 104.32095 0 202.39564 40.622186 276.16169 114.388237s114.393353 171.845857 114.393353 276.16783c0 26.427906-2.615571 52.449559-7.709589 77.780481l58.302871 0c4.464685-25.499767 6.708795-51.470255 6.708795-77.780481 0-60.449767-11.845793-119.102608-35.204803-174.336584-22.559808-53.334719-54.850236-101.226472-95.968725-142.349055-41.122583-41.122583-89.017406-73.408917-142.348032-95.968725C628.317169 75.866898 569.659211 64.021106 509.215584 64.021106c-60.448744 0-119.106702 11.845793-174.336584 35.207873-53.334719 22.559808-101.230566 54.846142-142.349055 95.968725-23.980157 23.980157-44.934398 50.278103-62.727647 78.601172l-20.738323-105.655342c-3.043313-15.527648-18.105357-25.642007-33.631982-22.599717-15.527648 3.048429-25.64303 18.105357-22.599717 33.637098l36.102243 183.932126C90.51348 371.153158 95.460142 378.13313 102.523001 382.290823L102.523001 382.290823zM102.523001 382.290823" p-id="1253"></path><path d="M126.020158 587.9416 67.768453 587.9416c5.759167 33.679054 15.368012 66.544579 28.789697 98.278327 22.559808 53.333696 54.850236 101.225449 95.971795 142.348032 41.122583 41.122583 89.014336 73.408917 142.349055 95.968725 54.112432 22.88829 111.517863 34.71157 170.668031 35.18229L505.547031 902.395408c-102.94972-0.941442-199.594851-41.445948-272.499277-114.349351C177.545672 732.543975 140.810003 663.275355 126.020158 587.9416L126.020158 587.9416zM126.020158 587.9416" p-id="1254"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/time.svg b/fuintAdmin_zt/src/assets/icons/svg/time.svg
deleted file mode 100644
index b376e32a6..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/time.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577099827399" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1008" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M520 559h204c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32H488c-17.673 0-32-14.327-32-32 0-0.167 0.001-0.334 0.004-0.5a32.65 32.65 0 0 1-0.004-0.5V277c0-17.673 14.327-32 32-32 17.673 0 32 14.327 32 32v282z m-8 401C264.576 960 64 759.424 64 512S264.576 64 512 64s448 200.576 448 448-200.576 448-448 448z m0-64c212.077 0 384-171.923 384-384S724.077 128 512 128 128 299.923 128 512s171.923 384 384 384z" p-id="1009"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/tool.svg b/fuintAdmin_zt/src/assets/icons/svg/tool.svg
deleted file mode 100644
index c813067ef..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/tool.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553828490559" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M898.831744 900.517641 103.816972 900.517641c-36.002982 0-65.363683-29.286-65.363683-65.313541l0-554.949184c0-36.041868 29.361725-65.326844 65.363683-65.326844l795.015795 0c36.002982 0 65.198931 29.284977 65.198931 65.326844l0 554.949184C964.030675 871.231641 934.834726 900.517641 898.831744 900.517641L898.831744 900.517641zM103.816972 255.593236c-13.576203 0-24.711821 11.085476-24.711821 24.662703l0 554.949184c0 13.576203 11.136641 24.662703 24.711821 24.662703l795.015795 0c13.577227 0 24.547069-11.086499 24.547069-24.662703l0-554.949184c0-13.577227-10.970866-24.662703-24.547069-24.662703L103.816972 255.593236 103.816972 255.593236zM664.346245 251.774257c-11.161201 0-20.332071-9.080819-20.332071-20.332071l0-101.278661c0-13.576203-11.047614-24.623817-24.699542-24.623817L383.181611 105.539708c-13.576203 0-24.712845 11.04659-24.712845 24.623817l0 101.278661c0 11.252275-9.041934 20.332071-20.332071 20.332071-11.20111 0-20.319791-9.080819-20.319791-20.332071l0-101.278661c0-35.989679 29.323862-65.275679 65.364707-65.275679l236.133022 0c36.06745 0 65.402569 29.284977 65.402569 65.275679l0 101.278661C684.717202 242.694461 675.636383 251.774257 664.346245 251.774257L664.346245 251.774257zM413.233044 521.725502 75.694471 521.725502c-11.163247 0-20.333094-9.117658-20.333094-20.35663 0-11.252275 9.169847-20.332071 20.333094-20.332071l337.538573 0c11.277858 0 20.319791 9.080819 20.319791 20.332071C433.552835 512.607844 424.510902 521.725502 413.233044 521.725502L413.233044 521.725502zM912.894018 521.725502 575.367725 521.725502c-11.213389 0-20.332071-9.117658-20.332071-20.35663 0-11.252275 9.118682-20.332071 20.332071-20.332071l337.526293 0c11.290137 0 20.332071 9.080819 20.332071 20.332071C933.226089 512.607844 924.184155 521.725502 912.894018 521.725502L912.894018 521.725502zM557.56322 634.217552 445.085496 634.217552c-11.213389 0-20.332071-9.079796-20.332071-20.331048l0-168.763658c0-11.251252 9.118682-20.332071 20.332071-20.332071l112.478747 0c11.290137 0 20.370956 9.080819 20.370956 20.332071l0 168.763658C577.934177 625.137757 568.853357 634.217552 557.56322 634.217552L557.56322 634.217552zM465.417567 593.514525l71.827909 0L537.245476 465.454918l-71.827909 0L465.417567 593.514525 465.417567 593.514525z" p-id="1685" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/tree-table.svg b/fuintAdmin_zt/src/assets/icons/svg/tree-table.svg
deleted file mode 100644
index 8aafdb829..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/tree-table.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M44.8 0h79.543C126.78 0 128 1.422 128 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H44.8c-2.438 0-3.657-1.422-3.657-4.267V4.267C41.143 1.422 42.362 0 44.8 0zm22.857 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 80 64 78.578 64 75.733V52.267C64 49.422 65.219 48 67.657 48zm0 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 128 64 126.578 64 123.733v-23.466C64 97.422 65.219 96 67.657 96zM50.286 68.267c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V32h6.4c2.02 0 3.658-1.91 3.658-4.267V4.267C27.429 1.91 25.79 0 23.77 0H3.657C1.637 0 0 1.91 0 4.267v23.466C0 30.09 1.637 32 3.657 32h6.4v80c0 2.356 1.638 4.267 3.657 4.267h36.572c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V68.267h32.915z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/tree.svg b/fuintAdmin_zt/src/assets/icons/svg/tree.svg
deleted file mode 100644
index dd4b7dd22..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/tree.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M126.713 90.023c.858.985 1.287 2.134 1.287 3.447v29.553c0 1.423-.429 2.6-1.287 3.53-.858.93-1.907 1.395-3.146 1.395H97.824c-1.145 0-2.146-.465-3.004-1.395-.858-.93-1.287-2.107-1.287-3.53V93.47c0-.875.19-1.696.572-2.462.382-.766.906-1.368 1.573-1.806a3.84 3.84 0 0 1 2.146-.657h9.725V69.007a3.84 3.84 0 0 0-.43-1.806 3.569 3.569 0 0 0-1.143-1.313 2.714 2.714 0 0 0-1.573-.492h-36.47v23.149h9.725c1.144 0 2.145.492 3.004 1.478.858.985 1.287 2.134 1.287 3.447v29.553c0 .876-.191 1.696-.573 2.463-.38.766-.905 1.368-1.573 1.806a3.84 3.84 0 0 1-2.145.656H51.915a3.84 3.84 0 0 1-2.145-.656c-.668-.438-1.216-1.04-1.645-1.806a4.96 4.96 0 0 1-.644-2.463V93.47c0-1.313.43-2.462 1.288-3.447.858-.986 1.907-1.478 3.146-1.478h9.582v-23.15h-37.9c-.953 0-1.74.356-2.359 1.068-.62.711-.93 1.56-.93 2.544v19.538h9.726c1.239 0 2.264.492 3.074 1.478.81.985 1.216 2.134 1.216 3.447v29.553c0 1.423-.405 2.6-1.216 3.53-.81.93-1.835 1.395-3.074 1.395H4.29c-.476 0-.93-.082-1.358-.246a4.1 4.1 0 0 1-1.144-.657 4.658 4.658 0 0 1-.93-1.067 5.186 5.186 0 0 1-.643-1.395 5.566 5.566 0 0 1-.215-1.56V93.47c0-.437.048-.875.143-1.313a3.95 3.95 0 0 1 .429-1.15c.19-.328.429-.656.715-.984.286-.329.572-.602.858-.821.286-.22.62-.383 1.001-.493.382-.11.763-.164 1.144-.164h9.726V61.619c0-.985.31-1.833.93-2.544.619-.712 1.358-1.068 2.216-1.068h44.335V39.62h-9.582c-1.24 0-2.288-.492-3.146-1.477a5.09 5.09 0 0 1-1.287-3.448V5.14c0-1.423.429-2.627 1.287-3.612.858-.985 1.907-1.477 3.146-1.477h25.743c.763 0 1.478.246 2.145.739a5.17 5.17 0 0 1 1.573 1.888c.382.766.573 1.587.573 2.462v29.553c0 1.313-.43 2.463-1.287 3.448-.859.985-1.86 1.477-3.004 1.477h-9.725v18.389h42.762c.954 0 1.74.355 2.36 1.067.62.711.93 1.56.93 2.545v26.925h9.582c1.239 0 2.288.492 3.146 1.478z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/upload.svg b/fuintAdmin_zt/src/assets/icons/svg/upload.svg
deleted file mode 100644
index bae49c0a5..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/upload.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577540289643" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7922" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M530.944 458.24l4.8 3.456 122.176 106.816a32 32 0 0 1-37.44 51.584l-4.672-3.392L546.56 556.16v280.704a32 32 0 0 1-26.24 31.488l-5.76 0.512a32 32 0 0 1-31.424-26.24l-0.512-5.76-0.064-280.704-69.12 60.48a32 32 0 0 1-40.96 0.896l-4.16-3.968a32 32 0 0 1-0.96-40.96l4.032-4.16 122.176-106.816a32 32 0 0 1 37.312-3.456zM497.92 128c128.128 0 239.168 82.304 275.52 199.04 123.968 11.264 221.312 113.088 221.312 237.44 0 128.128-103.68 232.96-234.88 238.272h-5.888l-35.52 0.192a32 32 0 0 1-0.192-64l35.264-0.128 4.672-0.064c96.384-3.84 172.544-80.896 172.544-174.272 0-96.128-80.512-174.464-179.584-174.464h-1.984a32 32 0 0 1-32-25.28C695.872 264.96 604.736 192 497.92 192 381.824 192 285.44 277.76 274.816 388.48a32 32 0 0 1-28.352 28.8c-83.968 9.152-147.84 78.208-147.84 159.552l0.192 7.936c3.84 85.76 77.056 154.112 166.592 154.112h45.632a32 32 0 0 1 0 64h-45.632C142.016 802.944 40.32 708.032 34.88 586.88l-0.192-9.28c0-106.88 76.352-197.184 179.968-219.904C239.488 226.112 357.76 128 497.856 128z" p-id="7923"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/user.svg b/fuintAdmin_zt/src/assets/icons/svg/user.svg
deleted file mode 100644
index 0ba0716a6..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/user.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="130" height="130" xmlns="http://www.w3.org/2000/svg"><path d="M63.444 64.996c20.633 0 37.359-14.308 37.359-31.953 0-17.649-16.726-31.952-37.359-31.952-20.631 0-37.36 14.303-37.358 31.952 0 17.645 16.727 31.953 37.359 31.953zM80.57 75.65H49.434c-26.652 0-48.26 18.477-48.26 41.27v2.664c0 9.316 21.608 9.325 48.26 9.325H80.57c26.649 0 48.256-.344 48.256-9.325v-2.663c0-22.794-21.605-41.271-48.256-41.271z" stroke="#979797"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/validCode.svg b/fuintAdmin_zt/src/assets/icons/svg/validCode.svg
deleted file mode 100644
index cfb10214c..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/validCode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569580729849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1939" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M513.3 958.5c-142.2 0-397.9-222.1-401.6-440.5V268c1.7-39.6 31.7-72.3 71.1-77.3 49-4.6 97.1-16.5 142.7-35.3 47.8-14 91.9-38.3 129.4-71.1 30.3-24.4 72.9-26.3 105.3-4.6 39.9 30.7 83.8 55.9 130.5 74.6 48.6 14.7 98.2 25.9 148.4 33.7 38.5 7.6 67.1 40.3 69.5 79.5 3.3 84.9 2.5 169.9-2.6 254.7-33.7 281.6-253.7 436.4-392.7 436.3z m-0.1-813.7c-7.2-0.2-14.3 2-20 6.4-39.7 35.2-86.8 61.1-137.7 75.7-46.8 19.2-96.2 31-146.6 35.2-11 3.2-18.8 13-19.5 24.4v230.1c3.5 180.3 223.3 361 323.9 361s287.3-120.2 317.6-360.5c7.3-142.7 0-228.6 0-229.6-1.3-13.3-11-24.3-24-27.3-49.6-7.7-98.6-19-146.5-33.7-46.3-19.5-89.7-45.3-129-76.7-5.8-3.8-12.7-5.5-19.5-4.9l1.3-0.1z" fill="#C6CCDA" p-id="1940"></path><path d="M750.1 428L490.7 673.2c-11.7 11.1-29.5 12.9-43.1 4.2l-6.8-5.8-141.2-149.4c-9.3-9.3-12.7-22.9-9-35.5 3.8-12.6 14.1-22.1 27-24.8 12.9-2.7 26.1 1.9 34.6 11.9L469 597.5l233.7-221c14.6-12.8 36.8-11.6 49.9 2.7 13.2 14.2 11.5 35.3-2.5 48.8" fill="#C6CCDA" p-id="1941"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/wechat.svg b/fuintAdmin_zt/src/assets/icons/svg/wechat.svg
deleted file mode 100644
index c586e5511..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/wechat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="110" xmlns="http://www.w3.org/2000/svg"><path d="M86.635 33.334c1.467 0 2.917.113 4.358.283C87.078 14.392 67.58.111 45.321.111 20.44.111.055 17.987.055 40.687c0 13.104 6.781 23.863 18.115 32.209l-4.527 14.352 15.82-8.364c5.666 1.182 10.207 2.395 15.858 2.395 1.42 0 2.829-.073 4.227-.189-.886-3.19-1.398-6.53-1.398-9.996 0-20.845 16.98-37.76 38.485-37.76zm-24.34-12.936c3.407 0 5.665 2.363 5.665 5.954 0 3.576-2.258 5.97-5.666 5.97-3.392 0-6.795-2.395-6.795-5.97 0-3.591 3.403-5.954 6.795-5.954zM30.616 32.323c-3.393 0-6.818-2.395-6.818-5.971 0-3.591 3.425-5.954 6.818-5.954 3.392 0 5.65 2.363 5.65 5.954 0 3.576-2.258 5.97-5.65 5.97z"/><path d="M127.945 70.52c0-19.075-18.108-34.623-38.448-34.623-21.537 0-38.5 15.548-38.5 34.623 0 19.108 16.963 34.622 38.5 34.622 4.508 0 9.058-1.2 13.584-2.395l12.414 7.167-3.404-11.923c9.087-7.184 15.854-16.712 15.854-27.471zm-50.928-5.97c-2.254 0-4.53-2.362-4.53-4.773 0-2.378 2.276-4.771 4.53-4.771 3.422 0 5.665 2.393 5.665 4.771 0 2.41-2.243 4.773-5.665 4.773zm24.897 0c-2.24 0-4.498-2.362-4.498-4.773 0-2.378 2.258-4.771 4.498-4.771 3.392 0 5.665 2.393 5.665 4.771 0 2.41-2.273 4.773-5.665 4.773z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svg/zip.svg b/fuintAdmin_zt/src/assets/icons/svg/zip.svg
deleted file mode 100644
index f806fc482..000000000
--- a/fuintAdmin_zt/src/assets/icons/svg/zip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.527 116.793c.178.008.348.024.527.024h40.233c4.711-.005 8.53-3.677 8.534-8.21V18.895c-.004-4.532-3.823-8.204-8.534-8.209H79.054c-.179 0-.353.016-.527.024V0L0 10.082v107.406l78.527 10.342v-11.037zm0-101.362c.174-.024.348-.052.527-.052h40.233c2.018 0 3.659 1.578 3.659 3.52v89.713c-.003 1.942-1.64 3.517-3.659 3.519H79.054c-.179 0-.353-.028-.527-.052V15.431zM30.262 75.757l-18.721-.46V72.37l11.3-16.673v-.148l-10.266.164v-4.51l17.504-.44v3.264L18.696 70.76v.144l11.566.176v4.678zm9.419.231l-5.823-.144V50.671l5.823-.144v25.461zm22.255-11.632c-2.168 1.922-5.353 2.76-9.02 2.736-.702.004-1.402-.04-2.097-.131v9.303l-5.997-.148V50.743c1.852-.352 4.473-.647 8.218-.743 3.838-.096 6.608.539 8.48 1.913 1.807 1.306 3.032 3.5 3.032 6.112s-.926 4.833-2.612 6.331h-.004zM53.36 54.45c-.856-.01-1.71.083-2.541.275v7.682c.523.116 1.167.152 2.06.152 3.301-.004 5.36-1.614 5.36-4.314 0-2.425-1.772-3.843-4.875-3.791l-.004-.004zm39.847-37.066h9.564v3.795h-9.564v-3.795zm-9.568 5.68h9.564v3.8h-9.564v-3.8zm9.568 6.216h9.564v3.799h-9.564V29.28zm0 12h9.564v3.794h-9.564V41.28zm-9.568-6.096h9.564v3.795h-9.564v-3.795zm9.472 47.064c2.512 0 4.921-.96 6.697-2.67 1.776-1.708 2.773-4.026 2.772-6.442l-1.748-15.263c0-5.033-2.492-9.112-7.725-9.112-5.232 0-7.72 4.079-7.72 9.112l-1.752 15.263c-.001 2.417.996 4.735 2.773 6.444 1.777 1.71 4.187 2.669 6.7 2.668h.003zm-3.135-16.75h6.27v12.743h-6.27V65.5z"/></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/icons/svgo.yml b/fuintAdmin_zt/src/assets/icons/svgo.yml
deleted file mode 100644
index d11906aec..000000000
--- a/fuintAdmin_zt/src/assets/icons/svgo.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# replace default config
-
-# multipass: true
-# full: true
-
-plugins:
-
-  # - name
-  #
-  # or:
-  # - name: false
-  # - name: true
-  #
-  # or:
-  # - name:
-  #     param1: 1
-  #     param2: 2
-
-- removeAttrs:
-    attrs:
-      - 'fill'
-      - 'fill-rule'
diff --git a/fuintAdmin_zt/src/assets/images/add.png b/fuintAdmin_zt/src/assets/images/add.png
deleted file mode 100644
index 766a9aded..000000000
Binary files a/fuintAdmin_zt/src/assets/images/add.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/all-cate.svg b/fuintAdmin_zt/src/assets/images/all-cate.svg
deleted file mode 100644
index ff281ed15..000000000
--- a/fuintAdmin_zt/src/assets/images/all-cate.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650167616666" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4032" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: "feedback-iconfont"; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
-</style></defs><path d="M512 74.472727L135.028364 325.818182 512 577.163636 888.971636 325.818182 512 74.472727z m12.893091-47.290182l418.909091 279.272728a23.272727 23.272727 0 0 1 0 38.725818l-418.909091 279.272727a23.272727 23.272727 0 0 1-25.786182 0l-418.909091-279.272727a23.272727 23.272727 0 0 1 0-38.725818l418.909091-279.272728a23.272727 23.272727 0 0 1 25.786182 0zM512 763.298909l406.016-270.661818a23.272727 23.272727 0 1 1 25.786182 38.725818l-418.909091 279.272727a23.272727 23.272727 0 0 1-25.786182 0l-418.909091-279.272727a23.272727 23.272727 0 1 1 25.786182-38.725818L512 763.298909z m406.016-84.48a23.272727 23.272727 0 1 1 25.786182 38.725818l-418.909091 279.272728a23.272727 23.272727 0 0 1-25.786182 0l-418.909091-279.272728a23.272727 23.272727 0 1 1 25.786182-38.725818L512 949.480727l406.016-270.661818z" fill="#00acac" p-id="4033"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/images/avatar.png b/fuintAdmin_zt/src/assets/images/avatar.png
deleted file mode 100644
index cc951fbdd..000000000
Binary files a/fuintAdmin_zt/src/assets/images/avatar.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/backbbj.png b/fuintAdmin_zt/src/assets/images/backbbj.png
deleted file mode 100644
index b291621ed..000000000
Binary files a/fuintAdmin_zt/src/assets/images/backbbj.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/banner.png b/fuintAdmin_zt/src/assets/images/banner.png
deleted file mode 100644
index d6bc4752b..000000000
Binary files a/fuintAdmin_zt/src/assets/images/banner.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/bolang.png b/fuintAdmin_zt/src/assets/images/bolang.png
deleted file mode 100644
index 90b8ec131..000000000
Binary files a/fuintAdmin_zt/src/assets/images/bolang.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/box-left.png b/fuintAdmin_zt/src/assets/images/box-left.png
deleted file mode 100644
index 6b825dc84..000000000
Binary files a/fuintAdmin_zt/src/assets/images/box-left.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/cashier.png b/fuintAdmin_zt/src/assets/images/cashier.png
deleted file mode 100644
index 2f45e4ad2..000000000
Binary files a/fuintAdmin_zt/src/assets/images/cashier.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/cashier.svg b/fuintAdmin_zt/src/assets/images/cashier.svg
deleted file mode 100644
index 514428455..000000000
--- a/fuintAdmin_zt/src/assets/images/cashier.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1678764587175" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3906" data-spm-anchor-id="a313x.7781069.0.i0" width="128" height="128"><path d="M930.51904 682.752c-1.2288 13.75232-20.17792 10.24-29.66528 10.24H172.77952c-12.0064 0-76.8256 9.05728-76.8256-11.70944v-141.02528-423.35744c0-9.79456-1.76128-22.95808 12.29312-22.95808h809.97888c22.67648 0 12.29312 77.75232 12.29312 91.264V682.752c0 33.01376 51.2 33.01376 51.2 0V317.69088 126.32576c0-19.13344 0.23552-34.98496-8.38656-53.15072-11.27424-23.75168-38.48192-30.42816-62.27456-30.42816H129.17248c-9.8304 0-19.63008-0.30208-29.42464 0.57856-35.75296 3.19488-54.99392 34.6624-54.99392 67.80928v566.92224c0 34.95424 24.52992 66.13504 61.48096 66.13504h812.98944c35.98848 0 59.44832-27.4432 62.49472-61.44 2.944-32.896-48.27648-32.6144-51.2 0z" fill="#00acac" p-id="3907"></path><path d="M487.63904 740.7616v213.3504c0 33.01376 51.2 33.01376 51.2 0v-213.3504c-0.00512-33.01888-51.2-33.01888-51.2 0z" fill="#00acac" p-id="3908"></path><path d="M92.57984 979.712H950.62016c33.01376 0 33.01376-51.2 0-51.2H92.57984c-33.01888 0-33.01888 51.2 0 51.2zM372.74112 236.54912l125.65504 125.65504c23.36256 23.36256 59.5712-12.83584 36.1984-36.20352L408.94464 200.3456c-23.36256-23.36768-59.56608 12.83584-36.20352 36.20352z" fill="#00acac" p-id="3909"></path><path d="M614.17984 200.3456L488.59648 326.00064c-23.35744 23.3728 12.84608 59.57632 36.20352 36.20352l125.57824-125.65504c23.36256-23.3728-12.83584-59.57632-36.1984-36.20352z" fill="#00acac" p-id="3910"></path><path d="M305.88416 369.69984h414.70976c33.01376 0 33.01376-51.2 0-51.2H305.88416c-33.01888 0-33.01888 51.2 0 51.2zM334.91456 498.33984h356.65408c33.01376 0 33.01376-51.2 0-51.2H334.91456c-33.01888 0-33.01888 51.2 0 51.2z" fill="#00acac" p-id="3911"></path><path d="M538.83392 564.89984V344.09984c0-33.01888-51.2-33.01888-51.2 0v220.8c0.00512 33.01376 51.2 33.01376 51.2 0z" fill="#00acac" p-id="3912"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/images/cut/组 4666@2x.png b/fuintAdmin_zt/src/assets/images/cut/组 4666@2x.png
deleted file mode 100644
index 447eb3884..000000000
Binary files a/fuintAdmin_zt/src/assets/images/cut/组 4666@2x.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/cut/组 4677@2x.png b/fuintAdmin_zt/src/assets/images/cut/组 4677@2x.png
deleted file mode 100644
index d57c8c272..000000000
Binary files a/fuintAdmin_zt/src/assets/images/cut/组 4677@2x.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/cut/组 5017@2x.png b/fuintAdmin_zt/src/assets/images/cut/组 5017@2x.png
deleted file mode 100644
index 2d8460d29..000000000
Binary files a/fuintAdmin_zt/src/assets/images/cut/组 5017@2x.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/dark.svg b/fuintAdmin_zt/src/assets/images/dark.svg
deleted file mode 100644
index f646bd7ea..000000000
--- a/fuintAdmin_zt/src/assets/images/dark.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
-    xmlns="http://www.w3.org/2000/svg" 
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
-        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-    </defs>
-    <g id="配置面板" width="48" height="40" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="setting-copy-2" width="48" height="40" transform="translate(-1190.000000, -136.000000)">
-            <g id="Group-8" width="48" height="40" transform="translate(1167.000000, 0.000000)">
-                <g id="Group-5-Copy-5" filter="url(#filter-1)" transform="translate(25.000000, 137.000000)">
-                    <mask id="mask-3" fill="white">
-                        <use xlink:href="#path-2"></use>
-                    </mask>
-                    <g id="Rectangle-18">
-                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
-                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
-                    </g>
-                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
-                    <rect id="Rectangle-18" fill="#303648" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/images/detele.png b/fuintAdmin_zt/src/assets/images/detele.png
deleted file mode 100644
index 48aa88592..000000000
Binary files a/fuintAdmin_zt/src/assets/images/detele.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/goods.png b/fuintAdmin_zt/src/assets/images/goods.png
deleted file mode 100644
index e226ba797..000000000
Binary files a/fuintAdmin_zt/src/assets/images/goods.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/henggang.png b/fuintAdmin_zt/src/assets/images/henggang.png
deleted file mode 100644
index d09767f78..000000000
Binary files a/fuintAdmin_zt/src/assets/images/henggang.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/home/card.png b/fuintAdmin_zt/src/assets/images/home/card.png
deleted file mode 100644
index 96371bff2..000000000
Binary files a/fuintAdmin_zt/src/assets/images/home/card.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/home/coupon.png b/fuintAdmin_zt/src/assets/images/home/coupon.png
deleted file mode 100644
index c282eb283..000000000
Binary files a/fuintAdmin_zt/src/assets/images/home/coupon.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/home/goods.png b/fuintAdmin_zt/src/assets/images/home/goods.png
deleted file mode 100644
index 8a2844dcd..000000000
Binary files a/fuintAdmin_zt/src/assets/images/home/goods.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/home/member.png b/fuintAdmin_zt/src/assets/images/home/member.png
deleted file mode 100644
index f198c3830..000000000
Binary files a/fuintAdmin_zt/src/assets/images/home/member.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/home/order.png b/fuintAdmin_zt/src/assets/images/home/order.png
deleted file mode 100644
index c5a334088..000000000
Binary files a/fuintAdmin_zt/src/assets/images/home/order.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/home/pay.png b/fuintAdmin_zt/src/assets/images/home/pay.png
deleted file mode 100644
index b9cb819f0..000000000
Binary files a/fuintAdmin_zt/src/assets/images/home/pay.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/hot.png b/fuintAdmin_zt/src/assets/images/hot.png
deleted file mode 100644
index 164072faf..000000000
Binary files a/fuintAdmin_zt/src/assets/images/hot.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/icon-cart.svg b/fuintAdmin_zt/src/assets/images/icon-cart.svg
deleted file mode 100644
index 65c2eb91e..000000000
--- a/fuintAdmin_zt/src/assets/images/icon-cart.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1649756198264" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4000" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: "feedback-iconfont"; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
-</style></defs><path d="M346.112 806.912q19.456 0 36.864 7.168t30.208 19.968 20.48 30.208 7.68 36.864-7.68 36.864-20.48 30.208-30.208 20.48-36.864 7.68q-20.48 0-37.888-7.68t-30.208-20.48-20.48-30.208-7.68-36.864 7.68-36.864 20.48-30.208 30.208-19.968 37.888-7.168zM772.096 808.96q19.456 0 37.376 7.168t30.72 19.968 20.48 30.208 7.68 36.864-7.68 36.864-20.48 30.208-30.72 20.48-37.376 7.68-36.864-7.68-30.208-20.48-20.48-30.208-7.68-36.864 7.68-36.864 20.48-30.208 30.208-19.968 36.864-7.168zM944.128 227.328q28.672 0 44.544 7.68t22.528 18.944 6.144 24.064-3.584 22.016-13.312 37.888-22.016 62.976-23.552 68.096-18.944 53.248q-13.312 40.96-33.28 56.832t-49.664 15.872l-35.84 0-65.536 0-86.016 0-96.256 0-253.952 0 14.336 92.16 517.12 0q49.152 0 49.152 41.984 0 20.48-9.728 35.328t-38.4 14.848l-49.152 0-94.208 0-118.784 0-119.808 0-99.328 0-55.296 0q-20.48 0-34.304-9.216t-23.04-24.064-14.848-32.256-8.704-32.768q-1.024-6.144-5.632-29.696t-11.264-58.88-14.848-78.848-16.384-87.552q-19.456-103.424-44.032-230.4l-76.8 0q-15.36 0-25.6-7.68t-16.896-18.432-9.216-23.04-2.56-22.528q0-20.48 13.824-33.792t37.376-13.312l21.504 0 21.504 0 25.6 0 34.816 0q20.48 0 32.768 6.144t19.456 15.36 10.24 19.456 5.12 17.408q2.048 8.192 4.096 23.04t4.096 30.208q3.072 18.432 6.144 38.912l700.416 0zM867.328 194.56l-374.784 0 135.168-135.168q23.552-23.552 51.712-24.064t51.712 23.04z" p-id="4001" fill="#FFFFFF"></path></svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/images/jiantou.png b/fuintAdmin_zt/src/assets/images/jiantou.png
deleted file mode 100644
index 7e6e17857..000000000
Binary files a/fuintAdmin_zt/src/assets/images/jiantou.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/jybjj.png b/fuintAdmin_zt/src/assets/images/jybjj.png
deleted file mode 100644
index 5f9997950..000000000
Binary files a/fuintAdmin_zt/src/assets/images/jybjj.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/kkx.png b/fuintAdmin_zt/src/assets/images/kkx.png
deleted file mode 100644
index 1ed6e682c..000000000
Binary files a/fuintAdmin_zt/src/assets/images/kkx.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/l-one.png b/fuintAdmin_zt/src/assets/images/l-one.png
deleted file mode 100644
index 99cdb837a..000000000
Binary files a/fuintAdmin_zt/src/assets/images/l-one.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/l-three.png b/fuintAdmin_zt/src/assets/images/l-three.png
deleted file mode 100644
index 41b7a5b69..000000000
Binary files a/fuintAdmin_zt/src/assets/images/l-three.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/l-two.png b/fuintAdmin_zt/src/assets/images/l-two.png
deleted file mode 100644
index bb3e71dbb..000000000
Binary files a/fuintAdmin_zt/src/assets/images/l-two.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/life.png b/fuintAdmin_zt/src/assets/images/life.png
deleted file mode 100644
index 1d04c0506..000000000
Binary files a/fuintAdmin_zt/src/assets/images/life.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/light.svg b/fuintAdmin_zt/src/assets/images/light.svg
deleted file mode 100644
index ab7cc088f..000000000
--- a/fuintAdmin_zt/src/assets/images/light.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
-    xmlns="http://www.w3.org/2000/svg" 
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
-        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-    </defs>
-    <g id="配置面板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="setting-copy-2" transform="translate(-1254.000000, -136.000000)">
-            <g id="Group-8" transform="translate(1167.000000, 0.000000)">
-                <g id="Group-5" filter="url(#filter-1)" transform="translate(89.000000, 137.000000)">
-                    <mask id="mask-3" fill="white">
-                        <use xlink:href="#path-2"></use>
-                    </mask>
-                    <g id="Rectangle-18">
-                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
-                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
-                    </g>
-                    <rect id="Rectangle-18" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
-                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/assets/images/login-bg.png b/fuintAdmin_zt/src/assets/images/login-bg.png
deleted file mode 100644
index 9f1e4945e..000000000
Binary files a/fuintAdmin_zt/src/assets/images/login-bg.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/loginback.png b/fuintAdmin_zt/src/assets/images/loginback.png
deleted file mode 100644
index e11545860..000000000
Binary files a/fuintAdmin_zt/src/assets/images/loginback.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/loin-back.png b/fuintAdmin_zt/src/assets/images/loin-back.png
deleted file mode 100644
index 833c575d4..000000000
Binary files a/fuintAdmin_zt/src/assets/images/loin-back.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/love.png b/fuintAdmin_zt/src/assets/images/love.png
deleted file mode 100644
index 6de11feaf..000000000
Binary files a/fuintAdmin_zt/src/assets/images/love.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/mjyx.png b/fuintAdmin_zt/src/assets/images/mjyx.png
deleted file mode 100644
index 80d8ae1d1..000000000
Binary files a/fuintAdmin_zt/src/assets/images/mjyx.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/office.png b/fuintAdmin_zt/src/assets/images/office.png
deleted file mode 100644
index d569f0de0..000000000
Binary files a/fuintAdmin_zt/src/assets/images/office.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/order.png b/fuintAdmin_zt/src/assets/images/order.png
deleted file mode 100644
index 9de874496..000000000
Binary files a/fuintAdmin_zt/src/assets/images/order.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/pcin.png b/fuintAdmin_zt/src/assets/images/pcin.png
deleted file mode 100644
index 22d7fad61..000000000
Binary files a/fuintAdmin_zt/src/assets/images/pcin.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/qp.png b/fuintAdmin_zt/src/assets/images/qp.png
deleted file mode 100644
index 07832f1be..000000000
Binary files a/fuintAdmin_zt/src/assets/images/qp.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/tjyl.png b/fuintAdmin_zt/src/assets/images/tjyl.png
deleted file mode 100644
index b0ef2d381..000000000
Binary files a/fuintAdmin_zt/src/assets/images/tjyl.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/tzzx.png b/fuintAdmin_zt/src/assets/images/tzzx.png
deleted file mode 100644
index 08685a99c..000000000
Binary files a/fuintAdmin_zt/src/assets/images/tzzx.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/xfyl.png b/fuintAdmin_zt/src/assets/images/xfyl.png
deleted file mode 100644
index aaf35a373..000000000
Binary files a/fuintAdmin_zt/src/assets/images/xfyl.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/xryl.png b/fuintAdmin_zt/src/assets/images/xryl.png
deleted file mode 100644
index 99dc831b1..000000000
Binary files a/fuintAdmin_zt/src/assets/images/xryl.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/xz.png b/fuintAdmin_zt/src/assets/images/xz.png
deleted file mode 100644
index 82de82d98..000000000
Binary files a/fuintAdmin_zt/src/assets/images/xz.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/zkyx.png b/fuintAdmin_zt/src/assets/images/zkyx.png
deleted file mode 100644
index 4be87b4f1..000000000
Binary files a/fuintAdmin_zt/src/assets/images/zkyx.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/images/ztlogin.png b/fuintAdmin_zt/src/assets/images/ztlogin.png
deleted file mode 100644
index bfbbab091..000000000
Binary files a/fuintAdmin_zt/src/assets/images/ztlogin.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/logo/logo.png b/fuintAdmin_zt/src/assets/logo/logo.png
deleted file mode 100644
index 2c00c88b4..000000000
Binary files a/fuintAdmin_zt/src/assets/logo/logo.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/apple.png b/fuintAdmin_zt/src/assets/menu_icon/apple.png
deleted file mode 100644
index e7e8a084f..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/apple.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/apple_b.png b/fuintAdmin_zt/src/assets/menu_icon/apple_b.png
deleted file mode 100644
index b1c2dfa91..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/apple_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu.png
deleted file mode 100644
index 804977436..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/caiwu.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu1.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu1.png
deleted file mode 100644
index b5f86162b..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/caiwu1.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu1_b.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu1_b.png
deleted file mode 100644
index 2fc08130e..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/caiwu1_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu_b.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu_b.png
deleted file mode 100644
index 550db1cb0..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/caiwu_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/car.png b/fuintAdmin_zt/src/assets/menu_icon/car.png
deleted file mode 100644
index 7f928304f..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/car.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/car_b.png b/fuintAdmin_zt/src/assets/menu_icon/car_b.png
deleted file mode 100644
index 4d4f05000..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/car_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/code.png b/fuintAdmin_zt/src/assets/menu_icon/code.png
deleted file mode 100644
index cdc2de988..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/code.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/code_b.png b/fuintAdmin_zt/src/assets/menu_icon/code_b.png
deleted file mode 100644
index 15fcc0ccc..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/code_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/home.png b/fuintAdmin_zt/src/assets/menu_icon/home.png
deleted file mode 100644
index 05c82aed2..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/home.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/home_b.png b/fuintAdmin_zt/src/assets/menu_icon/home_b.png
deleted file mode 100644
index d9b1129bf..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/home_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/home_c.png b/fuintAdmin_zt/src/assets/menu_icon/home_c.png
deleted file mode 100644
index ec4947f70..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/home_c.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/jigou.png b/fuintAdmin_zt/src/assets/menu_icon/jigou.png
deleted file mode 100644
index 07ca13edb..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/jigou.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/jigou_b.png b/fuintAdmin_zt/src/assets/menu_icon/jigou_b.png
deleted file mode 100644
index ac4602062..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/jigou_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/laba.png b/fuintAdmin_zt/src/assets/menu_icon/laba.png
deleted file mode 100644
index 8066dd3ff..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/laba.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/laba_b.png b/fuintAdmin_zt/src/assets/menu_icon/laba_b.png
deleted file mode 100644
index b450235f3..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/laba_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/lihe.png b/fuintAdmin_zt/src/assets/menu_icon/lihe.png
deleted file mode 100644
index 7757d1f6d..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/lihe.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/lihe_b.png b/fuintAdmin_zt/src/assets/menu_icon/lihe_b.png
deleted file mode 100644
index ff2304b6b..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/lihe_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/ren.png b/fuintAdmin_zt/src/assets/menu_icon/ren.png
deleted file mode 100644
index 874cf8b3e..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/ren.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/ren_b.png b/fuintAdmin_zt/src/assets/menu_icon/ren_b.png
deleted file mode 100644
index 82b579f75..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/ren_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/setting.png b/fuintAdmin_zt/src/assets/menu_icon/setting.png
deleted file mode 100644
index c9e056e6e..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/setting.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/setting_b.png b/fuintAdmin_zt/src/assets/menu_icon/setting_b.png
deleted file mode 100644
index a02975f75..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/setting_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/shouye.png b/fuintAdmin_zt/src/assets/menu_icon/shouye.png
deleted file mode 100644
index 71ba3820b..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/shouye.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/shouye_b.png b/fuintAdmin_zt/src/assets/menu_icon/shouye_b.png
deleted file mode 100644
index 5ea49fbd2..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/shouye_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/user.png b/fuintAdmin_zt/src/assets/menu_icon/user.png
deleted file mode 100644
index 381342f8e..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/user.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/user_b.png b/fuintAdmin_zt/src/assets/menu_icon/user_b.png
deleted file mode 100644
index c6ac0da95..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/user_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/wendang.png b/fuintAdmin_zt/src/assets/menu_icon/wendang.png
deleted file mode 100644
index 3d140da9a..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/wendang.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/wendang_b.png b/fuintAdmin_zt/src/assets/menu_icon/wendang_b.png
deleted file mode 100644
index 95ea90667..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/wendang_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/youqiang.png b/fuintAdmin_zt/src/assets/menu_icon/youqiang.png
deleted file mode 100644
index 27d70ab98..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/youqiang.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/youqiang_b.png b/fuintAdmin_zt/src/assets/menu_icon/youqiang_b.png
deleted file mode 100644
index 6d23c71c4..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/youqiang_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/yunying.png b/fuintAdmin_zt/src/assets/menu_icon/yunying.png
deleted file mode 100644
index df465f6c3..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/yunying.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/yunying_b.png b/fuintAdmin_zt/src/assets/menu_icon/yunying_b.png
deleted file mode 100644
index 2c9f7b750..000000000
Binary files a/fuintAdmin_zt/src/assets/menu_icon/yunying_b.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/assets/styles/btn.scss b/fuintAdmin_zt/src/assets/styles/btn.scss
deleted file mode 100644
index dc76d7f1a..000000000
--- a/fuintAdmin_zt/src/assets/styles/btn.scss
+++ /dev/null
@@ -1,120 +0,0 @@
-@import './variables.scss';
-
-@mixin colorBtn($color) {
-  background: $color;
-
-  &:hover {
-    color: $color;
-
-    &:before,
-    &:after {
-      background: $color;
-    }
-  }
-}
-
-.blue-btn {
-  @include colorBtn($blue)
-}
-
-.light-blue-btn {
-  @include colorBtn($light-blue)
-}
-
-.red-btn {
-  @include colorBtn($red)
-}
-
-.pink-btn {
-  @include colorBtn($pink)
-}
-
-.green-btn {
-  @include colorBtn($green)
-}
-
-.tiffany-btn {
-  @include colorBtn($tiffany)
-}
-
-.yellow-btn {
-  @include colorBtn($yellow)
-}
-
-.pan-btn {
-  font-size: 14px;
-  color: #fff;
-  padding: 14px 36px;
-  border-radius: 8px;
-  border: none;
-  outline: none;
-  transition: 600ms ease all;
-  position: relative;
-  display: inline-block;
-
-  &:hover {
-    background: #fff;
-
-    &:before,
-    &:after {
-      width: 100%;
-      transition: 600ms ease all;
-    }
-  }
-
-  &:before,
-  &:after {
-    content: '';
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 2px;
-    width: 0;
-    transition: 400ms ease all;
-  }
-
-  &::after {
-    right: inherit;
-    top: inherit;
-    left: 0;
-    bottom: 0;
-  }
-}
-
-.custom-button {
-  display: inline-block;
-  line-height: 1;
-  white-space: nowrap;
-  cursor: pointer;
-  background: #fff;
-  color: #fff;
-  -webkit-appearance: none;
-  text-align: center;
-  box-sizing: border-box;
-  outline: 0;
-  margin: 0;
-  padding: 10px 15px;
-  font-size: 14px;
-  border-radius: 4px;
-}
-
-.el-button--warning{
-  color: white !important;
-  background:  linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
-  color: white !important;
-  border: 0px !important;
-}
-.el-button--primary{
-  color: white !important;
-  background:  linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important;
-  color: white !important;
-  border: 0px !important;
-}
-.el-button--success{
-  background:  linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important;
-  color: white !important;
-  border: 0px !important;
-}
-.el-button--text{
-  color: #FF9655 !important;
-}
diff --git a/fuintAdmin_zt/src/assets/styles/element-ui.scss b/fuintAdmin_zt/src/assets/styles/element-ui.scss
deleted file mode 100644
index 44f149632..000000000
--- a/fuintAdmin_zt/src/assets/styles/element-ui.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-// cover some element-ui styles
-
-.el-breadcrumb__inner,
-.el-breadcrumb__inner a {
-  font-weight: 400 !important;
-}
-
-.el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
-}
-
-.el-upload__input {
-  display: none;
-}
-
-.cell {
-  .el-tag {
-    margin-right: 0px;
-  }
-}
-
-.small-padding {
-  .cell {
-    padding-left: 5px;
-    padding-right: 5px;
-  }
-}
-
-.fixed-width {
-  .el-button--mini {
-    padding: 7px 10px;
-    width: 60px;
-  }
-}
-
-.status-col {
-  .cell {
-    padding: 0 10px;
-    text-align: center;
-
-    .el-tag {
-      margin-right: 0px;
-    }
-  }
-}
-
-// to fixed https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-// refine element ui upload
-.upload-container {
-  .el-upload {
-    width: 100%;
-
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
-    }
-  }
-}
-
-// dropdown
-.el-dropdown-menu {
-  a {
-    display: block
-  }
-}
-
-// fix date-picker ui bug in filter-item
-.el-range-editor.el-input__inner {
-  display: inline-flex !important;
-}
-.el-input__inner:focus {
-  border-color: #FF9655 !important;
-}
-
-// to fix el-date-picker css style
-.el-range-separator {
-  box-sizing: content-box;
-}
-
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
-  display: none;
-}
-
-.common-dialog {
-  .el-dialog {
-    border: solid 6px #00acac;
-  }
-  .el-dialog__header{
-    background: #00acac;
-    padding: 10px;
-  }
-  .el-dialog__headerbtn {
-    top: 15px;
-  }
-  .el-dialog__body {
-    padding: 30px;
-  }
-  .el-dialog__title,.el-dialog__close{
-    color: #fff;
-    font-size: 14px;
-  }
-  .el-dialog__title,.el-dialog__close:hover{
-    color: #fff;
-    font-weight: bold;
-  }
-}
-.el-switch.is-checked .el-switch__core{
-  background-color: #0DC291 !important;
-  border-color: #0DC291 !important;
-}
-.el-switch__core{
-  background-color: #FF4347 !important;
-  border-color: #FF4347 !important;
-}
-.el-pagination.is-background .el-pager li:not(.disabled).active{
-  background-color: #FF9655 !important;
-}
-.el-pagination.is-background .el-pager li:hover{
-  color: #FF9655 !important;/*hover时候的文字颜色*/
-}
-//修改选择框的颜色
-.el-checkbox__input.is-checked .el-checkbox__inner,
-.el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  border-color: #FF9655!important;
-  background-color: #FF9655!important;
-}
-.el-checkbox__input.is-focus .el-checkbox__inner{
-  border-color:  #FF9655!important;
-}
-//修改选中后文本的颜色
-.el-checkbox__input.is-checked+.el-checkbox__label{
-  color:#FF9655!important;
-}
diff --git a/fuintAdmin_zt/src/assets/styles/element-variables.scss b/fuintAdmin_zt/src/assets/styles/element-variables.scss
deleted file mode 100644
index 79510b849..000000000
--- a/fuintAdmin_zt/src/assets/styles/element-variables.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-* I think element-ui's default theme color is too light for long-term use.
-* So I modified the default color and you can modify it to your liking.
-**/
-
-/* theme color */
-$--color-primary: #409EFF;
-$--color-success: #13ce66;
-$--color-warning: #ffba00;
-$--color-danger: #ff4949;
-// $--color-info: #1E1E1E;
-
-$--button-font-weight: 400;
-
-// $--color-text-regular: #1f2d3d;
-
-$--border-color-light: #dfe4ed;
-$--border-color-lighter: #e6ebf5;
-
-$--table-border:1px solid#dfe6ec;
-
-/* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
-
-@import "~element-ui/packages/theme-chalk/src/index";
-
-// the :export directive is the magic sauce for webpack
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
-:export {
-  theme: $--color-primary;
-}
diff --git a/fuintAdmin_zt/src/assets/styles/fonts.css b/fuintAdmin_zt/src/assets/styles/fonts.css
deleted file mode 100644
index db95d08b6..000000000
--- a/fuintAdmin_zt/src/assets/styles/fonts.css
+++ /dev/null
@@ -1,13 +0,0 @@
-@font-face {
-  font-family: 'YouSheBiaoTiHei';
-  src: url("../fonts/YouSheBiaoTiHei.ttf");
-}
-@font-face {
-  font-family: 'Source Han Sans CN';
-  src: url("../fonts/Source Han Sans CN Regular.otf");
-}
-
-@font-face {
-  font-family: 'AlimamaShuHeiTi';
-  src: url("../fonts/AlimamaShuHeiTi-Bold.ttf");
-}
diff --git a/fuintAdmin_zt/src/assets/styles/fuint.scss b/fuintAdmin_zt/src/assets/styles/fuint.scss
deleted file mode 100644
index b12b0896b..000000000
--- a/fuintAdmin_zt/src/assets/styles/fuint.scss
+++ /dev/null
@@ -1,382 +0,0 @@
- /**
- * 通用css样式布局处理
- * Copyright (c) 2022 https://www.fuint.cn
- */
- /** 基础通用 **/
-.pt5 {
-   padding-top: 5px;
-}
-.pr5 {
-   padding-right: 5px;
-}
-.pb5 {
-   padding-bottom: 5px;
-}
-.mt5 {
-   margin-top: 5px;
-}
-.mr5 {
-   margin-right: 5px;
-}
-.mb5 {
-   margin-bottom: 5px;
-}
-.mb8 {
-    margin-bottom: 8px;
-}
-.ml5 {
-    margin-left: 5px;
-}
-.mt10 {
-    margin-top: 10px;
-}
-.mr10 {
-    margin-right: 10px;
-}
-.mb10 {
-    margin-bottom: 10px;
-}
-.ml10 {
-    margin-left: 10px;
-}
-.mt20 {
-    margin-top: 20px;
-}
-.mr20 {
-    margin-right: 20px;
-}
-.mb20 {
-    margin-bottom: 20px;
-}
-.ml20 {
-    margin-left: 20px;
-}
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-    font-family: inherit;
-    font-weight: 500;
-    line-height: 1.1;
-    color: inherit;
-}
-.main-panel {
-  border: solid 1px #ccc;
-  padding: 25px 10px 20px 10px;
-  .input {
-      width: 450px;
-  }
-  .min-input {
-     width: 240px;
-  }
-  .el-upload {
-     width: 80px;
-     height: 80px;
-     line-height: 88px;
-  }
-  .el-upload-list__item {
-     width: 80px;
-     height: 80px;
-  }
-  .footer {
-      margin-left: 80px;
-  }
-}
-.el-dialog:not(.is-fullscreen) {
-    margin-top: 6vh !important;
-}
-.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
-  overflow: auto;
-    overflow-x: hidden;
-    max-height: 70vh;
-    padding: 10px 20px 0;
-}
-.el-table {
-    .el-table__header-wrapper, .el-table__fixed-header-wrapper {
-        th {
-            word-break: break-word;
-            background-color: #f8f8f9;
-            color: #515a6e;
-            height: 40px;
-            font-size: 13px;
-        }
-    }
-    .el-table__body-wrapper {
-        .el-button [class*="el-icon-"] + span {
-            margin-left: 1px;
-        }
-    }
-}
-
-/** 表单布局 **/
-.form-header {
-    font-size:15px;
-    color:#6379bb;
-    border-bottom:1px solid #ddd;
-    margin:8px 10px 25px 10px;
-    padding-bottom:5px
-}
-
-/** 表单提示 **/
-.form-tips {
-   font-size: 12px;
-   color: #888;
-   height: 12px;
-   padding-left: 5px;
-   line-height: 12px;
-   margin-top: 5px;
-}
-
-/** 表格布局 **/
-.pagination-container {
-    position: relative;
-    height: 25px;
-    margin-bottom: 10px;
-    margin-top: 15px;
-    padding: 10px 20px !important;
-  background: transparent;
-}
-
-/* tree border */
-.tree-border {
-    margin-top: 5px;
-    border: 1px solid #e5e6e7;
-    background: #FFFFFF none;
-    border-radius:4px;
-}
-
-.pagination-container .el-pagination {
-    right: 0;
-    position: absolute;
-}
-
-@media ( max-width : 768px) {
-  .pagination-container .el-pagination > .el-pagination__jump {
-    display: none !important;
-  }
-  .pagination-container .el-pagination > .el-pagination__sizes {
-    display: none !important;
-  }
-}
-
-.el-table .fixed-width .el-button--mini {
-    padding-left: 0;
-    padding-right: 0;
-    width: inherit;
-}
-
-/** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link {
-    cursor: pointer;
-    color: #00acac;
-    margin-left: 5px;
-}
-
-.el-table .el-dropdown, .el-icon-arrow-down {
-    font-size: 12px;
-}
-
-.el-tree-node__content > .el-checkbox {
-    margin-right: 8px;
-}
-
-.list-group-striped > .list-group-item {
-    border-left: 0;
-    border-right: 0;
-    border-radius: 0;
-    padding-left: 0;
-    padding-right: 0;
-}
-
-.list-group {
-    padding-left: 0px;
-    list-style: none;
-}
-
-.list-group-item {
-    border-bottom: 1px solid #e7eaec;
-    border-top: 1px solid #e7eaec;
-    margin-bottom: -1px;
-    padding: 11px 0px;
-    font-size: 13px;
-}
-
-.pull-right {
-    float: right !important;
-}
-
-.el-card__header {
-    padding: 14px 15px 7px;
-    min-height: 40px;
-}
-
-.el-card__body {
-    padding: 15px 20px 20px 20px;
-}
-
-.card-box {
-    padding-right: 15px;
-    padding-left: 15px;
-    margin-bottom: 10px;
-}
-
-/* button color */
-.el-button--cyan.is-active,
-.el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-.el-button--cyan:focus,
-.el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
-  color: #FFFFFF;
-}
-
-.el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-/* text color */
-.text-navy {
-    color: #1ab394;
-}
-
-.text-primary {
-    color: inherit;
-}
-
-.text-success {
-    color: #00acac;
-}
-
-.text-info {
-    color: #23c6c8;
-}
-
-.text-warning {
-    color: #f8ac59;
-}
-
-.text-danger {
-    color: #ed5565;
-}
-
-.text-muted {
-    color: #888888;
-}
-
-/* image */
-.img-circle {
-    border-radius: 50%;
-}
-
-.img-lg {
-    width: 120px;
-    height: 120px;
-}
-
-.avatar-upload-preview {
-    position: absolute;
-    top: 50%;
-    transform: translate(50%, -50%);
-    width: 200px;
-    height: 200px;
-    border-radius: 50%;
-    box-shadow: 0 0 4px #ccc;
-    overflow: hidden;
-}
-
-/* 拖拽列样式 */
-.sortable-ghost{
-    opacity: .8;
-    color: #fff!important;
-    background: #42b983!important;
-}
-
-.top-right-btn {
-    position: relative;
-    float: right;
-}
-.no-border {
-  border: none;
-}
-.list-img {
-   width: 58px;
-   height: 48px;
-   border-radius: 5px;
-   border: 1px solid #ccc;
-}
-.list-avatar {
-   width: 45px;
-   height: 45px;
-   border-radius: 30px;
-   border: 1px solid #ccc;
- }
-.el-upload {
-  width: 150px;
-  height: 150px;
-  line-height: 150px;
-}
-.mini-btn {
-   padding: 4px 8px 4px 8px;
-}
-.status-active {
-   color: #52c41a;
-   background: #f6ffed;
-   border: #b7eb8f solid 1px;
-   border-radius: 20px;
-   display: block;
-   font-size: 90%;
-   text-align: center;
-}
-.status-disabled {
-   color: #f5222d;
-   background: #fff1f0;
-   border: #ffa39e solid 1px;
-   border-radius: 20px;
-   font-size: 90%;
-   display: block;
-   text-align: center;
-}
-.status-normal {
-   color: #666666;
-   background: #ffffff;
-   border: #666666 solid 1px;
-   border-radius: 20px;
-   display: block;
-   font-size: 90%;
-   text-align: center;
-   cursor: pointer;
-}
-.nav-icon {
-  cursor: pointer;
-}
-.nav-tool {
-    cursor: pointer;
-    text-align: center;
-   .icon {
-      margin-left: 10px;
-      margin-top: 6px;
-      width: 25px;
-      height: 25px;
-      clear: both;
-      display: block;
-   }
-   .name {
-      font-size: 12px;
-      clear: both;
-      padding: 0px;
-      margin: 0px;
-      line-height: 20px;
-      font-weight: bold;
-   }
-}
-.main-search {
-  background: #f5f5f5;
-  padding: 10px;
-  border-radius: 3px;
-  margin-bottom: 3px;
-  border: solid 1px #cccccc;
-}
diff --git a/fuintAdmin_zt/src/assets/styles/index.scss b/fuintAdmin_zt/src/assets/styles/index.scss
deleted file mode 100644
index defa70e9b..000000000
--- a/fuintAdmin_zt/src/assets/styles/index.scss
+++ /dev/null
@@ -1,192 +0,0 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-@import './btn.scss';
-
-body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-label {
-  font-weight: 700;
-}
-
-html {
-  height: 100%;
-  box-sizing: border-box;
-}
-
-#app {
-  height: 100%;
-}
-
-*,
-*:before,
-*:after {
-  box-sizing: inherit;
-}
-
-.no-padding {
-  padding: 0px !important;
-}
-
-.padding-content {
-  padding: 4px 0;
-}
-
-a:focus,
-a:active {
-  outline: none;
-}
-
-a,
-a:focus,
-a:hover {
-  cursor: pointer;
-  color: inherit;
-  text-decoration: none;
-}
-
-div:focus {
-  outline: none;
-}
-
-.fr {
-  float: right;
-}
-
-.fl {
-  float: left;
-}
-
-.pr-5 {
-  padding-right: 5px;
-}
-
-.pl-5 {
-  padding-left: 5px;
-}
-
-.block {
-  display: block;
-}
-
-.pointer {
-  cursor: pointer;
-}
-
-.inlineBlock {
-  display: block;
-}
-
-.clearfix {
-  &:after {
-    visibility: hidden;
-    display: block;
-    font-size: 0;
-    content: " ";
-    clear: both;
-    height: 0;
-  }
-}
-
-aside {
-  background: #eef1f6;
-  padding: 8px 24px;
-  margin-bottom: 20px;
-  border-radius: 2px;
-  display: block;
-  line-height: 32px;
-  font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  color: #2c3e50;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
-  a {
-    color: #337ab7;
-    cursor: pointer;
-
-    &:hover {
-      color: rgb(32, 160, 255);
-    }
-  }
-}
-
-//main-container全局样式
-.app-container {
-  padding: 20px;
-}
-
-.components-container {
-  margin: 30px 50px;
-  position: relative;
-}
-
-.pagination-container {
-  margin-top: 30px;
-
-}
-
-.text-center {
-  text-align: center
-}
-
-.sub-navbar {
-  height: 50px;
-  line-height: 50px;
-  position: relative;
-  width: 100%;
-  text-align: right;
-  padding-right: 20px;
-  transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
-
-  .subtitle {
-    font-size: 20px;
-    color: #fff;
-  }
-
-  &.draft {
-    background: #d0d0d0;
-  }
-
-  &.deleted {
-    background: #d0d0d0;
-  }
-}
-
-.link-type,
-.link-type:focus {
-  color: #337ab7;
-  cursor: pointer;
-
-  &:hover {
-    color: rgb(32, 160, 255);
-  }
-}
-
-.filter-container {
-  padding-bottom: 10px;
-
-  .filter-item {
-    display: inline-block;
-    vertical-align: middle;
-    margin-bottom: 10px;
-  }
-}
-
-//refine vue-multiselect plugin
-.multiselect {
-  line-height: 16px;
-}
-
-.multiselect--active {
-  z-index: 1000 !important;
-}
diff --git a/fuintAdmin_zt/src/assets/styles/mixin.scss b/fuintAdmin_zt/src/assets/styles/mixin.scss
deleted file mode 100644
index 06fa06125..000000000
--- a/fuintAdmin_zt/src/assets/styles/mixin.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-@mixin clearfix {
-  &:after {
-    content: "";
-    display: table;
-    clear: both;
-  }
-}
-
-@mixin scrollBar {
-  &::-webkit-scrollbar-track-piece {
-    background: #d3dce6;
-  }
-
-  &::-webkit-scrollbar {
-    width: 6px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: #99a9bf;
-    border-radius: 20px;
-  }
-}
-
-@mixin relative {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-@mixin pct($pct) {
-  width: #{$pct};
-  position: relative;
-  margin: 0 auto;
-}
-
-@mixin triangle($width, $height, $color, $direction) {
-  $width: $width/2;
-  $color-border-style: $height solid $color;
-  $transparent-border-style: $width solid transparent;
-  height: 0;
-  width: 0;
-
-  @if $direction==up {
-    border-bottom: $color-border-style;
-    border-left: $transparent-border-style;
-    border-right: $transparent-border-style;
-  }
-
-  @else if $direction==right {
-    border-left: $color-border-style;
-    border-top: $transparent-border-style;
-    border-bottom: $transparent-border-style;
-  }
-
-  @else if $direction==down {
-    border-top: $color-border-style;
-    border-left: $transparent-border-style;
-    border-right: $transparent-border-style;
-  }
-
-  @else if $direction==left {
-    border-right: $color-border-style;
-    border-top: $transparent-border-style;
-    border-bottom: $transparent-border-style;
-  }
-}
diff --git a/fuintAdmin_zt/src/assets/styles/sidebar.scss b/fuintAdmin_zt/src/assets/styles/sidebar.scss
deleted file mode 100644
index 8b8b3c604..000000000
--- a/fuintAdmin_zt/src/assets/styles/sidebar.scss
+++ /dev/null
@@ -1,251 +0,0 @@
-#app {
-
-  .main-container {
-    min-height: 100%;
-    transition: margin-left .28s;
-    margin-left: $base-sidebar-width;
-    position: relative;
-  }
-
-  .sidebarHide {
-    margin-left: 0!important;
-  }
-
-  .sidebar-container {
-    -webkit-transition: width .28s;
-    transition: width 0.28s;
-    width: $base-sidebar-width !important;
-    background-color: $base-menu-background;
-    height: 100%;
-    position: fixed;
-    font-size: 0px;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1001;
-    overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    margin-bottom: 100px;
-    // reset element-ui css
-    .horizontal-collapse-transition {
-      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
-    }
-
-    .scrollbar-wrapper {
-      overflow-x: hidden !important;
-    }
-
-    .el-scrollbar__bar.is-vertical {
-      right: 0px;
-    }
-
-    .el-scrollbar {
-      height: 100%;
-    }
-
-    &.has-logo {
-      .el-scrollbar {
-        height: calc(100% - 50px);
-      }
-    }
-
-    .is-horizontal {
-      display: none;
-    }
-
-    a {
-      display: inline-block;
-      width: 100%;
-      overflow: hidden;
-    }
-
-    .svg-icon {
-      margin-right: 16px;
-    }
-
-    .el-menu {
-      border: none;
-      height: 100%;
-      width: 100% !important;
-    }
-
-    .el-menu-item, .el-submenu__title {
-      overflow: hidden !important;
-      text-overflow: ellipsis !important;
-      white-space: nowrap !important;
-      height: 48px;
-      line-height: 48px;
-    }
-
-    // menu hover
-    .submenu-title-noDropdown,
-    .el-submenu__title {
-      height: var(--sidebar-height);
-      &:hover {
-        background-color: rgba(0, 0, 0, 0.06) !important;
-      }
-    }
-
-    & .theme-dark .is-active > .el-submenu__title {
-      color: white !important;
-      background: linear-gradient( 229deg, #FF8646 0%, #FFA360 100%) !important;
-      //border-top-left-radius: 8px !important; /* 左上圆角 */
-      //border-top-right-radius: 8px !important; /* 右上圆角 */
-      border-radius: 8px;
-      i {
-        color: #fff !important;
-      }
-    }
-
-    & .nest-menu .el-submenu>.el-submenu__title,
-    & .el-submenu .el-menu-item {
-      min-width: $base-sidebar-width !important;
-      background: red;
-      &:hover {
-        background-color: rgba(0, 0, 0, 0.06) !important;
-      }
-    }
-
-    & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
-    & .theme-dark .el-submenu .el-menu-item {
-      background-color: $base-sub-menu-background !important;
-
-      &:hover {
-        background-color: $base-sub-menu-hover !important;
-      }
-    }
-
-    .el-menu-item.is-active {
-      color: #FF9655 !important;
-      //菜单点击上的背景颜色
-      background: linear-gradient( 229deg, #FFEFE5 0%, #FFEFE5 100%) !important;
-    }
-
-  }
-
-  .hideSidebar {
-    .sidebar-container {
-      width: 70px !important;
-    }
-
-    .main-container {
-      margin-left: 70px;
-    }
-
-    .submenu-title-noDropdown {
-      padding: 0 !important;
-      position: relative;
-      .el-tooltip {
-        padding: 0 !important;
-
-        .svg-icon {
-          margin-left: 20px;
-        }
-      }
-    }
-
-    .el-submenu {
-      overflow: hidden;
-
-      &>.el-submenu__title {
-        padding: 0 !important;
-
-        .svg-icon {
-          margin-left: 20px;
-        }
-
-      }
-    }
-
-    .el-menu--collapse {
-      .el-submenu {
-        &>.el-submenu__title {
-          &>span {
-            height: 60px;
-            width: 70px;
-            overflow: hidden;
-            visibility: hidden;
-            display: inline-block;
-          }
-        }
-      }
-    }
-  }
-
-  .el-menu--collapse .el-menu .el-submenu {
-    min-width: $base-sidebar-width !important;
-  }
-
-  // mobile responsive
-  .mobile {
-    .main-container {
-      margin-left: 0px;
-    }
-
-    .sidebar-container {
-      transition: transform .28s;
-      width: $base-sidebar-width !important;
-    }
-
-    &.hideSidebar {
-      .sidebar-container {
-        pointer-events: none;
-        transition-duration: 0.3s;
-        transform: translate3d(-$base-sidebar-width, 0, 0);
-      }
-    }
-  }
-
-  .withoutAnimation {
-
-    .main-container,
-    .sidebar-container {
-      transition: none;
-    }
-  }
-}
-
-// when menu collapsed
-.el-menu--vertical {
-  &>.el-menu {
-    .svg-icon {
-      margin-right: 16px;
-    }
-  }
-
-  .el-menu-item.is-active {
-    color: white !important;
-    //菜单点击上的背景颜色
-    background: linear-gradient( 229deg, #FF9655 0%, #FF9655 100%) !important;
-  }
-
-  .nest-menu .el-submenu>.el-submenu__title,
-  .el-menu-item {
-    background-color: #FFFAF6 !important;
-    &:hover {
-      // you can use $subMenuHover
-      color: #FFA46B !important;
-      background-color: #FFEBDD !important;
-    }
-  }
-
-  // the scroll bar appears when the subMenu is too long
-  >.el-menu--popup {
-    max-height: 100vh;
-    overflow-y: auto;
-
-    &::-webkit-scrollbar-track-piece {
-      background: #d3dce6;
-    }
-
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: #99a9bf;
-      border-radius: 20px;
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/assets/styles/transition.scss b/fuintAdmin_zt/src/assets/styles/transition.scss
deleted file mode 100644
index 4cb27cc81..000000000
--- a/fuintAdmin_zt/src/assets/styles/transition.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-// global transition css
-
-/* fade */
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.28s;
-}
-
-.fade-enter,
-.fade-leave-active {
-  opacity: 0;
-}
-
-/* fade-transform */
-.fade-transform-leave-active,
-.fade-transform-enter-active {
-  transition: all .5s;
-}
-
-.fade-transform-enter {
-  opacity: 0;
-  transform: translateX(-30px);
-}
-
-.fade-transform-leave-to {
-  opacity: 0;
-  transform: translateX(30px);
-}
-
-/* breadcrumb transition */
-.breadcrumb-enter-active,
-.breadcrumb-leave-active {
-  transition: all .5s;
-}
-
-.breadcrumb-enter,
-.breadcrumb-leave-active {
-  opacity: 0;
-  transform: translateX(20px);
-}
-
-.breadcrumb-move {
-  transition: all .5s;
-}
-
-.breadcrumb-leave-active {
-  position: absolute;
-}
diff --git a/fuintAdmin_zt/src/assets/styles/variables.scss b/fuintAdmin_zt/src/assets/styles/variables.scss
deleted file mode 100644
index 994dc33ee..000000000
--- a/fuintAdmin_zt/src/assets/styles/variables.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-// base color
-$blue:#324157;
-$light-blue:#3A71A8;
-$red:#C03639;
-$pink: #E65D6E;
-$green: #30B08F;
-$tiffany: #4AB7BD;
-$yellow:#FEC171;
-$panGreen: #30B08F;
-
-// 默认菜单主题风格
-$base-menu-color:#727171;// 菜单全部字体颜色
-$base-menu-color-active:#FF9655;// 父级菜单激活的字体颜色
-$base-menu-background:#fff;
-$base-logo-title-color: #FF9655;
-
-$base-menu-light-color:#ffffff;
-$base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #FF9655;
-
-$base-sub-menu-background: #FFFAF6;//展开的背景色
-$base-sub-menu-hover: #FFEFE5;
-
-$base-sidebar-width: 200px;
-
-// the :export directive is the magic sauce for webpack
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
-:export {
-  menuColor: $base-menu-color;
-  menuLightColor: $base-menu-light-color;
-  menuColorActive: $base-menu-color-active;
-  menuBackground: $base-menu-background;
-  menuLightBackground: $base-menu-light-background;
-  subMenuBackground: $base-sub-menu-background;
-  subMenuHover: $base-sub-menu-hover;
-  sideBarWidth: $base-sidebar-width;
-  logoTitleColor: $base-logo-title-color;
-  logoLightTitleColor: $base-logo-light-title-color
-}
diff --git a/fuintAdmin_zt/src/components/Breadcrumb/index.vue b/fuintAdmin_zt/src/components/Breadcrumb/index.vue
deleted file mode 100644
index 1696f5471..000000000
--- a/fuintAdmin_zt/src/components/Breadcrumb/index.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
-    <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
-    </transition-group>
-  </el-breadcrumb>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      levelList: null
-    }
-  },
-  watch: {
-    $route(route) {
-      // if you go to the redirect page, do not update the breadcrumbs
-      if (route.path.startsWith('/redirect/')) {
-        return
-      }
-      this.getBreadcrumb()
-    }
-  },
-  created() {
-    this.getBreadcrumb()
-  },
-  methods: {
-    getBreadcrumb() {
-      // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const first = matched[0]
-
-      if (!this.isDashboard(first)) {
-        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
-      }
-
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-    },
-    isDashboard(route) {
-      const name = route && route.name
-      if (!name) {
-        return false
-      }
-      return name.trim() === 'Index'
-    },
-    handleLink(item) {
-      const { redirect, path } = item
-      if (redirect) {
-        this.$router.push(redirect)
-        return
-      }
-      this.$router.push(path)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-breadcrumb.el-breadcrumb {
-  display: inline-block;
-  font-size: 14px;
-  line-height: 50px;
-  margin-left: 8px;
-
-  .no-redirect {
-    color: #97a8be;
-    cursor: text;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/Crontab/day.vue b/fuintAdmin_zt/src/components/Crontab/day.vue
deleted file mode 100644
index 19ba77313..000000000
--- a/fuintAdmin_zt/src/components/Crontab/day.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-    <el-form size="small">
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
-                日，允许的通配符[, - * ? / L W]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
-                不指定
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
-                周期从
-                <el-input-number v-model='cycle01' :min="1" :max="30" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="31" /> 日
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
-                从
-                <el-input-number v-model='average01' :min="1" :max="30" /> 号开始，每
-                <el-input-number v-model='average02' :min="1" :max="31 - average01 || 1" /> 日执行一次
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="5">
-                每月
-                <el-input-number v-model='workday' :min="1" :max="31" /> 号最近的那个工作日
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="6">
-                本月最后一天
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="7">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-                    <el-option v-for="item in 31" :key="item" :value="item">{{item}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-    </el-form>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            radioValue: 1,
-            workday: 1,
-            cycle01: 1,
-            cycle02: 2,
-            average01: 1,
-            average02: 1,
-            checkboxList: [],
-            checkNum: this.$options.propsData.check
-        }
-    },
-    name: 'crontab-day',
-    props: ['check', 'cron'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            ('day rachange');
-            if (this.radioValue !== 2 && this.cron.week !== '?') {
-                this.$emit('update', 'week', '?', 'day')
-            }
-
-            switch (this.radioValue) {
-                case 1:
-                    this.$emit('update', 'day', '*');
-                    break;
-                case 2:
-                    this.$emit('update', 'day', '?');
-                    break;
-                case 3:
-                    this.$emit('update', 'day', this.cycleTotal);
-                    break;
-                case 4:
-                    this.$emit('update', 'day', this.averageTotal);
-                    break;
-                case 5:
-                    this.$emit('update', 'day', this.workday + 'W');
-                    break;
-                case 6:
-                    this.$emit('update', 'day', 'L');
-                    break;
-                case 7:
-                    this.$emit('update', 'day', this.checkboxString);
-                    break;
-            }
-            ('day rachange end');
-        },
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'day', this.cycleTotal);
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'day', this.averageTotal);
-            }
-        },
-        // 最近工作日值变化时
-        workdayChange() {
-            if (this.radioValue == '5') {
-                this.$emit('update', 'day', this.workdayCheck + 'W');
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '7') {
-                this.$emit('update', 'day', this.checkboxString);
-            }
-        }
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'workdayCheck': 'workdayChange',
-        'checkboxString': 'checkboxChange',
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            const cycle01 = this.checkNum(this.cycle01, 1, 30)
-            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 31, 31)
-            return cycle01 + '-' + cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            const average01 = this.checkNum(this.average01, 1, 30)
-            const average02 = this.checkNum(this.average02, 1, 31 - average01 || 0)
-            return average01 + '/' + average02;
-        },
-        // 计算工作日格式
-        workdayCheck: function () {
-            const workday = this.checkNum(this.workday, 1, 31)
-            return workday;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str == '' ? '*' : str;
-        }
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/hour.vue b/fuintAdmin_zt/src/components/Crontab/hour.vue
deleted file mode 100644
index 1c171c1d5..000000000
--- a/fuintAdmin_zt/src/components/Crontab/hour.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-    <el-form size="small">
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
-                小时，允许的通配符[, - * /]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
-                周期从
-                <el-input-number v-model='cycle01' :min="0" :max="22" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="23" /> 小时
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
-                从
-                <el-input-number v-model='average01' :min="0" :max="22" /> 小时开始，每
-                <el-input-number v-model='average02' :min="1" :max="23 - average01 || 0" /> 小时执行一次
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-                    <el-option v-for="item in 24" :key="item" :value="item-1">{{item-1}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-    </el-form>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            radioValue: 1,
-            cycle01: 0,
-            cycle02: 1,
-            average01: 0,
-            average02: 1,
-            checkboxList: [],
-            checkNum: this.$options.propsData.check
-        }
-    },
-    name: 'crontab-hour',
-    props: ['check', 'cron'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            switch (this.radioValue) {
-                case 1:
-            this.$emit('update', 'hour', '*')
-            break;
-                case 2:
-                    this.$emit('update', 'hour', this.cycleTotal);
-                    break;
-                case 3:
-                    this.$emit('update', 'hour', this.averageTotal);
-                    break;
-                case 4:
-                    this.$emit('update', 'hour', this.checkboxString);
-                    break;
-            }
-        },
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '2') {
-                this.$emit('update', 'hour', this.cycleTotal);
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'hour', this.averageTotal);
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'hour', this.checkboxString);
-            }
-        }
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'checkboxString': 'checkboxChange'
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            const cycle01 = this.checkNum(this.cycle01, 0, 22)
-            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 23)
-            return cycle01 + '-' + cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            const average01 = this.checkNum(this.average01, 0, 22)
-            const average02 = this.checkNum(this.average02, 1, 23 - average01 || 0)
-            return average01 + '/' + average02;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str == '' ? '*' : str;
-        }
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/index.vue b/fuintAdmin_zt/src/components/Crontab/index.vue
deleted file mode 100644
index 3963df28e..000000000
--- a/fuintAdmin_zt/src/components/Crontab/index.vue
+++ /dev/null
@@ -1,430 +0,0 @@
-<template>
-  <div>
-    <el-tabs type="border-card">
-      <el-tab-pane label="秒" v-if="shouldHide('second')">
-        <CrontabSecond
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronsecond"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="分钟" v-if="shouldHide('min')">
-        <CrontabMin
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmin"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="小时" v-if="shouldHide('hour')">
-        <CrontabHour
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronhour"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="日" v-if="shouldHide('day')">
-        <CrontabDay
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronday"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="月" v-if="shouldHide('month')">
-        <CrontabMonth
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmonth"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="周" v-if="shouldHide('week')">
-        <CrontabWeek
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronweek"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="年" v-if="shouldHide('year')">
-        <CrontabYear
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronyear"
-        />
-      </el-tab-pane>
-    </el-tabs>
-
-    <div class="popup-main">
-      <div class="popup-result">
-        <p class="title">时间表达式</p>
-        <table>
-          <thead>
-            <th v-for="item of tabTitles" width="40" :key="item">{{item}}</th>
-            <th>Cron 表达式</th>
-          </thead>
-          <tbody>
-            <td>
-              <span>{{crontabValueObj.second}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.min}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.hour}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.day}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.month}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.week}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueObj.year}}</span>
-            </td>
-            <td>
-              <span>{{crontabValueString}}</span>
-            </td>
-          </tbody>
-        </table>
-      </div>
-      <CrontabResult :ex="crontabValueString"></CrontabResult>
-
-      <div class="pop_btn">
-        <el-button size="small" type="primary" @click="submitFill">确定</el-button>
-        <el-button size="small" type="warning" @click="clearCron">重置</el-button>
-        <el-button size="small" @click="hidePopup">取消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import CrontabSecond from "./second.vue";
-import CrontabMin from "./min.vue";
-import CrontabHour from "./hour.vue";
-import CrontabDay from "./day.vue";
-import CrontabMonth from "./month.vue";
-import CrontabWeek from "./week.vue";
-import CrontabYear from "./year.vue";
-import CrontabResult from "./result.vue";
-
-export default {
-  data() {
-    return {
-      tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
-      tabActive: 0,
-      myindex: 0,
-      crontabValueObj: {
-        second: "*",
-        min: "*",
-        hour: "*",
-        day: "*",
-        month: "*",
-        week: "?",
-        year: "",
-      },
-    };
-  },
-  name: "vcrontab",
-  props: ["expression", "hideComponent"],
-  methods: {
-    shouldHide(key) {
-      if (this.hideComponent && this.hideComponent.includes(key)) return false;
-      return true;
-    },
-    resolveExp() {
-      // 反解析 表达式
-      if (this.expression) {
-        let arr = this.expression.split(" ");
-        if (arr.length >= 6) {
-          //6 位以上是合法表达式
-          let obj = {
-            second: arr[0],
-            min: arr[1],
-            hour: arr[2],
-            day: arr[3],
-            month: arr[4],
-            week: arr[5],
-            year: arr[6] ? arr[6] : "",
-          };
-          this.crontabValueObj = {
-            ...obj,
-          };
-          for (let i in obj) {
-            if (obj[i]) this.changeRadio(i, obj[i]);
-          }
-        }
-      } else {
-        // 没有传入的表达式 则还原
-        this.clearCron();
-      }
-    },
-    // tab切换值
-    tabCheck(index) {
-      this.tabActive = index;
-    },
-    // 由子组件触发，更改表达式组成的字段值
-    updateCrontabValue(name, value, from) {
-      "updateCrontabValue", name, value, from;
-      this.crontabValueObj[name] = value;
-      if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
-        this.changeRadio(name, value);
-      }
-    },
-    // 赋值到组件
-    changeRadio(name, value) {
-      let arr = ["second", "min", "hour", "month"],
-        refName = "cron" + name,
-        insValue;
-
-      if (!this.$refs[refName]) return;
-
-      if (arr.includes(name)) {
-        if (value === "*") {
-          insValue = 1;
-        } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 2;
-        } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1];
-          insValue = 3;
-        } else {
-          insValue = 4;
-          this.$refs[refName].checkboxList = value.split(",");
-        }
-      } else if (name == "day") {
-        if (value === "*") {
-          insValue = 1;
-        } else if (value == "?") {
-          insValue = 2;
-        } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 3;
-        } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1];
-          insValue = 4;
-        } else if (value.indexOf("W") > -1) {
-          let indexArr = value.split("W");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].workday = 0)
-            : (this.$refs[refName].workday = indexArr[0]);
-          insValue = 5;
-        } else if (value === "L") {
-          insValue = 6;
-        } else {
-          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 7;
-        }
-      } else if (name == "week") {
-        if (value === "*") {
-          insValue = 1;
-        } else if (value == "?") {
-          insValue = 2;
-        } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 3;
-        } else if (value.indexOf("#") > -1) {
-          let indexArr = value.split("#");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].average01 = 1)
-            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1];
-          insValue = 4;
-        } else if (value.indexOf("L") > -1) {
-          let indexArr = value.split("L");
-          isNaN(indexArr[0])
-            ? (this.$refs[refName].weekday = 1)
-            : (this.$refs[refName].weekday = indexArr[0]);
-          insValue = 5;
-        } else {
-          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 6;
-        }
-      } else if (name == "year") {
-        if (value == "") {
-          insValue = 1;
-        } else if (value == "*") {
-          insValue = 2;
-        } else if (value.indexOf("-") > -1) {
-          insValue = 3;
-        } else if (value.indexOf("/") > -1) {
-          insValue = 4;
-        } else {
-          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 5;
-        }
-      }
-      this.$refs[refName].radioValue = insValue;
-    },
-    // 表单选项的子组件校验数字格式（通过-props传递）
-    checkNumber(value, minLimit, maxLimit) {
-      // 检查必须为整数
-      value = Math.floor(value);
-      if (value < minLimit) {
-        value = minLimit;
-      } else if (value > maxLimit) {
-        value = maxLimit;
-      }
-      return value;
-    },
-    // 隐藏弹窗
-    hidePopup() {
-      this.$emit("hide");
-    },
-    // 填充表达式
-    submitFill() {
-      this.$emit("fill", this.crontabValueString);
-      this.hidePopup();
-    },
-    clearCron() {
-      // 还原选择项
-      ("准备还原");
-      this.crontabValueObj = {
-        second: "*",
-        min: "*",
-        hour: "*",
-        day: "*",
-        month: "*",
-        week: "?",
-        year: "",
-      };
-      for (let j in this.crontabValueObj) {
-        this.changeRadio(j, this.crontabValueObj[j]);
-      }
-    },
-  },
-  computed: {
-    crontabValueString: function() {
-      let obj = this.crontabValueObj;
-      let str =
-        obj.second +
-        " " +
-        obj.min +
-        " " +
-        obj.hour +
-        " " +
-        obj.day +
-        " " +
-        obj.month +
-        " " +
-        obj.week +
-        (obj.year == "" ? "" : " " + obj.year);
-      return str;
-    },
-  },
-  components: {
-    CrontabSecond,
-    CrontabMin,
-    CrontabHour,
-    CrontabDay,
-    CrontabMonth,
-    CrontabWeek,
-    CrontabYear,
-    CrontabResult,
-  },
-  watch: {
-    expression: "resolveExp",
-    hideComponent(value) {
-      // 隐藏部分组件
-    },
-  },
-  mounted: function() {
-    this.resolveExp();
-  },
-};
-</script>
-<style scoped>
-.pop_btn {
-  text-align: center;
-  margin-top: 20px;
-}
-.popup-main {
-  position: relative;
-  margin: 10px auto;
-  background: #fff;
-  border-radius: 5px;
-  font-size: 12px;
-  overflow: hidden;
-}
-.popup-title {
-  overflow: hidden;
-  line-height: 34px;
-  padding-top: 6px;
-  background: #f2f2f2;
-}
-.popup-result {
-  box-sizing: border-box;
-  line-height: 24px;
-  margin: 25px auto;
-  padding: 15px 10px 10px;
-  border: 1px solid #ccc;
-  position: relative;
-}
-.popup-result .title {
-  position: absolute;
-  top: -28px;
-  left: 50%;
-  width: 140px;
-  font-size: 14px;
-  margin-left: -70px;
-  text-align: center;
-  line-height: 30px;
-  background: #fff;
-}
-.popup-result table {
-  text-align: center;
-  width: 100%;
-  margin: 0 auto;
-}
-.popup-result table span {
-  display: block;
-  width: 100%;
-  font-family: arial;
-  line-height: 30px;
-  height: 30px;
-  white-space: nowrap;
-  overflow: hidden;
-  border: 1px solid #e8e8e8;
-}
-.popup-result-scroll {
-  font-size: 12px;
-  line-height: 24px;
-  height: 10em;
-  overflow-y: auto;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/Crontab/min.vue b/fuintAdmin_zt/src/components/Crontab/min.vue
deleted file mode 100644
index 685a9ccdf..000000000
--- a/fuintAdmin_zt/src/components/Crontab/min.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-    <el-form size="small">
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
-                分钟，允许的通配符[, - * /]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
-                周期从
-                <el-input-number v-model='cycle01' :min="0" :max="58" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59" /> 分钟
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
-                从
-                <el-input-number v-model='average01' :min="0" :max="58" /> 分钟开始，每
-                <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0" /> 分钟执行一次
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-                    <el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-    </el-form>
-
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            radioValue: 1,
-            cycle01: 1,
-            cycle02: 2,
-            average01: 0,
-            average02: 1,
-            checkboxList: [],
-            checkNum: this.$options.propsData.check
-        }
-    },
-    name: 'crontab-min',
-    props: ['check', 'cron'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            switch (this.radioValue) {
-                case 1:
-                    this.$emit('update', 'min', '*', 'min');
-                    break;
-                case 2:
-                    this.$emit('update', 'min', this.cycleTotal, 'min');
-                    break;
-                case 3:
-                    this.$emit('update', 'min', this.averageTotal, 'min');
-                    break;
-                case 4:
-                    this.$emit('update', 'min', this.checkboxString, 'min');
-                    break;
-            }
-        },
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '2') {
-                this.$emit('update', 'min', this.cycleTotal, 'min');
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'min', this.averageTotal, 'min');
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'min', this.checkboxString, 'min');
-            }
-        },
-
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'checkboxString': 'checkboxChange',
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            const cycle01 = this.checkNum(this.cycle01, 0, 58)
-            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
-            return cycle01 + '-' + cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            const average01 = this.checkNum(this.average01, 0, 58)
-            const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
-            return average01 + '/' + average02;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str == '' ? '*' : str;
-        }
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/month.vue b/fuintAdmin_zt/src/components/Crontab/month.vue
deleted file mode 100644
index 5e0008e28..000000000
--- a/fuintAdmin_zt/src/components/Crontab/month.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-    <el-form size='small'>
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
-                月，允许的通配符[, - * /]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
-                周期从
-                <el-input-number v-model='cycle01' :min="1" :max="11" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="12" /> 月
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
-                从
-                <el-input-number v-model='average01' :min="1" :max="11" /> 月开始，每
-                <el-input-number v-model='average02' :min="1" :max="12 - average01 || 0" /> 月月执行一次
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-                    <el-option v-for="item in 12" :key="item" :value="item">{{item}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-    </el-form>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            radioValue: 1,
-            cycle01: 1,
-            cycle02: 2,
-            average01: 1,
-            average02: 1,
-            checkboxList: [],
-            checkNum: this.check
-        }
-    },
-    name: 'crontab-month',
-    props: ['check', 'cron'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            switch (this.radioValue) {
-                case 1:
-                    this.$emit('update', 'month', '*');
-                    break;
-                case 2:
-                    this.$emit('update', 'month', this.cycleTotal);
-                    break;
-                case 3:
-                    this.$emit('update', 'month', this.averageTotal);
-                    break;
-                case 4:
-                    this.$emit('update', 'month', this.checkboxString);
-                    break;
-            }
-        },
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '2') {
-                this.$emit('update', 'month', this.cycleTotal);
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'month', this.averageTotal);
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'month', this.checkboxString);
-            }
-        }
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'checkboxString': 'checkboxChange'
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            const cycle01 = this.checkNum(this.cycle01, 1, 11)
-            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
-            return cycle01 + '-' + cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            const average01 = this.checkNum(this.average01, 1, 11)
-            const average02 = this.checkNum(this.average02, 1, 12 - average01 || 0)
-            return average01 + '/' + average02;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str == '' ? '*' : str;
-        }
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/result.vue b/fuintAdmin_zt/src/components/Crontab/result.vue
deleted file mode 100644
index ddd8f04be..000000000
--- a/fuintAdmin_zt/src/components/Crontab/result.vue
+++ /dev/null
@@ -1,559 +0,0 @@
-<template>
-    <div class="popup-result">
-        <p class="title">最近5次运行时间</p>
-        <ul class="popup-result-scroll">
-            <template v-if='isShow'>
-                <li v-for='item in resultList' :key="item">{{item}}</li>
-            </template>
-            <li v-else>计算结果中...</li>
-        </ul>
-    </div>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            dayRule: '',
-            dayRuleSup: '',
-            dateArr: [],
-            resultList: [],
-            isShow: false
-        }
-    },
-    name: 'crontab-result',
-    methods: {
-        // 表达式值变化时，开始去计算结果
-        expressionChange() {
-
-            // 计算开始-隐藏结果
-            this.isShow = false;
-            // 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年]
-            let ruleArr = this.$options.propsData.ex.split(' ');
-            // 用于记录进入循环的次数
-            let nums = 0;
-            // 用于暂时存符号时间规则结果的数组
-            let resultArr = [];
-            // 获取当前时间精确至[年、月、日、时、分、秒]
-            let nTime = new Date();
-            let nYear = nTime.getFullYear();
-            let nMonth = nTime.getMonth() + 1;
-            let nDay = nTime.getDate();
-            let nHour = nTime.getHours();
-            let nMin = nTime.getMinutes();
-            let nSecond = nTime.getSeconds();
-            // 根据规则获取到近100年可能年数组、月数组等等
-            this.getSecondArr(ruleArr[0]);
-            this.getMinArr(ruleArr[1]);
-            this.getHourArr(ruleArr[2]);
-            this.getDayArr(ruleArr[3]);
-            this.getMonthArr(ruleArr[4]);
-            this.getWeekArr(ruleArr[5]);
-            this.getYearArr(ruleArr[6], nYear);
-            // 将获取到的数组赋值-方便使用
-            let sDate = this.dateArr[0];
-            let mDate = this.dateArr[1];
-            let hDate = this.dateArr[2];
-            let DDate = this.dateArr[3];
-            let MDate = this.dateArr[4];
-            let YDate = this.dateArr[5];
-            // 获取当前时间在数组中的索引
-            let sIdx = this.getIndex(sDate, nSecond);
-            let mIdx = this.getIndex(mDate, nMin);
-            let hIdx = this.getIndex(hDate, nHour);
-            let DIdx = this.getIndex(DDate, nDay);
-            let MIdx = this.getIndex(MDate, nMonth);
-            let YIdx = this.getIndex(YDate, nYear);
-            // 重置月日时分秒的函数(后面用的比较多)
-            const resetSecond = function () {
-                sIdx = 0;
-                nSecond = sDate[sIdx]
-            }
-            const resetMin = function () {
-                mIdx = 0;
-                nMin = mDate[mIdx]
-                resetSecond();
-            }
-            const resetHour = function () {
-                hIdx = 0;
-                nHour = hDate[hIdx]
-                resetMin();
-            }
-            const resetDay = function () {
-                DIdx = 0;
-                nDay = DDate[DIdx]
-                resetHour();
-            }
-            const resetMonth = function () {
-                MIdx = 0;
-                nMonth = MDate[MIdx]
-                resetDay();
-            }
-            // 如果当前年份不为数组中当前值
-            if (nYear !== YDate[YIdx]) {
-                resetMonth();
-            }
-            // 如果当前月份不为数组中当前值
-            if (nMonth !== MDate[MIdx]) {
-                resetDay();
-            }
-            // 如果当前“日”不为数组中当前值
-            if (nDay !== DDate[DIdx]) {
-                resetHour();
-            }
-            // 如果当前“时”不为数组中当前值
-            if (nHour !== hDate[hIdx]) {
-                resetMin();
-            }
-            // 如果当前“分”不为数组中当前值
-            if (nMin !== mDate[mIdx]) {
-                resetSecond();
-            }
-
-            // 循环年份数组
-            goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) {
-                let YY = YDate[Yi];
-                // 如果到达最大值时
-                if (nMonth > MDate[MDate.length - 1]) {
-                    resetMonth();
-                    continue;
-                }
-                // 循环月份数组
-                goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {
-                    // 赋值、方便后面运算
-                    let MM = MDate[Mi];
-                    MM = MM < 10 ? '0' + MM : MM;
-                    // 如果到达最大值时
-                    if (nDay > DDate[DDate.length - 1]) {
-                        resetDay();
-                        if (Mi == MDate.length - 1) {
-                            resetMonth();
-                            continue goYear;
-                        }
-                        continue;
-                    }
-                    // 循环日期数组
-                    goDay: for (let Di = DIdx; Di < DDate.length; Di++) {
-                        // 赋值、方便后面运算
-                        let DD = DDate[Di];
-                        let thisDD = DD < 10 ? '0' + DD : DD;
-
-                        // 如果到达最大值时
-                        if (nHour > hDate[hDate.length - 1]) {
-                            resetHour();
-                            if (Di == DDate.length - 1) {
-                                resetDay();
-                                if (Mi == MDate.length - 1) {
-                                    resetMonth();
-                                    continue goYear;
-                                }
-                                continue goMonth;
-                            }
-                            continue;
-                        }
-
-                        // 判断日期的合法性，不合法的话也是跳出当前循环
-                        if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
-                            resetDay();
-                            continue goMonth;
-                        }
-                        // 如果日期规则中有值时
-                        if (this.dayRule == 'lastDay') {
-                            // 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天
-
-                            if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                    DD--;
-
-                                    thisDD = DD < 10 ? '0' + DD : DD;
-                                }
-                            }
-                        } else if (this.dayRule == 'workDay') {
-                            // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
-                            if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                    DD--;
-                                    thisDD = DD < 10 ? '0' + DD : DD;
-                                }
-                            }
-                            // 获取达到条件的日期是星期X
-                            let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
-                            // 当星期日时
-                            if (thisWeek == 1) {
-                                // 先找下一个日，并判断是否为月底
-                                DD++;
-                                thisDD = DD < 10 ? '0' + DD : DD;
-                                // 判断下一日已经不是合法日期
-                                if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                    DD -= 3;
-                                }
-                            } else if (thisWeek == 7) {
-                                // 当星期6时只需判断不是1号就可进行操作
-                                if (this.dayRuleSup !== 1) {
-                                    DD--;
-                                } else {
-                                    DD += 2;
-                                }
-                            }
-                        } else if (this.dayRule == 'weekDay') {
-                            // 如果指定了是星期几
-                            // 获取当前日期是属于星期几
-                            let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
-                            // 校验当前星期是否在星期池（dayRuleSup）中
-                            if (this.dayRuleSup.indexOf(thisWeek) < 0) {
-                                // 如果到达最大值时
-                                if (Di == DDate.length - 1) {
-                                    resetDay();
-                                    if (Mi == MDate.length - 1) {
-                                        resetMonth();
-                                        continue goYear;
-                                    }
-                                    continue goMonth;
-                                }
-                                continue;
-                            }
-                        } else if (this.dayRule == 'assWeek') {
-                            // 如果指定了是第几周的星期几
-                            // 获取每月1号是属于星期几
-                            let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
-                            if (this.dayRuleSup[1] >= thisWeek) {
-                                DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1;
-                            } else {
-                                DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1;
-                            }
-                        } else if (this.dayRule == 'lastWeek') {
-                            // 如果指定了每月最后一个星期几
-                            // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
-                            if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-                                    DD--;
-                                    thisDD = DD < 10 ? '0' + DD : DD;
-                                }
-                            }
-                            // 获取月末最后一天是星期几
-                            let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
-                            // 找到要求中最近的那个星期几
-                            if (this.dayRuleSup < thisWeek) {
-                                DD -= thisWeek - this.dayRuleSup;
-                            } else if (this.dayRuleSup > thisWeek) {
-                                DD -= 7 - (this.dayRuleSup - thisWeek)
-                            }
-                        }
-                        // 判断时间值是否小于10置换成“05”这种格式
-                        DD = DD < 10 ? '0' + DD : DD;
-
-                        // 循环“时”数组
-                        goHour: for (let hi = hIdx; hi < hDate.length; hi++) {
-                            let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi]
-
-                            // 如果到达最大值时
-                            if (nMin > mDate[mDate.length - 1]) {
-                                resetMin();
-                                if (hi == hDate.length - 1) {
-                                    resetHour();
-                                    if (Di == DDate.length - 1) {
-                                        resetDay();
-                                        if (Mi == MDate.length - 1) {
-                                            resetMonth();
-                                            continue goYear;
-                                        }
-                                        continue goMonth;
-                                    }
-                                    continue goDay;
-                                }
-                                continue;
-                            }
-                            // 循环"分"数组
-                            goMin: for (let mi = mIdx; mi < mDate.length; mi++) {
-                                let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi];
-
-                                // 如果到达最大值时
-                                if (nSecond > sDate[sDate.length - 1]) {
-                                    resetSecond();
-                                    if (mi == mDate.length - 1) {
-                                        resetMin();
-                                        if (hi == hDate.length - 1) {
-                                            resetHour();
-                                            if (Di == DDate.length - 1) {
-                                                resetDay();
-                                                if (Mi == MDate.length - 1) {
-                                                    resetMonth();
-                                                    continue goYear;
-                                                }
-                                                continue goMonth;
-                                            }
-                                            continue goDay;
-                                        }
-                                        continue goHour;
-                                    }
-                                    continue;
-                                }
-                                // 循环"秒"数组
-                                goSecond: for (let si = sIdx; si <= sDate.length - 1; si++) {
-                                    let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si];
-                                    // 添加当前时间（时间合法性在日期循环时已经判断）
-                                    if (MM !== '00' && DD !== '00') {
-                                        resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss)
-                                        nums++;
-                                    }
-                                    // 如果条数满了就退出循环
-                                    if (nums == 5) break goYear;
-                                    // 如果到达最大值时
-                                    if (si == sDate.length - 1) {
-                                        resetSecond();
-                                        if (mi == mDate.length - 1) {
-                                            resetMin();
-                                            if (hi == hDate.length - 1) {
-                                                resetHour();
-                                                if (Di == DDate.length - 1) {
-                                                    resetDay();
-                                                    if (Mi == MDate.length - 1) {
-                                                        resetMonth();
-                                                        continue goYear;
-                                                    }
-                                                    continue goMonth;
-                                                }
-                                                continue goDay;
-                                            }
-                                            continue goHour;
-                                        }
-                                        continue goMin;
-                                    }
-                                } //goSecond
-                            } //goMin
-                        }//goHour
-                    }//goDay
-                }//goMonth
-            }
-            // 判断100年内的结果条数
-            if (resultArr.length == 0) {
-                this.resultList = ['没有达到条件的结果！'];
-            } else {
-                this.resultList = resultArr;
-                if (resultArr.length !== 5) {
-                    this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果！')
-                }
-            }
-            // 计算完成-显示结果
-            this.isShow = true;
-
-
-        },
-        // 用于计算某位数字在数组中的索引
-        getIndex(arr, value) {
-            if (value <= arr[0] || value > arr[arr.length - 1]) {
-                return 0;
-            } else {
-                for (let i = 0; i < arr.length - 1; i++) {
-                    if (value > arr[i] && value <= arr[i + 1]) {
-                        return i + 1;
-                    }
-                }
-            }
-        },
-        // 获取"年"数组
-        getYearArr(rule, year) {
-            this.dateArr[5] = this.getOrderArr(year, year + 100);
-            if (rule !== undefined) {
-                if (rule.indexOf('-') >= 0) {
-                    this.dateArr[5] = this.getCycleArr(rule, year + 100, false)
-                } else if (rule.indexOf('/') >= 0) {
-                    this.dateArr[5] = this.getAverageArr(rule, year + 100)
-                } else if (rule !== '*') {
-                    this.dateArr[5] = this.getAssignArr(rule)
-                }
-            }
-        },
-        // 获取"月"数组
-        getMonthArr(rule) {
-            this.dateArr[4] = this.getOrderArr(1, 12);
-            if (rule.indexOf('-') >= 0) {
-                this.dateArr[4] = this.getCycleArr(rule, 12, false)
-            } else if (rule.indexOf('/') >= 0) {
-                this.dateArr[4] = this.getAverageArr(rule, 12)
-            } else if (rule !== '*') {
-                this.dateArr[4] = this.getAssignArr(rule)
-            }
-        },
-        // 获取"日"数组-主要为日期规则
-        getWeekArr(rule) {
-            // 只有当日期规则的两个值均为“”时则表达日期是有选项的
-            if (this.dayRule == '' && this.dayRuleSup == '') {
-                if (rule.indexOf('-') >= 0) {
-                    this.dayRule = 'weekDay';
-                    this.dayRuleSup = this.getCycleArr(rule, 7, false)
-                } else if (rule.indexOf('#') >= 0) {
-                    this.dayRule = 'assWeek';
-                    let matchRule = rule.match(/[0-9]{1}/g);
-                    this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])];
-                    this.dateArr[3] = [1];
-                    if (this.dayRuleSup[1] == 7) {
-                        this.dayRuleSup[1] = 0;
-                    }
-                } else if (rule.indexOf('L') >= 0) {
-                    this.dayRule = 'lastWeek';
-                    this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
-                    this.dateArr[3] = [31];
-                    if (this.dayRuleSup == 7) {
-                        this.dayRuleSup = 0;
-                    }
-                } else if (rule !== '*' && rule !== '?') {
-                    this.dayRule = 'weekDay';
-                    this.dayRuleSup = this.getAssignArr(rule)
-                }
-            }
-        },
-        // 获取"日"数组-少量为日期规则
-        getDayArr(rule) {
-            this.dateArr[3] = this.getOrderArr(1, 31);
-            this.dayRule = '';
-            this.dayRuleSup = '';
-            if (rule.indexOf('-') >= 0) {
-                this.dateArr[3] = this.getCycleArr(rule, 31, false)
-                this.dayRuleSup = 'null';
-            } else if (rule.indexOf('/') >= 0) {
-                this.dateArr[3] = this.getAverageArr(rule, 31)
-                this.dayRuleSup = 'null';
-            } else if (rule.indexOf('W') >= 0) {
-                this.dayRule = 'workDay';
-                this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
-                this.dateArr[3] = [this.dayRuleSup];
-            } else if (rule.indexOf('L') >= 0) {
-                this.dayRule = 'lastDay';
-                this.dayRuleSup = 'null';
-                this.dateArr[3] = [31];
-            } else if (rule !== '*' && rule !== '?') {
-                this.dateArr[3] = this.getAssignArr(rule)
-                this.dayRuleSup = 'null';
-            } else if (rule == '*') {
-                this.dayRuleSup = 'null';
-            }
-        },
-        // 获取"时"数组
-        getHourArr(rule) {
-            this.dateArr[2] = this.getOrderArr(0, 23);
-            if (rule.indexOf('-') >= 0) {
-                this.dateArr[2] = this.getCycleArr(rule, 24, true)
-            } else if (rule.indexOf('/') >= 0) {
-                this.dateArr[2] = this.getAverageArr(rule, 23)
-            } else if (rule !== '*') {
-                this.dateArr[2] = this.getAssignArr(rule)
-            }
-        },
-        // 获取"分"数组
-        getMinArr(rule) {
-            this.dateArr[1] = this.getOrderArr(0, 59);
-            if (rule.indexOf('-') >= 0) {
-                this.dateArr[1] = this.getCycleArr(rule, 60, true)
-            } else if (rule.indexOf('/') >= 0) {
-                this.dateArr[1] = this.getAverageArr(rule, 59)
-            } else if (rule !== '*') {
-                this.dateArr[1] = this.getAssignArr(rule)
-            }
-        },
-        // 获取"秒"数组
-        getSecondArr(rule) {
-            this.dateArr[0] = this.getOrderArr(0, 59);
-            if (rule.indexOf('-') >= 0) {
-                this.dateArr[0] = this.getCycleArr(rule, 60, true)
-            } else if (rule.indexOf('/') >= 0) {
-                this.dateArr[0] = this.getAverageArr(rule, 59)
-            } else if (rule !== '*') {
-                this.dateArr[0] = this.getAssignArr(rule)
-            }
-        },
-        // 根据传进来的min-max返回一个顺序的数组
-        getOrderArr(min, max) {
-            let arr = [];
-            for (let i = min; i <= max; i++) {
-                arr.push(i);
-            }
-            return arr;
-        },
-        // 根据规则中指定的零散值返回一个数组
-        getAssignArr(rule) {
-            let arr = [];
-            let assiginArr = rule.split(',');
-            for (let i = 0; i < assiginArr.length; i++) {
-                arr[i] = Number(assiginArr[i])
-            }
-            arr.sort(this.compare)
-            return arr;
-        },
-        // 根据一定算术规则计算返回一个数组
-        getAverageArr(rule, limit) {
-            let arr = [];
-            let agArr = rule.split('/');
-            let min = Number(agArr[0]);
-            let step = Number(agArr[1]);
-            while (min <= limit) {
-                arr.push(min);
-                min += step;
-            }
-            return arr;
-        },
-        // 根据规则返回一个具有周期性的数组
-        getCycleArr(rule, limit, status) {
-            // status--表示是否从0开始（则从1开始）
-            let arr = [];
-            let cycleArr = rule.split('-');
-            let min = Number(cycleArr[0]);
-            let max = Number(cycleArr[1]);
-            if (min > max) {
-                max += limit;
-            }
-            for (let i = min; i <= max; i++) {
-                let add = 0;
-                if (status == false && i % limit == 0) {
-                    add = limit;
-                }
-                arr.push(Math.round(i % limit + add))
-            }
-            arr.sort(this.compare)
-            return arr;
-        },
-        // 比较数字大小（用于Array.sort）
-        compare(value1, value2) {
-            if (value2 - value1 > 0) {
-                return -1;
-            } else {
-                return 1;
-            }
-        },
-        // 格式化日期格式如：2017-9-19 18:04:33
-        formatDate(value, type) {
-            // 计算日期相关值
-            let time = typeof value == 'number' ? new Date(value) : value;
-            let Y = time.getFullYear();
-            let M = time.getMonth() + 1;
-            let D = time.getDate();
-            let h = time.getHours();
-            let m = time.getMinutes();
-            let s = time.getSeconds();
-            let week = time.getDay();
-            // 如果传递了type的话
-            if (type == undefined) {
-                return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
-            } else if (type == 'week') {
-                // 在quartz中 1为星期日
-                return week + 1;
-            }
-        },
-        // 检查日期是否存在
-        checkDate(value) {
-            let time = new Date(value);
-            let format = this.formatDate(time)
-            return value === format;
-        }
-    },
-    watch: {
-        'ex': 'expressionChange'
-    },
-    props: ['ex'],
-    mounted: function () {
-        // 初始化 获取一次结果
-        this.expressionChange();
-    }
-}
-
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/second.vue b/fuintAdmin_zt/src/components/Crontab/second.vue
deleted file mode 100644
index bf381df1b..000000000
--- a/fuintAdmin_zt/src/components/Crontab/second.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-    <el-form size="small">
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
-                秒，允许的通配符[, - * /]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
-                周期从
-                <el-input-number v-model='cycle01' :min="0" :max="58" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59" /> 秒
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
-                从
-                <el-input-number v-model='average01' :min="0" :max="58" /> 秒开始，每
-                <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0" /> 秒执行一次
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-                    <el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-    </el-form>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            radioValue: 1,
-            cycle01: 1,
-            cycle02: 2,
-            average01: 0,
-            average02: 1,
-            checkboxList: [],
-            checkNum: this.$options.propsData.check
-        }
-    },
-    name: 'crontab-second',
-    props: ['check', 'radioParent'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            switch (this.radioValue) {
-                case 1:
-                    this.$emit('update', 'second', '*', 'second');
-                    break;
-                case 2:
-                    this.$emit('update', 'second', this.cycleTotal);
-                    break;
-                case 3:
-                    this.$emit('update', 'second', this.averageTotal);
-                    break;
-                case 4:
-                    this.$emit('update', 'second', this.checkboxString);
-                    break;
-            }
-        },
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '2') {
-                this.$emit('update', 'second', this.cycleTotal);
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'second', this.averageTotal);
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'second', this.checkboxString);
-            }
-        }
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'checkboxString': 'checkboxChange',
-        radioParent() {
-            this.radioValue = this.radioParent
-        }
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            const cycle01 = this.checkNum(this.cycle01, 0, 58)
-            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
-            return cycle01 + '-' + cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            const average01 = this.checkNum(this.average01, 0, 58)
-            const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
-            return average01 + '/' + average02;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str == '' ? '*' : str;
-        }
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/week.vue b/fuintAdmin_zt/src/components/Crontab/week.vue
deleted file mode 100644
index 06d0367e4..000000000
--- a/fuintAdmin_zt/src/components/Crontab/week.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-    <el-form size='small'>
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
-                周，允许的通配符[, - * ? / L #]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
-                不指定
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
-                周期从星期
-                <el-select clearable v-model="cycle01">
-                    <el-option
-                        v-for="(item,index) of weekList"
-                        :key="index"
-                        :label="item.value"
-                        :value="item.key"
-                        :disabled="item.key === 1"
-                    >{{item.value}}</el-option>
-                </el-select>
-                -
-                <el-select clearable v-model="cycle02">
-                    <el-option
-                        v-for="(item,index) of weekList"
-                        :key="index"
-                        :label="item.value"
-                        :value="item.key"
-                        :disabled="item.key < cycle01 && item.key !== 1"
-                    >{{item.value}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
-                第
-                <el-input-number v-model='average01' :min="1" :max="4" /> 周的星期
-                <el-select clearable v-model="average02">
-                    <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="5">
-                本月最后一个星期
-                <el-select clearable v-model="weekday">
-                    <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio v-model='radioValue' :label="6">
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
-                    <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="String(item.key)">{{item.value}}</el-option>
-                </el-select>
-            </el-radio>
-        </el-form-item>
-
-    </el-form>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            radioValue: 2,
-            weekday: 2,
-            cycle01: 2,
-            cycle02: 3,
-            average01: 1,
-            average02: 2,
-            checkboxList: [],
-            weekList: [
-                {
-                    key: 2,
-                    value: '星期一'
-                },
-                {
-                    key: 3,
-                    value: '星期二'
-                },
-                {
-                    key: 4,
-                    value: '星期三'
-                },
-                {
-                    key: 5,
-                    value: '星期四'
-                },
-                {
-                    key: 6,
-                    value: '星期五'
-                },
-                {
-                    key: 7,
-                    value: '星期六'
-                },
-                {
-                    key: 1,
-                    value: '星期日'
-                }
-            ],
-            checkNum: this.$options.propsData.check
-        }
-    },
-    name: 'crontab-week',
-    props: ['check', 'cron'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            if (this.radioValue !== 2 && this.cron.day !== '?') {
-                this.$emit('update', 'day', '?', 'week');
-            }
-            switch (this.radioValue) {
-                case 1:
-                    this.$emit('update', 'week', '*');
-                    break;
-                case 2:
-                    this.$emit('update', 'week', '?');
-                    break;
-                case 3:
-                    this.$emit('update', 'week', this.cycleTotal);
-                    break;
-                case 4:
-                    this.$emit('update', 'week', this.averageTotal);
-                    break;
-                case 5:
-                    this.$emit('update', 'week', this.weekdayCheck + 'L');
-                    break;
-                case 6:
-                    this.$emit('update', 'week', this.checkboxString);
-                    break;
-            }
-        },
-
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'week', this.cycleTotal);
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'week', this.averageTotal);
-            }
-        },
-        // 最近工作日值变化时
-        weekdayChange() {
-            if (this.radioValue == '5') {
-                this.$emit('update', 'week', this.weekday + 'L');
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '6') {
-                this.$emit('update', 'week', this.checkboxString);
-            }
-        },
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'weekdayCheck': 'weekdayChange',
-        'checkboxString': 'checkboxChange',
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            this.cycle01 = this.checkNum(this.cycle01, 1, 7)
-            this.cycle02 = this.checkNum(this.cycle02, 1, 7)
-            return this.cycle01 + '-' + this.cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            this.average01 = this.checkNum(this.average01, 1, 4)
-            this.average02 = this.checkNum(this.average02, 1, 7)
-            return this.average02 + '#' + this.average01;
-        },
-        // 最近的工作日（格式）
-        weekdayCheck: function () {
-            this.weekday = this.checkNum(this.weekday, 1, 7)
-            return this.weekday;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str == '' ? '*' : str;
-        }
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Crontab/year.vue b/fuintAdmin_zt/src/components/Crontab/year.vue
deleted file mode 100644
index 3019a1112..000000000
--- a/fuintAdmin_zt/src/components/Crontab/year.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-    <el-form size="small">
-        <el-form-item>
-            <el-radio :label="1" v-model='radioValue'>
-                不填，允许的通配符[, - * /]
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio :label="2" v-model='radioValue'>
-                每年
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio :label="3" v-model='radioValue'>
-                周期从
-                <el-input-number v-model='cycle01' :min='fullYear' :max="2098" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099" />
-            </el-radio>
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio :label="4" v-model='radioValue'>
-                从
-                <el-input-number v-model='average01' :min='fullYear' :max="2098"/> 年开始，每
-                <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear" /> 年执行一次
-            </el-radio>
-
-        </el-form-item>
-
-        <el-form-item>
-            <el-radio :label="5" v-model='radioValue'>
-                指定
-                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple>
-                    <el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item -1 + fullYear" />
-                </el-select>
-            </el-radio>
-        </el-form-item>
-    </el-form>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            fullYear: 0,
-            radioValue: 1,
-            cycle01: 0,
-            cycle02: 0,
-            average01: 0,
-            average02: 1,
-            checkboxList: [],
-            checkNum: this.$options.propsData.check
-        }
-    },
-    name: 'crontab-year',
-    props: ['check', 'month', 'cron'],
-    methods: {
-        // 单选按钮值变化时
-        radioChange() {
-            switch (this.radioValue) {
-                case 1:
-                    this.$emit('update', 'year', '');
-                    break;
-                case 2:
-                    this.$emit('update', 'year', '*');
-                    break;
-                case 3:
-                    this.$emit('update', 'year', this.cycleTotal);
-                    break;
-                case 4:
-                    this.$emit('update', 'year', this.averageTotal);
-                    break;
-                case 5:
-                    this.$emit('update', 'year', this.checkboxString);
-                    break;
-            }
-        },
-        // 周期两个值变化时
-        cycleChange() {
-            if (this.radioValue == '3') {
-                this.$emit('update', 'year', this.cycleTotal);
-            }
-        },
-        // 平均两个值变化时
-        averageChange() {
-            if (this.radioValue == '4') {
-                this.$emit('update', 'year', this.averageTotal);
-            }
-        },
-        // checkbox值变化时
-        checkboxChange() {
-            if (this.radioValue == '5') {
-                this.$emit('update', 'year', this.checkboxString);
-            }
-        }
-    },
-    watch: {
-        'radioValue': 'radioChange',
-        'cycleTotal': 'cycleChange',
-        'averageTotal': 'averageChange',
-        'checkboxString': 'checkboxChange'
-    },
-    computed: {
-        // 计算两个周期值
-        cycleTotal: function () {
-            const cycle01 = this.checkNum(this.cycle01, this.fullYear, 2098)
-            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
-            return cycle01 + '-' + cycle02;
-        },
-        // 计算平均用到的值
-        averageTotal: function () {
-            const average01 = this.checkNum(this.average01, this.fullYear, 2098)
-            const average02 = this.checkNum(this.average02, 1, 2099 - average01 || this.fullYear)
-            return average01 + '/' + average02;
-        },
-        // 计算勾选的checkbox值合集
-        checkboxString: function () {
-            let str = this.checkboxList.join();
-            return str;
-        }
-    },
-    mounted: function () {
-        // 仅获取当前年份
-        this.fullYear = Number(new Date().getFullYear());
-        this.cycle01 = this.fullYear
-        this.average01 = this.fullYear
-    }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/DictData/index.js b/fuintAdmin_zt/src/components/DictData/index.js
deleted file mode 100644
index c2a0359cc..000000000
--- a/fuintAdmin_zt/src/components/DictData/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Vue from 'vue'
-import DataDict from '@/utils/dict'
-import { getDicts as getDicts } from '@/api/system/dict/data'
-
-function install() {
-  Vue.use(DataDict, {
-    metas: {
-      '*': {
-        labelField: 'dictLabel',
-        valueField: 'dictValue',
-        request(dictMeta) {
-          return getDicts(dictMeta.type).then(res => res.data)
-        },
-      },
-    },
-  })
-}
-
-export default {
-  install,
-}
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/components/DictTag/index.vue b/fuintAdmin_zt/src/components/DictTag/index.vue
deleted file mode 100644
index 4c196c489..000000000
--- a/fuintAdmin_zt/src/components/DictTag/index.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-  <div>
-    <template v-for="(item, index) in options">
-      <template v-if="values.includes(item.value)">
-        <span
-          v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
-          :key="item.value"
-          :index="index"
-          :class="item.raw.cssClass"
-          >{{ item.label }}</span
-        >
-        <el-tag
-          v-else
-          :disable-transitions="true"
-          :key="item.value"
-          :index="index"
-          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
-          :class="item.raw.cssClass"
-        >
-          {{ item.label }}
-        </el-tag>
-      </template>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "DictTag",
-  props: {
-    options: {
-      type: Array,
-      default: null,
-    },
-    value: [Number, String, Array],
-  },
-  computed: {
-    values() {
-      if (this.value !== null && typeof this.value !== 'undefined') {
-        return Array.isArray(this.value) ? this.value : [String(this.value)];
-      } else {
-        return [];
-      }
-    },
-  },
-};
-</script>
-<style scoped>
-.el-tag + .el-tag {
-  margin-left: 10px;
-}
-</style>
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/components/Editor/index.vue b/fuintAdmin_zt/src/components/Editor/index.vue
deleted file mode 100644
index 8edb34edb..000000000
--- a/fuintAdmin_zt/src/components/Editor/index.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <div>
-    <el-upload
-      :action="uploadUrl"
-      :before-upload="handleBeforeUpload"
-      :on-success="handleUploadSuccess"
-      :on-error="handleUploadError"
-      name="file"
-      :show-file-list="false"
-      :headers="headers"
-      style="display: none"
-      ref="upload"
-      v-if="this.type == 'url'"
-    >
-    </el-upload>
-    <div class="editor" ref="editor" :style="styles"></div>
-  </div>
-</template>
-
-<script>
-import Quill from "quill";
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-import { getToken } from "@/utils/auth";
-
-export default {
-  name: "Editor",
-  props: {
-    /* 编辑器的内容 */
-    value: {
-      type: String,
-      default: "",
-    },
-    /* 高度 */
-    height: {
-      type: Number,
-      default: null,
-    },
-    /* 最小高度 */
-    minHeight: {
-      type: Number,
-      default: null,
-    },
-    /* 只读 */
-    readOnly: {
-      type: Boolean,
-      default: false,
-    },
-    // 上传文件大小限制(MB)
-    fileSize: {
-      type: Number,
-      default: 5,
-    },
-    /* 类型（base64格式、url格式） */
-    type: {
-      type: String,
-      default: "url",
-    }
-  },
-  data() {
-    return {
-      uploadUrl: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload', // 上传的图片服务器地址
-      headers: {
-        'Access-Token': getToken()
-      },
-      Quill: null,
-      currentValue: "",
-      options: {
-        theme: "snow",
-        bounds: document.body,
-        debug: "warn",
-        modules: {
-          // 工具栏配置
-          toolbar: [
-            ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-            ["blockquote", "code-block"],                    // 引用  代码块
-            [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-            [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-            [{ size: ["small", false, "large", "huge"] }],   // 字体大小
-            [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-            [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
-          ],
-        },
-        placeholder: "请输入内容",
-        readOnly: this.readOnly,
-      },
-    };
-  },
-  computed: {
-    styles() {
-      let style = {};
-      if (this.minHeight) {
-        style.minHeight = `${this.minHeight}px`;
-      }
-      if (this.height) {
-        style.height = `${this.height}px`;
-      }
-      return style;
-    },
-  },
-  watch: {
-    value: {
-      handler(val) {
-        if (val !== this.currentValue) {
-          this.currentValue = val === null ? "" : val;
-          if (this.Quill) {
-            this.Quill.pasteHTML(this.currentValue);
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  mounted() {
-    this.init();
-  },
-  beforeDestroy() {
-    this.Quill = null;
-  },
-  methods: {
-    init() {
-      const editor = this.$refs.editor;
-      this.Quill = new Quill(editor, this.options);
-      // 如果设置了上传地址则自定义图片上传事件
-      if (this.type == 'url') {
-        let toolbar = this.Quill.getModule("toolbar");
-        toolbar.addHandler("image", (value) => {
-          this.uploadType = "image";
-          if (value) {
-            this.$refs.upload.$children[0].$refs.input.click();
-          } else {
-            this.quill.format("image", false);
-          }
-        });
-      }
-      this.Quill.pasteHTML(this.currentValue);
-      this.Quill.on("text-change", (delta, oldDelta, source) => {
-        const html = this.$refs.editor.children[0].innerHTML;
-        const text = this.Quill.getText();
-        const quill = this.Quill;
-        this.currentValue = html;
-        this.$emit("input", html);
-        this.$emit("on-change", { html, text, quill });
-      });
-      this.Quill.on("text-change", (delta, oldDelta, source) => {
-        this.$emit("on-text-change", delta, oldDelta, source);
-      });
-      this.Quill.on("selection-change", (range, oldRange, source) => {
-        this.$emit("on-selection-change", range, oldRange, source);
-      });
-      this.Quill.on("editor-change", (eventName, ...args) => {
-        this.$emit("on-editor-change", eventName, ...args);
-      });
-    },
-    // 上传前校检格式和大小
-    handleBeforeUpload(file) {
-      // 校检文件大小
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      return true;
-    },
-    handleUploadSuccess(res, file) {
-      // 获取富文本组件实例
-      let quill = this.Quill;
-      // 如果上传成功
-      if (res.code == 200) {
-        // 获取光标所在位置
-        let length = quill.getSelection().index;
-        // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", res.data.url);
-        // 调整光标到最后
-        quill.setSelection(length + 1);
-      } else {
-        this.$message.error("图片插入失败");
-      }
-    },
-    handleUploadError() {
-      this.$message.error("图片插入失败");
-    },
-  },
-};
-</script>
-
-<style>
-.editor, .ql-toolbar {
-  white-space: pre-wrap !important;
-  line-height: normal !important;
-}
-.quill-img {
-  display: none;
-}
-.ql-snow .ql-tooltip[data-mode="link"]::before {
-  content: "请输入链接地址:";
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-  border-right: 0px;
-  content: "保存";
-  padding-right: 0px;
-}
-
-.ql-snow .ql-tooltip[data-mode="video"]::before {
-  content: "请输入视频地址:";
-}
-
-.ql-snow .ql-picker.ql-size .ql-picker-label::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item::before {
-  content: "14px";
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
-  content: "10px";
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
-  content: "18px";
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
-  content: "32px";
-}
-
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item::before {
-  content: "文本";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: "标题1";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: "标题2";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: "标题3";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: "标题4";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: "标题5";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: "标题6";
-}
-
-.ql-snow .ql-picker.ql-font .ql-picker-label::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item::before {
-  content: "标准字体";
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
-  content: "衬线字体";
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
-  content: "等宽字体";
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/FileUpload/index.vue b/fuintAdmin_zt/src/components/FileUpload/index.vue
deleted file mode 100644
index 472db7699..000000000
--- a/fuintAdmin_zt/src/components/FileUpload/index.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
-  <div class="upload-file">
-    <el-upload
-      multiple
-      :action="uploadFileUrl"
-      :before-upload="handleBeforeUpload"
-      :file-list="fileList"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      :on-success="handleUploadSuccess"
-      :show-file-list="false"
-      :headers="headers"
-      class="upload-file-uploader"
-      ref="upload"
-    >
-      <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
-      <!-- 上传提示 -->
-      <div class="el-upload__tip" slot="tip" v-if="showTip">
-        请上传
-        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
-        的文件
-      </div>
-    </el-upload>
-
-    <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
-      <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
-        <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
-        <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
-        </div>
-      </li>
-    </transition-group>
-  </div>
-</template>
-
-<script>
-import { getToken } from "@/utils/auth";
-
-export default {
-  name: "FileUpload",
-  props: {
-    // 值
-    value: [String, Object, Array],
-    // 数量限制
-    limit: {
-      type: Number,
-      default: 5,
-    },
-    // 大小限制(MB)
-    fileSize: {
-      type: Number,
-      default: 5,
-    },
-    // 文件类型, 例如['png', 'jpg', 'jpeg']
-    fileType: {
-      type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
-    },
-    // 是否显示提示
-    isShowTip: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      number: 0,
-      uploadList: [],
-      baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload', // 上传的图片服务器地址
-      headers: {
-        'Access-Token': getToken(),
-      },
-      fileList: [],
-    };
-  },
-  watch: {
-    value: {
-      handler(val) {
-        if (val) {
-          let temp = 1;
-          // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
-          // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
-            if (typeof item === "string") {
-              item = { name: item, url: item };
-            }
-            item.uid = item.uid || new Date().getTime() + temp++;
-            return item;
-          });
-        } else {
-          this.fileList = [];
-          return [];
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  computed: {
-    // 是否显示提示
-    showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize);
-    },
-  },
-  methods: {
-    // 上传前校检格式和大小
-    handleBeforeUpload(file) {
-      // 校检文件类型
-      if (this.fileType) {
-        let fileExtension = "";
-        if (file.name.lastIndexOf(".") > -1) {
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
-        }
-        const isTypeOk = this.fileType.some((type) => {
-          if (file.type.indexOf(type) > -1) return true;
-          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
-          return false;
-        });
-        if (!isTypeOk) {
-          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
-          return false;
-        }
-      }
-      // 校检文件大小
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      this.$modal.loading("正在上传文件，请稍候...");
-      this.number++;
-      return true;
-    },
-    // 文件个数超出
-    handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
-    },
-    // 上传失败
-    handleUploadError(err) {
-      this.$modal.msgError("上传图片失败，请重试");
-      this.$modal.closeLoading()
-    },
-    // 上传成功回调
-    handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.fileName, url: res.data.url });
-      if (this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
-        this.uploadList = [];
-        this.number = 0;
-        this.$emit("input", this.listToString(this.fileList));
-        this.$modal.closeLoading();
-      }
-    },
-    // 删除文件
-    handleDelete(index) {
-      this.fileList.splice(index, 1);
-      this.$emit("input", this.listToString(this.fileList));
-    },
-    // 获取文件名称
-    getFileName(name) {
-      if (name.lastIndexOf("/") > -1) {
-        return name.slice(name.lastIndexOf("/") + 1);
-      } else {
-        return "";
-      }
-    },
-    // 对象转成指定字符串分隔
-    listToString(list, separator) {
-      let strs = "";
-      separator = separator || ",";
-      for (let i in list) {
-        strs += list[i].url + separator;
-      }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.upload-file-uploader {
-  margin-bottom: 5px;
-}
-.upload-file-list .el-upload-list__item {
-  border: 1px solid #e4e7ed;
-  line-height: 2;
-  margin-bottom: 10px;
-  position: relative;
-}
-.upload-file-list .ele-upload-list__item-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  color: inherit;
-}
-.ele-upload-list__item-content-action .el-link {
-  margin-right: 10px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/Fuint/Cashier/index.vue b/fuintAdmin_zt/src/components/Fuint/Cashier/index.vue
deleted file mode 100644
index c487ab253..000000000
--- a/fuintAdmin_zt/src/components/Fuint/Cashier/index.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div class="nav-tool">
-    <img class="icon" title="收银下单" @click="goto" src="@/assets/images/cashier.svg">
-    <div class="name">收银下单</div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'FuintCashier',
-  data() {
-    return {
-      url: '/cashier/index'
-    }
-  },
-  methods: {
-    goto() {
-       const routeLink = this.$router.resolve({ path: this.url });
-       window.open(routeLink.href, '_blank');
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Fuint/Doc/index.vue b/fuintAdmin_zt/src/components/Fuint/Doc/index.vue
deleted file mode 100644
index 806a275fa..000000000
--- a/fuintAdmin_zt/src/components/Fuint/Doc/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div title="帮助文档" class="nav-icon">
-    <svg-icon icon-class="question" @click="goto" />
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'FuintDoc',
-  data() {
-    return {
-      url: 'https://www.fuint.cn/docs/index/'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Fuint/Git/index.vue b/fuintAdmin_zt/src/components/Fuint/Git/index.vue
deleted file mode 100644
index 0d33b7561..000000000
--- a/fuintAdmin_zt/src/components/Fuint/Git/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="github" @click="goto" />
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'FuintGit',
-  data() {
-    return {
-      url: 'https://gitee.com/fuint/fuint'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/Hamburger/index.vue b/fuintAdmin_zt/src/components/Hamburger/index.vue
deleted file mode 100644
index 058bb1403..000000000
--- a/fuintAdmin_zt/src/components/Hamburger/index.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <div style="padding: 0 15px;" @click="toggleClick">
-<!--    <svg-->
-<!--      :class="{'is-active':isActive}"-->
-<!--      class="hamburger"-->
-<!--      viewBox="0 0 1024 1024"-->
-<!--      xmlns="http://www.w3.org/2000/svg"-->
-<!--      width="64"-->
-<!--      height="64"-->
-<!--    >-->
-<!--      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />-->
-<!--    </svg>-->
-
-    <svg t="1720083378159" :class="{'is-active':isActive}" class="hamburger" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-         p-id="4378" width="64" height="64">
-      <path
-        d="M408 442h480a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H408a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8z m-8 204a8 8 0 0 0 8 8h480a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H408a8 8 0 0 0-8 8v56z m504-486H120a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8z m0 632H120a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8zM142.4 642.1L298.7 519a8.8 8.8 0 0 0 0-13.9L142.4 381.9a8.9 8.9 0 0 0-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"
-        p-id="4379" fill="#FF8747"></path>
-    </svg>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Hamburger',
-  props: {
-    isActive: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    toggleClick() {
-      this.$emit('toggleClick')
-    }
-  }
-}
-</script>
-
-<style scoped>
-.hamburger {
-  display: inline-block;
-  vertical-align: middle;
-  width: 20px;
-  height: 20px;
-}
-
-.hamburger.is-active {
-  transform: rotate(180deg);
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/HeaderSearch/index.vue b/fuintAdmin_zt/src/components/HeaderSearch/index.vue
deleted file mode 100644
index 83548d57f..000000000
--- a/fuintAdmin_zt/src/components/HeaderSearch/index.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div :class="{'show':show}" class="header-search" title="查找功能">
-    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
-    <el-select
-      ref="headerSearchSelect"
-      v-model="search"
-      :remote-method="querySearch"
-      filterable
-      default-first-option
-      remote
-      placeholder="查找功能"
-      class="header-search-select"
-      @change="change"
-    >
-      <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
-    </el-select>
-  </div>
-</template>
-
-<script>
-import Fuse from 'fuse.js/dist/fuse.min.js'
-import path from 'path'
-
-export default {
-  name: 'HeaderSearch',
-  data() {
-    return {
-      search: '',
-      options: [],
-      searchPool: [],
-      show: false,
-      fuse: undefined
-    }
-  },
-  computed: {
-    routes() {
-      return this.$store.getters.permission_routes
-    }
-  },
-  watch: {
-    routes() {
-      this.searchPool = this.generateRoutes(this.routes)
-    },
-    searchPool(list) {
-      this.initFuse(list)
-    },
-    show(value) {
-      if (value) {
-        document.body.addEventListener('click', this.close)
-      } else {
-        document.body.removeEventListener('click', this.close)
-      }
-    }
-  },
-  mounted() {
-    this.searchPool = this.generateRoutes(this.routes)
-  },
-  methods: {
-    click() {
-      this.show = !this.show
-      if (this.show) {
-        this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
-      }
-    },
-    close() {
-      this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
-      this.options = []
-      this.show = false
-    },
-    change(val) {
-      const path = val.path;
-      if(this.ishttp(val.path)) {
-        // http(s):// 路径新窗口打开
-        const pindex = path.indexOf("http");
-        window.open(path.substr(pindex, path.length), "_blank");
-      } else {
-        this.$router.push(val.path)
-      }
-      this.search = ''
-      this.options = []
-      this.$nextTick(() => {
-        this.show = false
-      })
-    },
-    initFuse(list) {
-      this.fuse = new Fuse(list, {
-        shouldSort: true,
-        threshold: 0.4,
-        location: 0,
-        distance: 100,
-        maxPatternLength: 32,
-        minMatchCharLength: 1,
-        keys: [{
-          name: 'title',
-          weight: 0.7
-        }, {
-          name: 'path',
-          weight: 0.3
-        }]
-      })
-    },
-    // Filter out the routes that can be displayed in the sidebar
-    // And generate the internationalized title
-    generateRoutes(routes, basePath = '/', prefixTitle = []) {
-      let res = []
-
-      for (const router of routes) {
-        // skip hidden router
-        if (router.hidden) { continue }
-
-        const data = {
-          path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
-          title: [...prefixTitle]
-        }
-
-        if (router.meta && router.meta.title) {
-          data.title = [...data.title, router.meta.title]
-
-          if (router.redirect !== 'noRedirect') {
-            // only push the routes with title
-            // special case: need to exclude parent router without redirect
-            res.push(data)
-          }
-        }
-
-        // recursive child routes
-        if (router.children) {
-          const tempRoutes = this.generateRoutes(router.children, data.path, data.title)
-          if (tempRoutes.length >= 1) {
-            res = [...res, ...tempRoutes]
-          }
-        }
-      }
-      return res
-    },
-    querySearch(query) {
-      if (query !== '') {
-        this.options = this.fuse.search(query)
-      } else {
-        this.options = []
-      }
-    },
-    ishttp(url) {
-      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.header-search {
-  font-size: 0 !important;
-
-  .search-icon {
-    cursor: pointer;
-    font-size: 18px;
-    vertical-align: middle;
-  }
-
-  .header-search-select {
-    font-size: 18px;
-    transition: width 0.2s;
-    width: 0;
-    overflow: hidden;
-    background: transparent;
-    border-radius: 0;
-    display: inline-block;
-    vertical-align: middle;
-
-    ::v-deep .el-input__inner {
-      border-radius: 0;
-      border: 0;
-      padding-left: 0;
-      padding-right: 0;
-      box-shadow: none !important;
-      border-bottom: 1px solid #d9d9d9;
-      vertical-align: middle;
-    }
-  }
-
-  &.show {
-    .header-search-select {
-      width: 210px;
-      margin-left: 10px;
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/IconSelect/index.vue b/fuintAdmin_zt/src/components/IconSelect/index.vue
deleted file mode 100644
index b0ec9fa1a..000000000
--- a/fuintAdmin_zt/src/components/IconSelect/index.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- @author zhengjie -->
-<template>
-  <div class="icon-body">
-    <el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input.native="filterIcons">
-      <i slot="suffix" class="el-icon-search el-input__icon" />
-    </el-input>
-    <div class="icon-list">
-      <div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
-        <svg-icon :icon-class="item" style="height: 30px;width: 16px;" />
-        <span>{{ item }}</span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import icons from './requireIcons'
-export default {
-  name: 'IconSelect',
-  data() {
-    return {
-      name: '',
-      iconList: icons
-    }
-  },
-  methods: {
-    filterIcons() {
-      this.iconList = icons
-      if (this.name) {
-        this.iconList = this.iconList.filter(item => item.includes(this.name))
-      }
-    },
-    selectedIcon(name) {
-      this.$emit('selected', name)
-      document.body.click()
-    },
-    reset() {
-      this.name = ''
-      this.iconList = icons
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .icon-body {
-    width: 100%;
-    padding: 10px;
-    .icon-list {
-      height: 200px;
-      overflow-y: scroll;
-      div {
-        height: 30px;
-        line-height: 30px;
-        margin-bottom: -5px;
-        cursor: pointer;
-        width: 33%;
-        float: left;
-      }
-      span {
-        display: inline-block;
-        vertical-align: -0.15em;
-        fill: currentColor;
-        overflow: hidden;
-      }
-    }
-  }
-</style>
diff --git a/fuintAdmin_zt/src/components/IconSelect/requireIcons.js b/fuintAdmin_zt/src/components/IconSelect/requireIcons.js
deleted file mode 100644
index 99e5c54cc..000000000
--- a/fuintAdmin_zt/src/components/IconSelect/requireIcons.js
+++ /dev/null
@@ -1,11 +0,0 @@
-
-const req = require.context('../../assets/icons/svg', false, /\.svg$/)
-const requireAll = requireContext => requireContext.keys()
-
-const re = /\.\/(.*)\.svg/
-
-const icons = requireAll(req).map(i => {
-  return i.match(re)[1]
-})
-
-export default icons
diff --git a/fuintAdmin_zt/src/components/ImagePreview/index.vue b/fuintAdmin_zt/src/components/ImagePreview/index.vue
deleted file mode 100644
index b2d4c7a52..000000000
--- a/fuintAdmin_zt/src/components/ImagePreview/index.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-image
-    :src="`${realSrc}`"
-    fit="cover"
-    :style="`width:${realWidth};height:${realHeight};`"
-    :preview-src-list="realSrcList"
-  >
-    <div slot="error" class="image-slot">
-      <i class="el-icon-picture-outline"></i>
-    </div>
-  </el-image>
-</template>
-
-<script>
-import { isExternal } from "@/utils/validate";
-
-export default {
-  name: "ImagePreview",
-  props: {
-    src: {
-      type: String,
-      required: true
-    },
-    width: {
-      type: [Number, String],
-      default: ""
-    },
-    height: {
-      type: [Number, String],
-      default: ""
-    }
-  },
-  computed: {
-    realSrc() {
-
-      let real_src = this.src.split(",")[0];
-      if (isExternal(real_src)) {
-        return real_src;
-      }
-      return process.env.VUE_APP_BASE_API + real_src;
-    },
-    realSrcList() {
-      let real_src_list = this.src.split(",");
-      let srcList = [];
-      real_src_list.forEach(item => {
-        if (isExternal(item)) {
-          return srcList.push(item);
-        }
-        return srcList.push(process.env.VUE_APP_BASE_API + item);
-      });
-      return srcList;
-    },
-    realWidth() {
-      return typeof this.width == "string" ? this.width : `${this.width}px`;
-    },
-    realHeight() {
-      return typeof this.height == "string" ? this.height : `${this.height}px`;
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.el-image {
-  border-radius: 5px;
-  background-color: #ebeef5;
-  box-shadow: 0 0 5px 1px #ccc;
-  ::v-deep .el-image__inner {
-    transition: all 0.3s;
-    cursor: pointer;
-    &:hover {
-      transform: scale(1.2);
-    }
-  }
-  ::v-deep .image-slot {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    color: #909399;
-    font-size: 30px;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/ImageUpload/index.vue b/fuintAdmin_zt/src/components/ImageUpload/index.vue
deleted file mode 100644
index 841f91589..000000000
--- a/fuintAdmin_zt/src/components/ImageUpload/index.vue
+++ /dev/null
@@ -1,216 +0,0 @@
-<template>
-  <div class="component-upload-image">
-    <el-upload
-      multiple
-      :action="uploadImgUrl"
-      list-type="picture-card"
-      :on-success="handleUploadSuccess"
-      :before-upload="handleBeforeUpload"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      name="file"
-      :on-remove="handleRemove"
-      :show-file-list="true"
-      :headers="headers"
-      :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
-    >
-      <i class="el-icon-plus"></i>
-    </el-upload>
-
-    <!-- 上传提示 -->
-    <div class="el-upload__tip" slot="tip" v-if="showTip">
-      请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
-      的文件
-    </div>
-
-    <el-dialog
-      :visible.sync="dialogVisible"
-      title="预览"
-      width="800"
-      append-to-body
-    >
-      <img
-        :src="dialogImageUrl"
-        style="display: block; max-width: 100%; margin: 0 auto"
-      />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken } from "@/utils/auth";
-
-export default {
-  props: {
-    value: [String, Object, Array],
-    // 图片数量限制
-    limit: {
-      type: Number,
-      default: 5,
-    },
-    // 大小限制(MB)
-    fileSize: {
-       type: Number,
-      default: 5,
-    },
-    // 文件类型, 例如['png', 'jpg', 'jpeg']
-    fileType: {
-      type: Array,
-      default: () => ["png", "jpg", "jpeg"],
-    },
-    // 是否显示提示
-    isShowTip: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      number: 0,
-      uploadList: [],
-      dialogImageUrl: "",
-      dialogVisible: false,
-      hideUpload: false,
-      baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload', // 上传的图片服务器地址
-      headers: {
-        'Access-Token': getToken()
-      },
-      fileList: []
-    };
-  },
-  watch: {
-    value: {
-      handler(val) {
-        if (val) {
-          console.log(91111)
-          // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
-          console.log(9333)
-          // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
-            if (typeof item === "string") {
-              if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
-              } else {
-                  item = { name: item, url: item };
-              }
-            }
-            return item;
-          });
-        } else {
-          this.fileList = [];
-          return [];
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  computed: {
-    // 是否显示提示
-    showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize);
-    },
-  },
-  methods: {
-    // 删除图片
-    handleRemove(file, fileList) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if(findex > -1) {
-        this.fileList.splice(findex, 1);
-        this.$emit("input", this.listToString(this.fileList));
-      }
-    },
-    // 上传成功回调
-    handleUploadSuccess(res) {
-      console.log(res,132)
-      this.uploadList.push({ name: res.data.fileName, url: res.data.fileName });
-      if (this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
-        this.uploadList = [];
-        this.number = 0;
-        this.$emit("input", this.listToString(this.fileList));
-        this.$modal.closeLoading();
-      }
-    },
-    // 上传前loading加载
-    handleBeforeUpload(file) {
-      let isImg = false;
-      if (this.fileType.length) {
-        let fileExtension = "";
-        if (file.name.lastIndexOf(".") > -1) {
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
-        }
-        isImg = this.fileType.some(type => {
-          if (file.type.indexOf(type) > -1) return true;
-          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
-          return false;
-        });
-      } else {
-        isImg = file.type.indexOf("image") > -1;
-      }
-
-      if (!isImg) {
-        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
-        return false;
-      }
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      this.$modal.loading("正在上传图片，请稍候...");
-      this.number++;
-    },
-    // 文件个数超出
-    handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
-    },
-    // 上传失败
-    handleUploadError() {
-      this.$modal.msgError("上传图片失败，请重试");
-      this.$modal.closeLoading();
-    },
-    // 预览
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-    // 对象转成指定字符串分隔
-    listToString(list, separator) {
-      let strs = "";
-      separator = separator || ",";
-      console.log(list,190)
-      for (let i in list) {
-        strs += list[i].url.replace(this.baseUrl, "") + separator;
-      }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
-};
-</script>
-<style scoped lang="scss">
-// .el-upload--picture-card 控制加号部分
-::v-deep.hide .el-upload--picture-card {
-    display: none;
-}
-// 去掉动画效果
-::v-deep .el-list-enter-active,
-::v-deep .el-list-leave-active {
-    transition: all 0s;
-}
-
-::v-deep .el-list-enter, .el-list-leave-active {
-    opacity: 0;
-    transform: translateY(0);
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/components/Pagination/index.vue b/fuintAdmin_zt/src/components/Pagination/index.vue
deleted file mode 100644
index 3246c66c1..000000000
--- a/fuintAdmin_zt/src/components/Pagination/index.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
-    <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="pageSize"
-      :layout="layout"
-      :page-sizes="pageSizes"
-      :pager-count="pagerCount"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-  </div>
-</template>
-
-<script>
-import { scrollTo } from '@/utils/scroll-to'
-
-export default {
-  name: 'Pagination',
-  props: {
-    total: {
-      required: true,
-      type: Number
-    },
-    page: {
-      type: Number,
-      default: 1
-    },
-    limit: {
-      type: Number,
-      default: 20
-    },
-    pageSizes: {
-      type: Array,
-      default() {
-        return [10, 20, 30, 50]
-      }
-    },
-    // 移动端页码按钮的数量端默认值5
-    pagerCount: {
-      type: Number,
-      default: document.body.clientWidth < 992 ? 5 : 7
-    },
-    layout: {
-      type: String,
-      default: 'total, sizes, prev, pager, next, jumper'
-    },
-    background: {
-      type: Boolean,
-      default: true
-    },
-    autoScroll: {
-      type: Boolean,
-      default: true
-    },
-    hidden: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-    };
-  },
-  computed: {
-    currentPage: {
-      get() {
-        return this.page
-      },
-      set(val) {
-        this.$emit('update:page', val)
-      }
-    },
-    pageSize: {
-      get() {
-        return this.limit
-      },
-      set(val) {
-        this.$emit('update:limit', val)
-      }
-    }
-  },
-  methods: {
-    handleSizeChange(val) {
-      if (this.currentPage * val > this.total) {
-        this.currentPage = 1
-      }
-      this.$emit('pagination', { page: this.currentPage, limit: val })
-      if (this.autoScroll) {
-        scrollTo(0, 800)
-      }
-    },
-    handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
-      if (this.autoScroll) {
-        scrollTo(0, 800)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.pagination-container {
-  background: transparent;
-  padding: 32px 16px;
-}
-.pagination-container.hidden {
-  display: none;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/PanThumb/index.vue b/fuintAdmin_zt/src/components/PanThumb/index.vue
deleted file mode 100644
index 1bcf41709..000000000
--- a/fuintAdmin_zt/src/components/PanThumb/index.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-  <div :style="{zIndex:zIndex,height:height,width:width}" class="pan-item">
-    <div class="pan-info">
-      <div class="pan-info-roles-container">
-        <slot />
-      </div>
-    </div>
-    <!-- eslint-disable-next-line -->
-    <div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'PanThumb',
-  props: {
-    image: {
-      type: String,
-      required: true
-    },
-    zIndex: {
-      type: Number,
-      default: 1
-    },
-    width: {
-      type: String,
-      default: '150px'
-    },
-    height: {
-      type: String,
-      default: '150px'
-    }
-  }
-}
-</script>
-
-<style scoped>
-.pan-item {
-  width: 200px;
-  height: 200px;
-  border-radius: 50%;
-  display: inline-block;
-  position: relative;
-  cursor: default;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
-}
-
-.pan-info-roles-container {
-  padding: 20px;
-  text-align: center;
-}
-
-.pan-thumb {
-  width: 100%;
-  height: 100%;
-  background-position: center center;
-  background-size: cover;
-  border-radius: 50%;
-  overflow: hidden;
-  position: absolute;
-  transform-origin: 95% 40%;
-  transition: all 0.3s ease-in-out;
-}
-
-/* .pan-thumb:after {
-  content: '';
-  width: 8px;
-  height: 8px;
-  position: absolute;
-  border-radius: 50%;
-  top: 40%;
-  left: 95%;
-  margin: -4px 0 0 -4px;
-  background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
-  box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
-} */
-
-.pan-info {
-  position: absolute;
-  width: inherit;
-  height: inherit;
-  border-radius: 50%;
-  overflow: hidden;
-  box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
-}
-
-.pan-info h3 {
-  color: #fff;
-  text-transform: uppercase;
-  position: relative;
-  letter-spacing: 2px;
-  font-size: 18px;
-  margin: 0 60px;
-  padding: 22px 0 0 0;
-  height: 85px;
-  font-family: 'Open Sans', Arial, sans-serif;
-  text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
-}
-
-.pan-info p {
-  color: #fff;
-  padding: 10px 5px;
-  font-style: italic;
-  margin: 0 30px;
-  font-size: 12px;
-  border-top: 1px solid rgba(255, 255, 255, 0.5);
-}
-
-.pan-info p a {
-  display: block;
-  color: #333;
-  width: 80px;
-  height: 80px;
-  background: rgba(255, 255, 255, 0.3);
-  border-radius: 50%;
-  color: #fff;
-  font-style: normal;
-  font-weight: 700;
-  text-transform: uppercase;
-  font-size: 9px;
-  letter-spacing: 1px;
-  padding-top: 24px;
-  margin: 7px auto 0;
-  font-family: 'Open Sans', Arial, sans-serif;
-  opacity: 0;
-  transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
-  transform: translateX(60px) rotate(90deg);
-}
-
-.pan-info p a:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-
-.pan-item:hover .pan-thumb {
-  transform: rotate(-110deg);
-}
-
-.pan-item:hover .pan-info p a {
-  opacity: 1;
-  transform: translateX(0px) rotate(0deg);
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/ParentView/index.vue b/fuintAdmin_zt/src/components/ParentView/index.vue
deleted file mode 100644
index 7bf614897..000000000
--- a/fuintAdmin_zt/src/components/ParentView/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template >
-  <router-view />
-</template>
diff --git a/fuintAdmin_zt/src/components/RightPanel/index.vue b/fuintAdmin_zt/src/components/RightPanel/index.vue
deleted file mode 100644
index fbf27eb4f..000000000
--- a/fuintAdmin_zt/src/components/RightPanel/index.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
-    <div class="rightPanel-background" />
-    <div class="rightPanel">
-      <div class="rightPanel-items">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { addClass, removeClass } from '@/utils'
-
-export default {
-  name: 'RightPanel',
-  props: {
-    clickNotClose: {
-      default: false,
-      type: Boolean
-    },
-    buttonTop: {
-      default: 250,
-      type: Number
-    }
-  },
-  computed: {
-    show: {
-      get() {
-        return this.$store.state.settings.showSettings
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
-    },
-    theme() {
-      return this.$store.state.settings.theme
-    },
-  },
-  watch: {
-    show(value) {
-      if (value && !this.clickNotClose) {
-        this.addEventClick()
-      }
-      if (value) {
-        addClass(document.body, 'showRightPanel')
-      } else {
-        removeClass(document.body, 'showRightPanel')
-      }
-    }
-  },
-  mounted() {
-    this.insertToBody()
-    this.addEventClick()
-  },
-  beforeDestroy() {
-    const elx = this.$refs.rightPanel
-    elx.remove()
-  },
-  methods: {
-    addEventClick() {
-      window.addEventListener('click', this.closeSidebar)
-    },
-    closeSidebar(evt) {
-      const parent = evt.target.closest('.rightPanel')
-      if (!parent) {
-        this.show = false
-        window.removeEventListener('click', this.closeSidebar)
-      }
-    },
-    insertToBody() {
-      const elx = this.$refs.rightPanel
-      const body = document.querySelector('body')
-      body.insertBefore(elx, body.firstChild)
-    }
-  }
-}
-</script>
-
-<style>
-.showRightPanel {
-  overflow: hidden;
-  position: relative;
-  width: calc(100% - 15px);
-}
-</style>
-
-<style lang="scss" scoped>
-.rightPanel-background {
-  position: fixed;
-  top: 0;
-  left: 0;
-  opacity: 0;
-  transition: opacity .3s cubic-bezier(.7, .3, .1, 1);
-  background: rgba(0, 0, 0, .2);
-  z-index: -1;
-}
-
-.rightPanel {
-  width: 100%;
-  max-width: 260px;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  right: 0;
-  box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05);
-  transition: all .25s cubic-bezier(.7, .3, .1, 1);
-  transform: translate(100%);
-  background: #fff;
-  z-index: 40000;
-}
-
-.show {
-  transition: all .3s cubic-bezier(.7, .3, .1, 1);
-
-  .rightPanel-background {
-    z-index: 20000;
-    opacity: 1;
-    width: 100%;
-    height: 100%;
-  }
-
-  .rightPanel {
-    transform: translate(0);
-  }
-}
-
-.handle-button {
-  width: 48px;
-  height: 48px;
-  position: absolute;
-  left: -48px;
-  text-align: center;
-  font-size: 24px;
-  border-radius: 6px 0 0 6px !important;
-  z-index: 0;
-  pointer-events: auto;
-  cursor: pointer;
-  color: #fff;
-  line-height: 48px;
-  i {
-    font-size: 24px;
-    line-height: 48px;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/RightToolbar/index.vue b/fuintAdmin_zt/src/components/RightToolbar/index.vue
deleted file mode 100644
index 86c291a1e..000000000
--- a/fuintAdmin_zt/src/components/RightToolbar/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div class="top-right-btn">
-    <el-row>
-<!--      <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">-->
-<!--        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />-->
-<!--      </el-tooltip>-->
-      <el-tooltip class="item" effect="dark" content="刷新" placement="top">
-        <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
-      </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
-        <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
-      </el-tooltip>
-    </el-row>
-    <el-dialog :title="title" :visible.sync="open" append-to-body>
-      <el-transfer
-        :titles="['显示', '隐藏']"
-        v-model="value"
-        :data="columns"
-        @change="dataChange"
-      ></el-transfer>
-    </el-dialog>
-  </div>
-</template>
-<script>
-export default {
-  name: "RightToolbar",
-  data() {
-    return {
-      // 显隐数据
-      value: [],
-      // 弹出层标题
-      title: "显示/隐藏",
-      // 是否显示弹出层
-      open: false,
-    };
-  },
-  props: {
-    showSearch: {
-      type: Boolean,
-      default: true,
-    },
-    columns: {
-      type: Array,
-    },
-  },
-  created() {
-    // 显隐列初始默认隐藏列
-    for (let item in this.columns) {
-      if (this.columns[item].visible === false) {
-        this.value.push(parseInt(item));
-      }
-    }
-  },
-  methods: {
-    // 搜索
-    toggleSearch() {
-      this.$emit("update:showSearch", !this.showSearch);
-    },
-    // 刷新
-    refresh() {
-      this.$emit("queryTable");
-    },
-    // 右侧列表元素变化
-    dataChange(data) {
-      for (let item in this.columns) {
-        const key = this.columns[item].key;
-        this.columns[item].visible = !data.includes(key);
-      }
-    },
-    // 打开显隐列dialog
-    showColumn() {
-      this.open = true;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-transfer__button {
-  border-radius: 50%;
-  padding: 12px;
-  display: block;
-  margin-left: 0px;
-}
-::v-deep .el-transfer__button:first-child {
-  margin-bottom: 10px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/Screenfull/index.vue b/fuintAdmin_zt/src/components/Screenfull/index.vue
deleted file mode 100644
index c8bc9a549..000000000
--- a/fuintAdmin_zt/src/components/Screenfull/index.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <div title="全屏展示" class="nav-icon">
-    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click" />
-  </div>
-</template>
-
-<script>
-import screenfull from 'screenfull'
-
-export default {
-  name: 'Screenfull',
-  data() {
-    return {
-      isFullscreen: false
-    }
-  },
-  mounted() {
-    this.init()
-  },
-  beforeDestroy() {
-    this.destroy()
-  },
-  methods: {
-    click() {
-      if (!screenfull.isEnabled) {
-        this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
-        return false
-      }
-      screenfull.toggle()
-    },
-    change() {
-      this.isFullscreen = screenfull.isFullscreen
-    },
-    init() {
-      if (screenfull.isEnabled) {
-        screenfull.on('change', this.change)
-      }
-    },
-    destroy() {
-      if (screenfull.isEnabled) {
-        screenfull.off('change', this.change)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.screenfull-svg {
-  display: inline-block;
-  cursor: pointer;
-  fill: #5a5e66;;
-  width: 20px;
-  height: 20px;
-  vertical-align: 10px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/SizeSelect/index.vue b/fuintAdmin_zt/src/components/SizeSelect/index.vue
deleted file mode 100644
index 069b5de9b..000000000
--- a/fuintAdmin_zt/src/components/SizeSelect/index.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <el-dropdown trigger="click" @command="handleSetSize">
-    <div>
-      <svg-icon class-name="size-icon" icon-class="size" />
-    </div>
-    <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value">
-        {{ item.label }}
-      </el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      sizeOptions: [
-        { label: 'Default', value: 'default' },
-        { label: 'Medium', value: 'medium' },
-        { label: 'Small', value: 'small' },
-        { label: 'Mini', value: 'mini' }
-      ]
-    }
-  },
-  computed: {
-    size() {
-      return this.$store.getters.size
-    }
-  },
-  methods: {
-    handleSetSize(size) {
-      this.$ELEMENT.size = size
-      this.$store.dispatch('app/setSize', size)
-      this.refreshView()
-      this.$message({
-        message: 'Switch Size Success',
-        type: 'success'
-      })
-    },
-    refreshView() {
-      // In order to make the cached page re-rendered
-      this.$store.dispatch('tagsView/delAllCachedViews', this.$route)
-
-      const { fullPath } = this.$route
-
-      this.$nextTick(() => {
-        this.$router.replace({
-          path: '/redirect' + fullPath
-        })
-      })
-    }
-  }
-
-}
-</script>
diff --git a/fuintAdmin_zt/src/components/SvgIcon/index.vue b/fuintAdmin_zt/src/components/SvgIcon/index.vue
deleted file mode 100644
index e4bf5ade1..000000000
--- a/fuintAdmin_zt/src/components/SvgIcon/index.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
-  <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
-    <use :xlink:href="iconName" />
-  </svg>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  name: 'SvgIcon',
-  props: {
-    iconClass: {
-      type: String,
-      required: true
-    },
-    className: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    isExternal() {
-      return isExternal(this.iconClass)
-    },
-    iconName() {
-      return `#icon-${this.iconClass}`
-    },
-    svgClass() {
-      if (this.className) {
-        return 'svg-icon ' + this.className
-      } else {
-        return 'svg-icon'
-      }
-    },
-    styleExternalIcon() {
-      return {
-        mask: `url(${this.iconClass}) no-repeat 50% 50%`,
-        '-webkit-mask': `url(${this.iconClass}) no-repeat 50% 50%`
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-
-.svg-external-icon {
-  background-color: currentColor;
-  mask-size: cover!important;
-  display: inline-block;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/ThemePicker/index.vue b/fuintAdmin_zt/src/components/ThemePicker/index.vue
deleted file mode 100644
index 3a41b9b50..000000000
--- a/fuintAdmin_zt/src/components/ThemePicker/index.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <el-color-picker
-    v-model="theme"
-    :predefine="['#00acac', '#00a7ac', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d' ]"
-    class="theme-picker"
-    popper-class="theme-picker-dropdown"
-  />
-</template>
-
-<script>
-const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#00acac' // default color
-
-export default {
-  data() {
-    return {
-      chalk: '', // content of theme-chalk css
-      theme: ''
-    }
-  },
-  computed: {
-    defaultTheme() {
-      return this.$store.state.settings.theme
-    }
-  },
-  watch: {
-    defaultTheme: {
-      handler: function(val, oldVal) {
-        this.theme = val
-      },
-      immediate: true
-    },
-    async theme(val) {
-      await this.setTheme(val)
-    }
-  },
-  created() {
-    if(this.defaultTheme !== ORIGINAL_THEME) {
-      this.setTheme(this.defaultTheme)
-    }
-  },
-
-  methods: {
-    async setTheme(val) {
-      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
-      if (typeof val !== 'string') return
-      const themeCluster = this.getThemeCluster(val.replace('#', ''))
-      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-
-      const getHandler = (variable, id) => {
-        return () => {
-          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
-          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
-
-          let styleTag = document.getElementById(id)
-          if (!styleTag) {
-            styleTag = document.createElement('style')
-            styleTag.setAttribute('id', id)
-            document.head.appendChild(styleTag)
-          }
-          styleTag.innerText = newStyle
-        }
-      }
-
-      if (!this.chalk) {
-        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
-        await this.getCSSString(url, 'chalk')
-      }
-
-      const chalkHandler = getHandler('chalk', 'chalk-style')
-
-      chalkHandler()
-
-      const styles = [].slice.call(document.querySelectorAll('style'))
-        .filter(style => {
-          const text = style.innerText
-          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
-        })
-      styles.forEach(style => {
-        const { innerText } = style
-        if (typeof innerText !== 'string') return
-        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
-      })
-
-      this.$emit('change', val)
-    },
-
-    updateStyle(style, oldCluster, newCluster) {
-      let newStyle = style
-      oldCluster.forEach((color, index) => {
-        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-      })
-      return newStyle
-    },
-
-    getCSSString(url, variable) {
-      return new Promise(resolve => {
-        const xhr = new XMLHttpRequest()
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === 4 && xhr.status === 200) {
-            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
-            resolve()
-          }
-        }
-        xhr.open('GET', url)
-        xhr.send()
-      })
-    },
-
-    getThemeCluster(theme) {
-      const tintColor = (color, tint) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        if (tint === 0) { // when primary color is in its rgb space
-          return [red, green, blue].join(',')
-        } else {
-          red += Math.round(tint * (255 - red))
-          green += Math.round(tint * (255 - green))
-          blue += Math.round(tint * (255 - blue))
-
-          red = red.toString(16)
-          green = green.toString(16)
-          blue = blue.toString(16)
-
-          return `#${red}${green}${blue}`
-        }
-      }
-
-      const shadeColor = (color, shade) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        red = Math.round((1 - shade) * red)
-        green = Math.round((1 - shade) * green)
-        blue = Math.round((1 - shade) * blue)
-
-        red = red.toString(16)
-        green = green.toString(16)
-        blue = blue.toString(16)
-
-        return `#${red}${green}${blue}`
-      }
-
-      const clusters = [theme]
-      for (let i = 0; i <= 9; i++) {
-        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
-      }
-      clusters.push(shadeColor(theme, 0.1))
-      return clusters
-    }
-  }
-}
-</script>
-
-<style>
-.theme-message,
-.theme-picker-dropdown {
-  z-index: 99999 !important;
-}
-
-.theme-picker .el-color-picker__trigger {
-  height: 26px !important;
-  width: 26px !important;
-  padding: 2px;
-}
-
-.theme-picker-dropdown .el-color-dropdown__link-btn {
-  display: none;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/TopNav/index.vue b/fuintAdmin_zt/src/components/TopNav/index.vue
deleted file mode 100644
index f780b1693..000000000
--- a/fuintAdmin_zt/src/components/TopNav/index.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-menu
-    :default-active="activeMenu"
-    mode="horizontal"
-    @select="handleSelect"
-  >
-    <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
-        ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
-      >
-    </template>
-
-    <!-- 顶部菜单超出数量折叠 -->
-    <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
-      <template slot="title">更多菜单</template>
-      <template v-for="(item, index) in topMenus">
-        <el-menu-item
-          :index="item.path"
-          :key="index"
-          v-if="index >= visibleNumber"
-          ><svg-icon :icon-class="item.meta.icon" />
-          {{ item.meta.title }}</el-menu-item
-        >
-      </template>
-    </el-submenu>
-  </el-menu>
-</template>
-
-<script>
-import { constantRoutes } from "@/router";
-
-// 隐藏侧边栏路由
-const hideList = ['/index', '/index'];
-
-export default {
-  data() {
-    return {
-      // 顶部栏初始数
-      visibleNumber: 5,
-      // 当前激活菜单的 index
-      currentIndex: undefined
-    };
-  },
-  computed: {
-    theme() {
-      return this.$store.state.settings.theme;
-    },
-    // 顶部显示菜单
-    topMenus() {
-      let topMenus = [];
-      this.routers.map((menu) => {
-        if (menu.hidden !== true) {
-          // 兼容顶部栏一级菜单内部跳转
-          if (menu.path === "/") {
-              topMenus.push(menu.children[0]);
-          } else {
-              topMenus.push(menu);
-          }
-        }
-      });
-      return topMenus;
-    },
-    // 所有的路由信息
-    routers() {
-      return this.$store.state.permission.topbarRouters;
-    },
-    // 设置子路由
-    childrenMenus() {
-      const childrenMenus = [];
-      this.routers.map((router) => {
-        for (var item in router.children) {
-          if (router.children[item].parentPath === undefined) {
-            if(router.path === "/") {
-              router.children[item].path = "/" + router.children[item].path;
-            } else {
-              if(!this.ishttp(router.children[item].path)) {
-                router.children[item].path = router.path + "/" + router.children[item].path;
-              }
-            }
-            router.children[item].parentPath = router.path;
-          }
-          childrenMenus.push(router.children[item]);
-        }
-      });
-      return constantRoutes.concat(childrenMenus);
-    },
-    // 默认激活的菜单
-    activeMenu() {
-      const path = this.$route.path;
-      let activePath = path;
-      if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
-        const tmpPath = path.substring(1, path.length);
-        activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-        this.$store.dispatch('app/toggleSideBarHide', false);
-      } else if(!this.$route.children) {
-        activePath = path;
-        this.$store.dispatch('app/toggleSideBarHide', true);
-      }
-      this.activeRoutes(activePath);
-      return activePath;
-    },
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.setVisibleNumber)
-  },
-  beforeDestroy() {
-    window.removeEventListener('resize', this.setVisibleNumber)
-  },
-  mounted() {
-    this.setVisibleNumber();
-  },
-  methods: {
-    // 根据宽度计算设置显示栏数
-    setVisibleNumber() {
-      const width = document.body.getBoundingClientRect().width / 3;
-      this.visibleNumber = parseInt(width / 85);
-    },
-    // 菜单选择事件
-    handleSelect(key, keyPath) {
-      this.currentIndex = key;
-      const route = this.routers.find(item => item.path === key);
-      if (this.ishttp(key)) {
-        // http(s):// 路径新窗口打开
-        window.open(key, "_blank");
-      } else if (!route || !route.children) {
-        // 没有子路由路径内部打开
-        this.$router.push({ path: key });
-        this.$store.dispatch('app/toggleSideBarHide', true);
-      } else {
-        // 显示左侧联动菜单
-        this.activeRoutes(key);
-        this.$store.dispatch('app/toggleSideBarHide', false);
-      }
-    },
-    // 当前激活的路由
-    activeRoutes(key) {
-      var routes = [];
-      if (this.childrenMenus && this.childrenMenus.length > 0) {
-        this.childrenMenus.map((item) => {
-          if (key == item.parentPath || (key == "index" && "" == item.path)) {
-            routes.push(item);
-          }
-        });
-      }
-      if(routes.length > 0) {
-        this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
-      }
-    },
-    ishttp(url) {
-      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
-    }
-  },
-};
-</script>
-
-<style lang="scss">
-.topmenu-container.el-menu--horizontal > .el-menu-item {
-  float: left;
-  height: 50px !important;
-  line-height: 50px !important;
-  color: #999093 !important;
-  padding: 0 5px !important;
-  margin: 0 10px !important;
-}
-
-.topmenu-container.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
-  border-bottom: 2px solid #{'var(--theme)'} !important;
-  color: #303133;
-}
-
-/* submenu item */
-.topmenu-container.el-menu--horizontal > .el-submenu .el-submenu__title {
-  float: left;
-  height: 50px !important;
-  line-height: 50px !important;
-  color: #999093 !important;
-  padding: 0 5px !important;
-  margin: 0 10px !important;
-}
-</style>
diff --git a/fuintAdmin_zt/src/components/iFrame/index.vue b/fuintAdmin_zt/src/components/iFrame/index.vue
deleted file mode 100644
index 426857fb1..000000000
--- a/fuintAdmin_zt/src/components/iFrame/index.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div v-loading="loading" :style="'height:' + height">
-    <iframe
-      :src="src"
-      frameborder="no"
-      style="width: 100%; height: 100%"
-      scrolling="auto"
-    />
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    src: {
-      type: String,
-      required: true
-    },
-  },
-  data() {
-    return {
-      height: document.documentElement.clientHeight - 94.5 + "px;",
-      loading: true,
-      url: this.src
-    };
-  },
-  mounted: function () {
-    setTimeout(() => {
-      this.loading = false;
-    }, 300);
-    const that = this;
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 94.5 + "px;";
-    };
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/directive/dialog/drag.js b/fuintAdmin_zt/src/directive/dialog/drag.js
deleted file mode 100644
index ce61ffe62..000000000
--- a/fuintAdmin_zt/src/directive/dialog/drag.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-* v-dialogDrag 弹窗拖拽
-* Copyright (c) 2022 fuint
-*/
-
-export default {
-  bind(el, binding, vnode, oldVnode) {
-    const value = binding.value
-    if (value == false) return
-    // 获取拖拽内容头部
-    const dialogHeaderEl = el.querySelector('.el-dialog__header');
-    const dragDom = el.querySelector('.el-dialog');
-    dialogHeaderEl.style.cursor = 'move';
-    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
-    dragDom.style.position = 'absolute';
-    dragDom.style.marginTop = 0;
-    let width = dragDom.style.width;
-    if (width.includes('%')) {
-      width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100);
-    } else {
-      width = +width.replace(/\px/g, '');
-    }
-    dragDom.style.left = `${(document.body.clientWidth - width) / 2}px`;
-    // 鼠标按下事件
-    dialogHeaderEl.onmousedown = (e) => {
-      // 鼠标按下，计算当前元素距离可视区的距离 (鼠标点击位置距离可视窗口的距离)
-      const disX = e.clientX - dialogHeaderEl.offsetLeft;
-      const disY = e.clientY - dialogHeaderEl.offsetTop;
-
-      // 获取到的值带px 正则匹配替换
-      let styL, styT;
-
-      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
-      if (sty.left.includes('%')) {
-        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
-        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
-      } else {
-        styL = +sty.left.replace(/\px/g, '');
-        styT = +sty.top.replace(/\px/g, '');
-      };
-
-      // 鼠标拖拽事件
-      document.onmousemove = function (e) {
-        // 通过事件委托，计算移动的距离 （开始拖拽至结束拖拽的距离）
-        const l = e.clientX - disX;
-        const t = e.clientY - disY;
-
-        let finallyL = l + styL
-        let finallyT = t + styT
-
-        // 移动当前元素
-        dragDom.style.left = `${finallyL}px`;
-        dragDom.style.top = `${finallyT}px`;
-
-      };
-
-      document.onmouseup = function (e) {
-        document.onmousemove = null;
-        document.onmouseup = null;
-      };
-    }
-  }
-};
diff --git a/fuintAdmin_zt/src/directive/dialog/dragHeight.js b/fuintAdmin_zt/src/directive/dialog/dragHeight.js
deleted file mode 100644
index 36886d601..000000000
--- a/fuintAdmin_zt/src/directive/dialog/dragHeight.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-* v-dialogDragWidth 可拖动弹窗高度（右下角）
-* Copyright (c) 2022 fuint
-*/
-
-export default {
-    bind(el) {
-        const dragDom = el.querySelector('.el-dialog');
-        const lineEl = document.createElement('div');
-        lineEl.style = 'width: 6px; background: inherit; height: 10px; position: absolute; right: 0; bottom: 0; margin: auto; z-index: 1; cursor: nwse-resize;';
-        lineEl.addEventListener('mousedown',
-            function(e) {
-                // 鼠标按下，计算当前元素距离可视区的距离
-                const disX = e.clientX - el.offsetLeft;
-                const disY = e.clientY - el.offsetTop;
-                // 当前宽度 高度
-                const curWidth = dragDom.offsetWidth;
-                const curHeight = dragDom.offsetHeight;
-                document.onmousemove = function(e) {
-                    e.preventDefault(); // 移动时禁用默认事件
-                    // 通过事件委托，计算移动的距离
-                    const xl = e.clientX - disX;
-                    const yl = e.clientY - disY
-                    dragDom.style.width = `${curWidth + xl}px`;
-                    dragDom.style.height = `${curHeight + yl}px`;
-                };
-                document.onmouseup = function(e) {
-                    document.onmousemove = null;
-                    document.onmouseup = null;
-                };
-            }, false);
-        dragDom.appendChild(lineEl);
-    }
-}
diff --git a/fuintAdmin_zt/src/directive/dialog/dragWidth.js b/fuintAdmin_zt/src/directive/dialog/dragWidth.js
deleted file mode 100644
index 89188ec52..000000000
--- a/fuintAdmin_zt/src/directive/dialog/dragWidth.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
-* v-dialogDragWidth 可拖动弹窗宽度（右侧边）
-* Copyright (c) 2022 fuint
-*/
-
-export default {
-    bind(el) {
-        const dragDom = el.querySelector('.el-dialog');
-        const lineEl = document.createElement('div');
-        lineEl.style = 'width: 5px; background: inherit; height: 80%; position: absolute; right: 0; top: 0; bottom: 0; margin: auto; z-index: 1; cursor: w-resize;';
-        lineEl.addEventListener('mousedown',
-            function (e) {
-                // 鼠标按下，计算当前元素距离可视区的距离
-                const disX = e.clientX - el.offsetLeft;
-                // 当前宽度
-                const curWidth = dragDom.offsetWidth;
-                document.onmousemove = function (e) {
-                    e.preventDefault(); // 移动时禁用默认事件
-                    // 通过事件委托，计算移动的距离
-                    const l = e.clientX - disX;
-                    dragDom.style.width = `${curWidth + l}px`;
-                };
-                document.onmouseup = function (e) {
-                    document.onmousemove = null;
-                    document.onmouseup = null;
-                };
-            }, false);
-        dragDom.appendChild(lineEl);
-    }
-}
diff --git a/fuintAdmin_zt/src/directive/index.js b/fuintAdmin_zt/src/directive/index.js
deleted file mode 100644
index b9b07da3c..000000000
--- a/fuintAdmin_zt/src/directive/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import hasRole from './permission/hasRole'
-import hasPermi from './permission/hasPermi'
-import dialogDrag from './dialog/drag'
-import dialogDragWidth from './dialog/dragWidth'
-import dialogDragHeight from './dialog/dragHeight'
-import clipboard from './module/clipboard'
-
-const install = function(Vue) {
-  Vue.directive('hasRole', hasRole)
-  Vue.directive('hasPermi', hasPermi)
-  Vue.directive('clipboard', clipboard)
-  Vue.directive('dialogDrag', dialogDrag)
-  Vue.directive('dialogDragWidth', dialogDragWidth)
-  Vue.directive('dialogDragHeight', dialogDragHeight)
-}
-
-if (window.Vue) {
-  window['hasRole'] = hasRole
-  window['hasPermi'] = hasPermi
-  Vue.use(install); // eslint-disable-line
-}
-
-export default install
diff --git a/fuintAdmin_zt/src/directive/module/clipboard.js b/fuintAdmin_zt/src/directive/module/clipboard.js
deleted file mode 100644
index 800ca17da..000000000
--- a/fuintAdmin_zt/src/directive/module/clipboard.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-* v-clipboard 文字复制剪贴
-* Copyright (c) 2022 fuint
-*/
-
-import Clipboard from 'clipboard'
-export default {
-  bind(el, binding, vnode) {
-    switch (binding.arg) {
-      case 'success':
-        el._vClipBoard_success = binding.value;
-        break;
-      case 'error':
-        el._vClipBoard_error = binding.value;
-        break;
-      default: {
-        const clipboard = new Clipboard(el, {
-          text: () => binding.value,
-          action: () => binding.arg === 'cut' ? 'cut' : 'copy'
-        });
-        clipboard.on('success', e => {
-          const callback = el._vClipBoard_success;
-          callback && callback(e);
-        });
-        clipboard.on('error', e => {
-          const callback = el._vClipBoard_error;
-          callback && callback(e);
-        });
-        el._vClipBoard = clipboard;
-      }
-    }
-  },
-  update(el, binding) {
-    if (binding.arg === 'success') {
-      el._vClipBoard_success = binding.value;
-    } else if (binding.arg === 'error') {
-      el._vClipBoard_error = binding.value;
-    } else {
-      el._vClipBoard.text = function () { return binding.value; };
-      el._vClipBoard.action = () => binding.arg === 'cut' ? 'cut' : 'copy';
-    }
-  },
-  unbind(el, binding) {
-    if (!el._vClipboard) return
-    if (binding.arg === 'success') {
-      delete el._vClipBoard_success;
-    } else if (binding.arg === 'error') {
-      delete el._vClipBoard_error;
-    } else {
-      el._vClipBoard.destroy();
-      delete el._vClipBoard;
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/directive/permission/hasPermi.js b/fuintAdmin_zt/src/directive/permission/hasPermi.js
deleted file mode 100644
index 537288141..000000000
--- a/fuintAdmin_zt/src/directive/permission/hasPermi.js
+++ /dev/null
@@ -1,28 +0,0 @@
- /**
- * v-hasPermi 操作权限处理
- * Copyright (c) 2023 https://www.fuint.cn
- */
-
-import store from '@/store'
-
-export default {
-  inserted(el, binding, vnode) {
-    const { value } = binding
-    const all_permission = "*:*:*";
-    const permissions = store.getters && store.getters.permissions
-
-    if (value && value instanceof Array && value.length > 0) {
-      const permissionFlag = value
-
-      const hasPermissions = permissions.some(permission => {
-        return all_permission === permission || permissionFlag.includes(permission)
-      })
-
-      if (!hasPermissions) {
-        el.parentNode && el.parentNode.removeChild(el)
-      }
-    } else {
-      throw new Error(`请设置操作权限标签值`)
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/directive/permission/hasRole.js b/fuintAdmin_zt/src/directive/permission/hasRole.js
deleted file mode 100644
index 70851cd78..000000000
--- a/fuintAdmin_zt/src/directive/permission/hasRole.js
+++ /dev/null
@@ -1,28 +0,0 @@
- /**
- * v-hasRole 角色权限处理
- * Copyright (c) 2022 fuint
- */
-
-import store from '@/store'
-
-export default {
-  inserted(el, binding, vnode) {
-    const { value } = binding
-    const super_admin = "admin";
-    const roles = store.getters && store.getters.roles
-
-    if (value && value instanceof Array && value.length > 0) {
-      const roleFlag = value
-
-      const hasRole = roles.some(role => {
-        return super_admin === role || roleFlag.includes(role)
-      })
-
-      if (!hasRole) {
-        el.parentNode && el.parentNode.removeChild(el)
-      }
-    } else {
-      throw new Error(`请设置角色权限标签值"`)
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/layout/components/AppMain.vue b/fuintAdmin_zt/src/layout/components/AppMain.vue
deleted file mode 100644
index e4eba1834..000000000
--- a/fuintAdmin_zt/src/layout/components/AppMain.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
-        <router-view :key="key" />
-      </keep-alive>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
-    },
-    key() {
-      return this.$route.path
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-main {
-  /* 50= navbar  50  */
-  min-height: calc(100vh - 110px);
-
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-}
-
-.fixed-header+.app-main {
-  padding-top: 110px;
-}
-
-.hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 110px);
-  }
-
-  .fixed-header+.app-main {
-    padding-top: 90px;
-  }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 17px;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/InnerLink/index.vue b/fuintAdmin_zt/src/layout/components/InnerLink/index.vue
deleted file mode 100644
index a45d1a4a4..000000000
--- a/fuintAdmin_zt/src/layout/components/InnerLink/index.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<script>
-export default {
-  data() {
-    return {};
-  },
-  render() {
-    const { $route: { meta: { link } }, } = this;
-    if ({ link }.link === "") {
-      return "404";
-    }
-    let url = { link }.link;
-    const height = document.documentElement.clientHeight - 94.5 + "px";
-    const style = { height: height };
-
-    return (
-      <div style={style}>
-        <iframe
-          src={url}
-          frameborder="no"
-          style="width: 100%; height: 100%"
-          scrolling="auto"
-        ></iframe>
-      </div>
-    );
-  },
-};
-</script>
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
deleted file mode 100644
index 6e6862513..000000000
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <div class="navbar">
-    <div style="display: flex;align-items: center" >
-      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-      <div class="title-logo">
-
-        <div>
-          百业兴智慧油站欢迎您
-        </div>
-
-      </div>
-    </div>
-
-<!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
-
-<!--    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>-->
-
-    <div class="right-menu">
-<!--      <template v-if="device!=='mobile'">-->
-<!--        <search id="header-search" class="right-menu-item" />-->
-<!--        <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
-<!--        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
-<!--      </template>-->
-      <div class="d-s"style="margin-right: 20px">
-          <img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px">
-        <div>全屏</div>
-      </div>
-      <div class="d-s"style="margin-right: 20px">
-        <img src="../../assets/images/tzzx.png" style="width: 28px;height: 28px;margin-right: 5px">
-        <div>通知中心</div>
-      </div>
-      <el-dropdown class="d-s" trigger="click">
-        <div class="d-s">
-          <div class="title_">百业兴总部</div>
-          <img :src="avatar" style="width: 28px;height: 28px;margin: 0px 10px" />
-          <span class="user-name">{{ name }}</span>
-          <i class="el-icon-caret-bottom"/>
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item @click.native="prsswrod()">
-            <span>修改密码</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided @click.native="logout">
-            <span>退出登录</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <el-dialog
-      title="提示"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose">
-      <el-form-item label="密码" prop="name">
-        <el-input v-model="ruleForm.name"></el-input>
-      </el-form-item>
-      <el-form-item label="新密码" prop="name">
-        <el-input v-model="ruleForm.name"></el-input>
-      </el-form-item>
-      <el-form-item label="确认密码" prop="name">
-        <el-input v-model="ruleForm.name"></el-input>
-      </el-form-item>
-      <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="prsswrod()">确 定</el-button>
-  </span>
-    </el-dialog>
-
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import FuintDoc from '@/components/Fuint/Doc'
-import confirmLog from "@/views/coupon/confirmLog/index.vue";
-
-export default {
-  data() {
-    return {
-      dialogVisible: false
-    }
-  },
-  components: {
-    Breadcrumb,
-    TopNav,
-    Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    FuintDoc
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'name',
-      'device'
-    ]),
-    setting: {
-      get() {
-        return this.$store.state.settings.showSettings
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
-    },
-    topNav: {
-      get() {
-        return this.$store.state.settings.topNav
-      }
-    }
-  },
-  methods: {
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {});
-    }
-  },
-    prsswrod(){
-      console.log('方法')
-      this.dialogVisible = false
-
-    },
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
-    async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/';
-        })
-      }).catch(() => {});
-    }
-
-}
-</script>
-
-<style lang="scss" scoped>
-
-.d-s{
-  display: flex;
-  align-items: center;
-}
-.title_{
-  font-weight: bold;
-  font-size: 18px;
-  color: #333333;
-}
-.navbar {
-  height: 90px;
-  overflow: hidden;
-  //position: relative;
-  background: white;
-  //background-image: url("../../assets/images/kkx.png") ;
-  background-size: 100% 100%;
-  background-size: cover;
-  background-repeat: no-repeat;
-
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-  box-sizing: border-box;
- display: flex;
-  align-items: center;
-  justify-content: space-between;
-  .hamburger-container {
-    line-height: 46px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-    margin-left: 10px;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-  .title-logo{
-    //position: absolute;
-    //top: 50%; /* 将元素垂直向上移动容器高度的50% */
-    //left: 5%; /* 将元素水平向左移动容器宽度的50% */
-    //transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
-    //color: #ffffff;
-    font-size: 24px;
-    font-weight: bold;
-    display: flex;
-    align-items: center;
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .topmenu-container {
-    position: absolute;
-    left: 50px;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  .right-menu {
-    display: flex;
-    height: 100%;
-   align-items: center;
-
-    &:focus {
-      outline: none;
-    }
-
-    .right-menu-item {
-      display: inline-block;
-      padding: 0 8px;
-      height: 100%;
-      font-size: 18px;
-      vertical-align: text-bottom;
-
-      &.hover-effect {
-        cursor: pointer;
-        transition: background .3s;
-
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-        }
-      }
-    }
-
-    .avatar-container {
-      margin-right: 30px;
-
-      .avatar-wrapper {
-        margin-top: 5px;
-        position: relative;
-
-        .user-name {
-          font-weight: bold;
-          line-height: 35px;
-          display: block;
-          margin-left: 5px;
-          font-size: 14px;
-          float: left;
-        }
-
-        .user-avatar {
-          cursor: pointer;
-          width: 35px;
-          height: 35px;
-          border-radius: 10px;
-          float: left;
-        }
-
-        .el-icon-caret-bottom {
-          cursor: pointer;
-          position: absolute;
-          right: -15px;
-          top: 12px;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/Settings/index.vue b/fuintAdmin_zt/src/layout/components/Settings/index.vue
deleted file mode 100644
index 59815f10f..000000000
--- a/fuintAdmin_zt/src/layout/components/Settings/index.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<template>
-  <div class="drawer-container">
-    <div>
-      <div class="setting-drawer-content">
-        <div class="setting-drawer-title">
-          <h3 class="drawer-title">主题风格设置</h3>
-        </div>
-        <div class="setting-drawer-block-checbox">
-          <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
-            <img src="@/assets/images/dark.svg" alt="dark">
-            <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
-              <i aria-label="图标: check" class="anticon anticon-check">
-                <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
-                     focusable="false" class="">
-                  <path
-                    d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
-                </svg>
-              </i>
-            </div>
-          </div>
-          <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
-            <img src="@/assets/images/light.svg" alt="light">
-            <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
-              <i aria-label="图标: check" class="anticon anticon-check">
-                <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
-                     focusable="false" class="">
-                  <path
-                    d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
-                </svg>
-              </i>
-            </div>
-          </div>
-        </div>
-
-        <div class="drawer-item">
-          <span>主题颜色</span>
-          <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
-        </div>
-      </div>
-
-      <el-divider/>
-
-      <h3 class="drawer-title">系统布局配置</h3>
-      
-      <div class="drawer-item">
-        <span>开启 TopNav</span>
-        <el-switch v-model="topNav" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>开启 Tags-Views</span>
-        <el-switch v-model="tagsView" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>固定 Header</span>
-        <el-switch v-model="fixedHeader" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>显示 Logo</span>
-        <el-switch v-model="sidebarLogo" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>动态标题</span>
-        <el-switch v-model="dynamicTitle" class="drawer-switch" />
-      </div>
-
-      <el-divider/>
-
-      <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
-      <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import ThemePicker from '@/components/ThemePicker'
-
-export default {
-  components: { ThemePicker },
-  data() {
-    return {
-      theme: this.$store.state.settings.theme,
-      sideTheme: this.$store.state.settings.sideTheme
-    };
-  },
-  computed: {
-    fixedHeader: {
-      get() {
-        return this.$store.state.settings.fixedHeader
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'fixedHeader',
-          value: val
-        })
-      }
-    },
-    topNav: {
-      get() {
-        return this.$store.state.settings.topNav
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'topNav',
-          value: val
-        })
-        if (!val) {
-          this.$store.dispatch('app/toggleSideBarHide', false);
-          this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes);
-        }
-      }
-    },
-    tagsView: {
-      get() {
-        return this.$store.state.settings.tagsView
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'tagsView',
-          value: val
-        })
-      }
-    },
-    sidebarLogo: {
-      get() {
-        return this.$store.state.settings.sidebarLogo
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'sidebarLogo',
-          value: val
-        })
-      }
-    },
-    dynamicTitle: {
-      get() {
-        return this.$store.state.settings.dynamicTitle
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'dynamicTitle',
-          value: val
-        })
-      }
-    },
-  },
-  methods: {
-    themeChange(val) {
-      this.$store.dispatch('settings/changeSetting', {
-        key: 'theme',
-        value: val
-      })
-      this.theme = val;
-    },
-    handleTheme(val) {
-      this.$store.dispatch('settings/changeSetting', {
-        key: 'sideTheme',
-        value: val
-      })
-      this.sideTheme = val;
-    },
-    saveSetting() {
-      this.$modal.loading("正在保存到本地，请稍候...");
-      this.$cache.local.set(
-        "layout-setting",
-        `{
-            "topNav":${this.topNav},
-            "tagsView":${this.tagsView},
-            "fixedHeader":${this.fixedHeader},
-            "sidebarLogo":${this.sidebarLogo},
-            "dynamicTitle":${this.dynamicTitle},
-            "sideTheme":"${this.sideTheme}",
-            "theme":"${this.theme}"
-          }`
-      );
-      setTimeout(this.$modal.closeLoading(), 1000)
-    },
-    resetSetting() {
-      this.$modal.loading("正在清除设置缓存并刷新，请稍候...");
-      this.$cache.local.remove("layout-setting")
-      setTimeout("window.location.reload()", 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .setting-drawer-content {
-    .setting-drawer-title {
-      margin-bottom: 12px;
-      color: rgba(0, 0, 0, .85);
-      font-size: 14px;
-      line-height: 22px;
-      font-weight: bold;
-    }
-
-    .setting-drawer-block-checbox {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      margin-top: 10px;
-      margin-bottom: 20px;
-
-      .setting-drawer-block-checbox-item {
-        position: relative;
-        margin-right: 16px;
-        border-radius: 2px;
-        cursor: pointer;
-
-        img {
-          width: 48px;
-          height: 48px;
-        }
-
-        .setting-drawer-block-checbox-selectIcon {
-          position: absolute;
-          top: 0;
-          right: 0;
-          width: 100%;
-          height: 100%;
-          padding-top: 15px;
-          padding-left: 24px;
-          color: #1890ff;
-          font-weight: 700;
-          font-size: 14px;
-        }
-      }
-    }
-  }
-
-  .drawer-container {
-    padding: 24px;
-    font-size: 14px;
-    line-height: 1.5;
-    word-wrap: break-word;
-
-    .drawer-title {
-      margin-bottom: 12px;
-      color: rgba(0, 0, 0, .85);
-      font-size: 14px;
-      line-height: 22px;
-    }
-
-    .drawer-item {
-      color: rgba(0, 0, 0, .65);
-      font-size: 14px;
-      padding: 12px 0;
-    }
-
-    .drawer-switch {
-      float: right
-    }
-  }
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/FixiOSBug.js b/fuintAdmin_zt/src/layout/components/Sidebar/FixiOSBug.js
deleted file mode 100644
index 682372699..000000000
--- a/fuintAdmin_zt/src/layout/components/Sidebar/FixiOSBug.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default {
-  computed: {
-    device() {
-      return this.$store.state.app.device
-    }
-  },
-  mounted() {
-    // In order to fix the click on menu on the ios device will trigger the mouseleave bug
-    this.fixBugIniOS()
-  },
-  methods: {
-    fixBugIniOS() {
-      const $subMenu = this.$refs.subMenu
-      if ($subMenu) {
-        const handleMouseleave = $subMenu.handleMouseleave
-        $subMenu.handleMouseleave = (e) => {
-          if (this.device === 'mobile') {
-            return
-          }
-          handleMouseleave(e)
-        }
-      }
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/Item.vue b/fuintAdmin_zt/src/layout/components/Sidebar/Item.vue
deleted file mode 100644
index be3285dfb..000000000
--- a/fuintAdmin_zt/src/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      if (title.length > 5) {
-        vnodes.push(<span slot='title' title={(title)}>{(title)}</span>)
-      } else {
-        vnodes.push(<span slot='title'>{(title)}</span>)
-      }
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/Link.vue b/fuintAdmin_zt/src/layout/components/Sidebar/Link.vue
deleted file mode 100644
index 8b0bc93bd..000000000
--- a/fuintAdmin_zt/src/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <component :is="type" v-bind="linkProps(to)">
-    <slot />
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: [String, Object],
-      required: true
-    }
-  },
-  computed: {
-    isExternal() {
-      return isExternal(this.to)
-    },
-    type() {
-      if (this.isExternal) {
-        return 'a'
-      }
-      return 'router-link'
-    }
-  },
-  methods: {
-    linkProps(to) {
-      if (this.isExternal) {
-        return {
-          href: to,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        to: to
-      }
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue b/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
deleted file mode 100644
index d608be1ef..000000000
--- a/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-<!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->
-        <h1  class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
-<!--          {{ title }} -->
-          百
-        </h1>
-      </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-<!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
-      </router-link>
-    </transition>
-  </div>
-</template>
-
-<script>
-import logoImg from '@/assets/logo/logo.png'
-import variables from '@/assets/styles/variables.scss'
-
-export default {
-  name: 'SidebarLogo',
-  props: {
-    collapse: {
-      type: Boolean,
-      required: true
-    }
-  },
-  computed: {
-    variables() {
-      return variables;
-    },
-    sideTheme() {
-      return this.$store.state.settings.sideTheme
-    }
-  },
-  data() {
-    return {
-      title: process.env.VUE_APP_TITLE.length > 13 ? process.env.VUE_APP_TITLE.substring(0, 13) + '..' : process.env.VUE_APP_TITLE,
-      logo: logoImg
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.sidebarLogoFade-enter-active {
-  transition: opacity 1.5s;
-}
-
-.sidebarLogoFade-enter,
-.sidebarLogoFade-leave-to {
-  opacity: 0;
-}
-
-.sidebar-logo-container {
-  position: relative;
-  width: 100%;
-  height: 50px;
-  line-height: 50px;
-  background: #2b2f3a;
-  text-align: center;
-  overflow: hidden;
-
-  & .sidebar-logo-link {
-    height: 100%;
-    width: 100%;
-
-    & .sidebar-logo {
-      width: 16px;
-      height: 16px;
-      vertical-align: middle;
-      margin-right: 3px;
-      border-radius: 1px;
-    }
-
-    & .sidebar-title {
-      display: inline-block;
-      margin: 0;
-      color: #000;
-      font-weight: 700;
-      line-height: 50px;
-      font-size: 18px;
-      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-      vertical-align: middle;
-    }
-  }
-
-  &.collapse {
-    .sidebar-logo {
-      margin-right: 0px;
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/SidebarItem.vue b/fuintAdmin_zt/src/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 8da8497e0..000000000
--- a/fuintAdmin_zt/src/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-  <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item v-if="!isCollapse" :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;" :class="{'submenu-title-noDropdown':!isNest}">
-<!--          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />-->
-          <span style="margin-left: 30px" v-if="onlyOneChild.meta.title!='系统首页'">{{onlyOneChild.meta.title}}</span>
-          <div v-else style="background-color: white;width: 200px;height: 100%;position: fixed;left: 0px">
-            <img src="@/assets/menu_icon/home.png" v-if="activeMenu!='/index'" style="width: 21px;height: 21px;margin-right: 10px;margin-left: 20px"/>
-            <img src="@/assets/menu_icon/home_c.png" v-else style="width: 21px;height: 21px;margin-right: 10px;margin-left: 16px"/>
-            <span>{{onlyOneChild.meta.title}}</span>
-          </div>
-        </el-menu-item>
-        <el-menu-item v-if="isCollapse" :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;height: 60px" :class="{'submenu-title-noDropdown':!isNest}">
-          <!--          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />-->
-          <span style="margin-left: 30px" v-if="onlyOneChild.meta.title!='系统首页'">{{onlyOneChild.meta.title}}</span>
-          <div v-else style="background-color: white;width: 70px;height: 100%;position: fixed;left: 0px;text-align: center">
-            <img src="@/assets/menu_icon/home.png" v-if="activeMenu!='/index'" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/home_c.png" v-else style="width: 25px;height: 25px;"/>
-            <div style="padding: 0px;line-height: 5px">{{onlyOneChild.meta.title}}</div>
-          </div>
-        </el-menu-item>
-
-      </app-link>
-    </template>
-
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
-      <template slot="title">
-        <div v-if="!isCollapse" >
-          <!--        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title"  />-->
-          <span style="margin-right: 10px;" v-if="item.meta.title=='交接班'">
-            <img src="@/assets/menu_icon/ren.png" v-if="!activeMenu.includes('/handover')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/ren_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='码牌管理'">
-            <img src="@/assets/menu_icon/code.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/code_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='财务报表'">
-            <img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='机构管理'">
-            <img src="@/assets/menu_icon/jigou.png" v-if="!activeMenu.includes('/Site') && !activeMenu.includes('/Service')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/jigou_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='系统设置'">
-            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/indexBanner') && !activeMenu.includes('/setting') && !activeMenu.includes('/system')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
-            <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='会员管理'">
-            <img src="@/assets/menu_icon/user.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/userGrade')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/user_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='油站管理'">
-            <img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
-            <img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/car_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='积分商城'">
-            <img src="@/assets/menu_icon/lihe.png" v-if="!activeMenu.includes('/integral')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/lihe_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='订单管理'">
-            <img src="@/assets/menu_icon/wendang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/wendang_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='活动营销'">
-            <img src="@/assets/menu_icon/laba.png" v-if="!activeMenu.includes('/EventMarketing')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/laba_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='配置管理'">
-            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/setting') && !activeMenu.includes('/power')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='系统管理'">
-            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/system')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='运营数据'">
-            <img src="@/assets/menu_icon/yunying.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/yunying_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-
-          <span>{{item.meta.title}}</span>
-        </div>
-        <div v-if="isCollapse" style="text-align: center;">
-          <!--        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title"  />-->
-          <span style="margin-right: 10px;" v-if="item.meta.title=='交接班'">
-            <img src="@/assets/menu_icon/ren.png" v-if="!activeMenu.includes('/handover')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/ren_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='码牌管理'">
-            <img src="@/assets/menu_icon/code.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/code_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='财务报表'">
-            <img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='机构管理'">
-            <img src="@/assets/menu_icon/jigou.png" v-if="!activeMenu.includes('/Site') && !activeMenu.includes('/Service')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/jigou_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='小程序设置'">
-            <img src="@/assets/menu_icon/apple.png" v-if="!activeMenu.includes('/indexBanner')" style="width: 21px;height: 21px;"/>
-            <img src="@/assets/menu_icon/apple_b.png" v-else style="width: 21px;height: 21px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
-            <img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='会员管理'">
-            <img src="@/assets/menu_icon/user.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/userGrade')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/user_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='油站管理'">
-            <img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
-            <img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/car_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='积分商城'">
-            <img src="@/assets/menu_icon/lihe.png" v-if="!activeMenu.includes('/integral')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/lihe_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='订单管理'">
-            <img src="@/assets/menu_icon/wendang.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/wendang_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='活动营销'">
-            <img src="@/assets/menu_icon/laba.png" v-if="!activeMenu.includes('/EventMarketing')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/laba_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='配置管理'">
-            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/setting') && !activeMenu.includes('/power')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='系统管理'">
-            <img src="@/assets/menu_icon/setting.png" v-if="!activeMenu.includes('/system')" style="width: 25px;height: 25px;"/>
-            <img src="@/assets/menu_icon/setting_b.png" v-else style="width: 25px;height: 25px;"/>
-          </span>
-
-          <div style="padding: 0px;line-height: 5px">{{item.meta.title}}</div>
-        </div>
-      </template>
-      <sidebar-item
-        v-for="child in item.children"
-        :key="child.path"
-        :is-nest="true"
-        :item="child"
-        :base-path="resolvePath(child.path)"
-        class="nest-menu"
-      />
-    </el-submenu>
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { isExternal } from '@/utils/validate'
-import Item from './Item'
-import AppLink from './Link'
-import FixiOSBug from './FixiOSBug'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item, AppLink },
-  mixins: [FixiOSBug],
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    isCollapse: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    },
-    activeMenu: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    this.onlyOneChild = null
-    return {}
-  },
-  methods: {
-    hasOneShowingChild(children = [], parent) {
-      if (!children) {
-        children = [];
-      }
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath, routeQuery) {
-      if (isExternal(routePath)) {
-        return routePath
-      }
-      if (isExternal(this.basePath)) {
-        return this.basePath
-      }
-      if (routeQuery) {
-        let query = JSON.parse(routeQuery);
-        return { path: path.resolve(this.basePath, routePath), query: query }
-      }
-      return path.resolve(this.basePath, routePath)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/index.vue b/fuintAdmin_zt/src/layout/components/Sidebar/index.vue
deleted file mode 100644
index 8511af81b..000000000
--- a/fuintAdmin_zt/src/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-        <logo v-if="showLogo" :collapse="isCollapse" />
-<!--        <div class="store-info" v-if="storeName">-->
-<!--            <div class="name">{{ storeName }}</div>-->
-<!--            <div class="role" v-if="role">（{{ role }}）</div>-->
-<!--        </div>-->
-        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
-            <el-menu
-
-                :default-active="activeMenu"
-                :collapse="isCollapse"
-                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
-                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
-                :unique-opened="true"
-                :active-text-color="settings.theme"
-                :collapse-transition="false"
-                mode="vertical"
-                style="margin-bottom: 80px;"
-            >
-                <sidebar-item
-                    v-for="(route, index) in sidebarRouters"
-                    :key="route.path  + index"
-                    :item="route"
-                    :base-path="route.path"
-                    :activeMenu="activeMenu"
-                    :isCollapse="isCollapse"
-                />
-            </el-menu>
-        </el-scrollbar>
-    </div>
-</template>
-
-<script>
-import { mapGetters, mapState } from "vuex";
-import Logo from "./Logo";
-import SidebarItem from "./SidebarItem";
-import variables from "@/assets/styles/variables.scss";
-
-export default {
-    components: { SidebarItem, Logo },
-    computed: {
-        ...mapState(["settings"]),
-        ...mapGetters(["sidebarRouters", "sidebar"]),
-        activeMenu() {
-            const route = this.$route;
-            const { meta, path } = route;
-            // if set path, the sidebar will highlight the path you set
-            if (meta.activeMenu) {
-                return meta.activeMenu;
-            }
-            return path;
-        },
-        showLogo() {
-            return this.$store.state.settings.sidebarLogo;
-        },
-        variables() {
-            return variables;
-        },
-        isCollapse() {
-          if (!this.sidebar.opened){
-            document.documentElement.style.setProperty('--sidebar-height', '60px');
-          }else {
-            document.documentElement.style.setProperty('--sidebar-height', '48px');
-          }
-            return !this.sidebar.opened;
-        },
-        storeName() {
-            if (this.$store.getters.merchantName && this.$store.getters.merchantId) {
-                return this.$store.getters.merchantName;
-            }
-            if (this.$store.getters.storeName && this.$store.getters.storeId) {
-                return this.$store.getters.storeName;
-            }
-            return '';
-        },
-        role() {
-          if (this.$store.getters.storeName && this.$store.getters.storeId) {
-              return '店铺管理员';
-          }
-          if (this.$store.getters.merchantName && this.$store.getters.merchantId) {
-              return '商户管理员';
-          }
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-  .store-info {
-    height: 42px;
-    padding-top: 2px;
-    text-align: center;
-    background: #00acac;
-    overflow: hidden;
-    border: 1px #ffffff solid;
-    border-radius: 2px;
-    margin: 0px 6px 10px 6px;
-    cursor: pointer;
-    .name {
-      font-weight: bold;
-      font-size: 14px;
-      color: #ffffff;
-      text-align: center;
-      overflow: hidden;
-    }
-    .role {
-      font-size: 10px;
-      margin-top: 3px;
-      color: #ffffff;
-    }
-  }
-
-
-
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/TagsView/ScrollPane.vue b/fuintAdmin_zt/src/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index bb753a124..000000000
--- a/fuintAdmin_zt/src/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  mounted() {
-    this.scrollWrapper.addEventListener('scroll', this.emitScroll, true)
-  },
-  beforeDestroy() {
-    this.scrollWrapper.removeEventListener('scroll', this.emitScroll)
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    emitScroll() {
-      this.$emit('scroll')
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  ::v-deep {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/TagsView/index.vue b/fuintAdmin_zt/src/layout/components/TagsView/index.vue
deleted file mode 100644
index e1614c1d3..000000000
--- a/fuintAdmin_zt/src/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,328 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        :style="activeStyle(tag)"
-        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>
-      <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
-      <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>
-      <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
-      <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routes
-    },
-    // theme() {
-    //   return this.$store.state.settings.theme;
-    // }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    // this.initTags()
-    // this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    activeStyle(tag) {
-      if (!this.isActive(tag)) return {};
-      return {
-        "background-color": '#409EFF',
-        "border-color": '#409EFF',
-      };
-    },
-    isAffix(tag) {
-      return tag.meta && tag.meta.affix
-    },
-    isFirstView() {
-      try {
-        return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
-      } catch (err) {
-        return false
-      }
-    },
-    isLastView() {
-      try {
-        return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
-      } catch (err) {
-        return false
-      }
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags([])
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$tab.refreshPage(view);
-    },
-    closeSelectedTag(view) {
-      this.$tab.closePage(view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeRightTags() {
-      this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
-        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
-          this.toLastView(visitedViews)
-        }
-      })
-    },
-    closeLeftTags() {
-      this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
-        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
-          this.toLastView(visitedViews)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag).catch(()=>{});
-      this.$tab.closeOtherPage(this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$tab.closeAllPage().then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView.fullPath)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    },
-    handleScroll() {
-      this.closeMenu()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tags-view-container {
-  height: 45px;
-  width: 100%;
-  background: #fff;
-  border-bottom: 1px solid #d8dce5;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-  box-sizing: border-box;
-  padding-top: 5px;
-  .tags-view-wrapper {
-    .tags-view-item {
-      display: inline-block;
-      position: relative;
-      cursor: pointer;
-      height: 26px;
-      line-height: 26px;
-      border: 1px solid #d8dce5;
-      color: #495060;
-      background: #fff;
-      padding: 0 8px;
-      font-size: 12px;
-      margin-left: 5px;
-      margin-top: 4px;
-      &:first-of-type {
-        margin-left: 15px;
-      }
-      &:last-of-type {
-        margin-right: 15px;
-      }
-      &.active {
-        background-color: #42b983;
-        color: #fff;
-        border-color: #42b983;
-        &::before {
-          content: '';
-          background: #fff;
-          display: inline-block;
-          width: 8px;
-          height: 8px;
-          border-radius: 50%;
-          position: relative;
-          margin-right: 2px;
-        }
-      }
-    }
-  }
-  .contextmenu {
-    margin: 0;
-    background: #fff;
-    z-index: 3000;
-    position: absolute;
-    list-style-type: none;
-    padding: 5px 0;
-    border-radius: 4px;
-    font-size: 12px;
-    font-weight: 400;
-    color: #333;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-    li {
-      margin: 0;
-      padding: 7px 16px;
-      cursor: pointer;
-      &:hover {
-        background: #eee;
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-//reset element css of el-icon-close
-.tags-view-wrapper {
-  .tags-view-item {
-    .el-icon-close {
-      width: 16px;
-      height: 16px;
-      vertical-align: 2px;
-      border-radius: 50%;
-      text-align: center;
-      transition: all .3s cubic-bezier(.645, .045, .355, 1);
-      transform-origin: 100% 50%;
-      &:before {
-        transform: scale(.6);
-        display: inline-block;
-        vertical-align: -3px;
-      }
-      &:hover {
-        background-color: #b4bccc;
-        color: #fff;
-      }
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/layout/components/index.js b/fuintAdmin_zt/src/layout/components/index.js
deleted file mode 100644
index 104bd3ac6..000000000
--- a/fuintAdmin_zt/src/layout/components/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as AppMain } from './AppMain'
-export { default as Navbar } from './Navbar'
-export { default as Settings } from './Settings'
-export { default as Sidebar } from './Sidebar/index.vue'
-export { default as TagsView } from './TagsView/index.vue'
diff --git a/fuintAdmin_zt/src/layout/index.vue b/fuintAdmin_zt/src/layout/index.vue
deleted file mode 100644
index 3ec1b367c..000000000
--- a/fuintAdmin_zt/src/layout/index.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
-      <div v-if="!sidebar.hide" :class="{'fixed-header':fixedHeader}">
-        <navbar />
-<!--        <tags-view v-if="needTagsView" />-->
-      </div>
-      <app-main />
-      <right-panel>
-        <settings />
-      </right-panel>
-    </div>
-  </div>
-</template>
-
-<script>
-import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
-import variables from '@/assets/styles/variables.scss'
-
-export default {
-  name: 'Layout',
-  components: {
-    AppMain,
-    Navbar,
-    RightPanel,
-    Settings,
-    Sidebar,
-    TagsView
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    ...mapState({
-      theme: state => state.settings.theme,
-      sideTheme: state => state.settings.sideTheme,
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
-    }),
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    },
-    variables() {
-      return variables;
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
-
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
-    position: fixed;
-    top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$base-sidebar-width});
-    transition: width 0.28s;
-  }
-
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px);
-  }
-
-  .sidebarHide .fixed-header {
-    width: 100%;
-  }
-
-  .mobile .fixed-header {
-    width: 100%;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/layout/mixin/ResizeHandler.js b/fuintAdmin_zt/src/layout/mixin/ResizeHandler.js
deleted file mode 100644
index e8d0df8c2..000000000
--- a/fuintAdmin_zt/src/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('app/closeSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.$_resizeHandler)
-  },
-  beforeDestroy() {
-    window.removeEventListener('resize', this.$_resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.$_isMobile()
-    if (isMobile) {
-      store.dispatch('app/toggleDevice', 'mobile')
-      store.dispatch('app/closeSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    // use $_ for mixins properties
-    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
-    $_isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    $_resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.$_isMobile()
-        store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('app/closeSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/main.js b/fuintAdmin_zt/src/main.js
deleted file mode 100644
index ed8703670..000000000
--- a/fuintAdmin_zt/src/main.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import Vue from 'vue'
-
-import Cookies from 'js-cookie'
-
-import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
-
-import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/fuint.scss' // fuint.css
-import App from './App'
-import store from './store'
-import router from './router'
-import directive from './directive' // directive
-import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
-
-import './assets/icons' // icon
-import './permission' // permission control
-import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, getName, handleTree } from "@/utils/fuint";
-// 分页组件
-import Pagination from "@/components/Pagination";
-// 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar"
-// 富文本组件
-import Editor from "@/components/Editor"
-// 文件上传组件
-import FileUpload from "@/components/FileUpload"
-// 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
-// 图片预览组件
-import ImagePreview from "@/components/ImagePreview"
-// 字典标签组件
-import DictTag from '@/components/DictTag'
-// 头部标签组件
-import VueMeta from 'vue-meta'
-// 字典数据组件
-import DictData from '@/components/DictData'
-// 打印插件
-import Print from 'vue-print-nb'
-
-import '@/assets/styles/fonts.css';
-
-
-// 全局方法挂载
-Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.parseTime = parseTime
-Vue.prototype.resetForm = resetForm
-Vue.prototype.addDateRange = addDateRange
-Vue.prototype.getName = getName
-Vue.prototype.download = download
-Vue.prototype.handleTree = handleTree
-// Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
-// Vue.prototype.pcUrl = 'http://192.168.31.96:82/'
-// Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
-// Vue.prototype.pcUrl = 'http://192.168.31.178:81/'
-// Vue.prototype.bkUrl = 'http://192.168.31.178:81/' //跳转油站
-Vue.prototype.bkUrl = 'https://www.youkerr.com/' //跳转油站
-
-
-Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
-// 全局组件挂载
-Vue.component('DictTag', DictTag)
-Vue.component('Pagination', Pagination)
-Vue.component('RightToolbar', RightToolbar)
-Vue.component('Editor', Editor)
-Vue.component('FileUpload', FileUpload)
-Vue.component('ImageUpload', ImageUpload)
-Vue.component('ImagePreview', ImagePreview)
-
-Vue.use(directive)
-Vue.use(plugins)
-Vue.use(VueMeta)
-Vue.use(Print);
-DictData.install()
-
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online! ! !
- */
-
-Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
-})
-
-Vue.config.productionTip = false
-
-new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
-})
diff --git a/fuintAdmin_zt/src/permission.js b/fuintAdmin_zt/src/permission.js
deleted file mode 100644
index 708b30134..000000000
--- a/fuintAdmin_zt/src/permission.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import router from './router'
-import store from '@/store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken,setToken } from '@/utils/auth'
-import { isRelogin } from '@/utils/request'
-import Cookies from "js-cookie";
-
-
-NProgress.configure({ showSpinner: false })
-
-const whiteList = ['/login', '/auth-redirect']
-
-router.beforeEach((to, from, next) => {
-  NProgress.start()
-  if (to.path === '/resource_oilbank') {
-    console.log("111111111111111111111")
-    const urlParams = new URLSearchParams(window.location.search);
-    const data = urlParams.get('token');
-    console.log(data); // 输出: "value"
-    // if (Cookies.get("IS_ZT_LOGIN") && JSON.parse(Cookies.get("IS_ZT_LOGIN"))) {
-      // setToken(JSON.parse(Cookies.get("IS_ZT_LOGIN")).token);
-      // console.log("IS_ZT_LOGIN",sessionStorage.getItem('IS_ZT_LOGIN'));
-                                // sessionStorage.getItem('IS_ZT_LOGIN')
-
-    // sessionStorage.getItem('IS_ZT_LOGIN')
-      // console.log("IS_ZT_LOGIN",JSON.parse(sessionStorage.getItem('IS_ZT_LOGIN')).token)
-      setToken(data);
-    //
-    // }
-  }
-  if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
-    } else {
-      if (store.getters.roles.length === 0) {
-        isRelogin.show = true
-        // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/' })
-            })
-          })
-      } else {
-        next()
-      }
-    }
-  } else {
-    // 没有token
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
-      next()
-    } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
-    }
-  }
-})
-
-router.afterEach(() => {
-  NProgress.done()
-})
diff --git a/fuintAdmin_zt/src/plugins/auth.js b/fuintAdmin_zt/src/plugins/auth.js
deleted file mode 100644
index 6c6bc2428..000000000
--- a/fuintAdmin_zt/src/plugins/auth.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import store from '@/store'
-
-function authPermission(permission) {
-  const all_permission = "*:*:*";
-  const permissions = store.getters && store.getters.permissions
-  if (permission && permission.length > 0) {
-    return permissions.some(v => {
-      return all_permission === v || v === permission
-    })
-  } else {
-    return false
-  }
-}
-
-function authRole(role) {
-  const super_admin = "admin";
-  const roles = store.getters && store.getters.roles
-  if (role && role.length > 0) {
-    return roles.some(v => {
-      return super_admin === v || v === role
-    })
-  } else {
-    return false
-  }
-}
-
-export default {
-  // 验证用户是否具备某权限
-  hasPermi(permission) {
-    return authPermission(permission);
-  },
-  // 验证用户是否含有指定权限，只需包含其中一个
-  hasPermiOr(permissions) {
-    return permissions.some(item => {
-      return authPermission(item)
-    })
-  },
-  // 验证用户是否含有指定权限，必须全部拥有
-  hasPermiAnd(permissions) {
-    return permissions.every(item => {
-      return authPermission(item)
-    })
-  },
-  // 验证用户是否具备某角色
-  hasRole(role) {
-    return authRole(role);
-  },
-  // 验证用户是否含有指定角色，只需包含其中一个
-  hasRoleOr(roles) {
-    return roles.some(item => {
-      return authRole(item)
-    })
-  },
-  // 验证用户是否含有指定角色，必须全部拥有
-  hasRoleAnd(roles) {
-    return roles.every(item => {
-      return authRole(item)
-    })
-  }
-}
diff --git a/fuintAdmin_zt/src/plugins/cache.js b/fuintAdmin_zt/src/plugins/cache.js
deleted file mode 100644
index 6b5c00b9e..000000000
--- a/fuintAdmin_zt/src/plugins/cache.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const sessionCache = {
-  set (key, value) {
-    if (!sessionStorage) {
-      return
-    }
-    if (key != null && value != null) {
-      sessionStorage.setItem(key, value)
-    }
-  },
-  get (key) {
-    if (!sessionStorage) {
-      return null
-    }
-    if (key == null) {
-      return null
-    }
-    return sessionStorage.getItem(key)
-  },
-  setJSON (key, jsonValue) {
-    if (jsonValue != null) {
-      this.set(key, JSON.stringify(jsonValue))
-    }
-  },
-  getJSON (key) {
-    const value = this.get(key)
-    if (value != null) {
-      return JSON.parse(value)
-    }
-  },
-  remove (key) {
-    sessionStorage.removeItem(key);
-  }
-}
-const localCache = {
-  set (key, value) {
-    if (!localStorage) {
-      return
-    }
-    if (key != null && value != null) {
-      localStorage.setItem(key, value)
-    }
-  },
-  get (key) {
-    if (!localStorage) {
-      return null
-    }
-    if (key == null) {
-      return null
-    }
-    return localStorage.getItem(key)
-  },
-  setJSON (key, jsonValue) {
-    if (jsonValue != null) {
-      this.set(key, JSON.stringify(jsonValue))
-    }
-  },
-  getJSON (key) {
-    const value = this.get(key)
-    if (value != null) {
-      return JSON.parse(value)
-    }
-  },
-  remove (key) {
-    localStorage.removeItem(key);
-  }
-}
-
-export default {
-  /**
-   * 会话级缓存
-   */
-  session: sessionCache,
-  /**
-   * 本地缓存
-   */
-  local: localCache
-}
diff --git a/fuintAdmin_zt/src/plugins/download.js b/fuintAdmin_zt/src/plugins/download.js
deleted file mode 100644
index f2ba2664c..000000000
--- a/fuintAdmin_zt/src/plugins/download.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import axios from 'axios'
-import { Message } from 'element-ui'
-import { saveAs } from 'file-saver'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
-import { blobValidate } from "@/utils/fuint";
-
-const baseURL = process.env.VUE_APP_BASE_API
-
-export default {
-  name(name, isDelete = true) {
-    var url = baseURL + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete
-    axios({
-      method: 'get',
-      url: url,
-      responseType: 'blob',
-      headers: { 'Access-Token': getToken() }
-    }).then(async (res) => {
-      const isLogin = await blobValidate(res.data);
-      if (isLogin) {
-        const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURI(res.headers['download-filename']))
-      } else {
-        this.printErrMsg(res.data);
-      }
-    })
-  },
-  resource(resource) {
-    var url = baseURL + "/common/download/resource?resource=" + encodeURI(resource);
-    axios({
-      method: 'get',
-      url: url,
-      responseType: 'blob',
-      headers: { 'Access-Token': getToken() }
-    }).then(async (res) => {
-      const isLogin = await blobValidate(res.data);
-      if (isLogin) {
-        const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURI(res.headers['download-filename']))
-      } else {
-        this.printErrMsg(res.data);
-      }
-    })
-  },
-  zip(url, name) {
-    var url = baseURL + url
-    axios({
-      method: 'get',
-      url: url,
-      responseType: 'blob',
-      headers: { 'Access-Token': getToken() }
-    }).then(async (res) => {
-      const isLogin = await blobValidate(res.data);
-      if (isLogin) {
-        const blob = new Blob([res.data], { type: 'application/zip' })
-        this.saveAs(blob, name)
-      } else {
-        this.printErrMsg(res.data);
-      }
-    })
-  },
-  saveAs(text, name, opts) {
-    saveAs(text, name, opts);
-  },
-  async printErrMsg(data) {
-    const resText = await data.text();
-    const rspObj = JSON.parse(resText);
-    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
-    Message.error(errMsg);
-  }
-}
-
diff --git a/fuintAdmin_zt/src/plugins/index.js b/fuintAdmin_zt/src/plugins/index.js
deleted file mode 100644
index d000f2dfa..000000000
--- a/fuintAdmin_zt/src/plugins/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import tab from './tab'
-import auth from './auth'
-import cache from './cache'
-import modal from './modal'
-import download from './download'
-
-export default {
-  install(Vue) {
-    // 页签操作
-    Vue.prototype.$tab = tab
-    // 认证对象
-    Vue.prototype.$auth = auth
-    // 缓存对象
-    Vue.prototype.$cache = cache
-    // 模态框对象
-    Vue.prototype.$modal = modal
-    // 下载文件
-    Vue.prototype.$download = download
-  }
-}
diff --git a/fuintAdmin_zt/src/plugins/modal.js b/fuintAdmin_zt/src/plugins/modal.js
deleted file mode 100644
index b37ca1457..000000000
--- a/fuintAdmin_zt/src/plugins/modal.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Message, MessageBox, Notification, Loading } from 'element-ui'
-
-let loadingInstance;
-
-export default {
-  // 消息提示
-  msg(content) {
-    Message.info(content)
-  },
-  // 错误消息
-  msgError(content) {
-    Message.error(content)
-  },
-  // 成功消息
-  msgSuccess(content) {
-    Message.success(content)
-  },
-  // 警告消息
-  msgWarning(content) {
-    Message.warning(content)
-  },
-  // 弹出提示
-  alert(content) {
-    MessageBox.alert(content, "系统提示")
-  },
-  // 错误提示
-  alertError(content) {
-    MessageBox.alert(content, "系统提示", { type: 'error' })
-  },
-  // 成功提示
-  alertSuccess(content) {
-    MessageBox.alert(content, "系统提示", { type: 'success' })
-  },
-  // 警告提示
-  alertWarning(content) {
-    MessageBox.alert(content, "系统提示", { type: 'warning' })
-  },
-  // 通知提示
-  notify(content) {
-    Notification.info(content)
-  },
-  // 错误通知
-  notifyError(content) {
-    Notification.error(content);
-  },
-  // 成功通知
-  notifySuccess(content) {
-    Notification.success(content)
-  },
-  // 警告通知
-  notifyWarning(content) {
-    Notification.warning(content)
-  },
-  // 确认窗体
-  confirm(content) {
-    return MessageBox.confirm(content, "系统提示", {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: "warning",
-    })
-  },
-  // 提交内容
-  prompt(content) {
-    return MessageBox.prompt(content, "系统提示", {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: "warning",
-    })
-  },
-  // 打开遮罩层
-  loading(content) {
-    loadingInstance = Loading.service({
-      lock: true,
-      text: content,
-      spinner: "el-icon-loading",
-      background: "rgba(0, 0, 0, 0.7)",
-    })
-  },
-  // 关闭遮罩层
-  closeLoading() {
-    loadingInstance.close();
-  }
-}
diff --git a/fuintAdmin_zt/src/plugins/tab.js b/fuintAdmin_zt/src/plugins/tab.js
deleted file mode 100644
index cade9f75c..000000000
--- a/fuintAdmin_zt/src/plugins/tab.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import store from '@/store'
-import router from '@/router';
-
-export default {
-  // 刷新当前tab页签
-  refreshPage(obj) {
-    const { path, query, matched } = router.currentRoute;
-    if (obj === undefined) {
-      matched.forEach((m) => {
-        if (m.components && m.components.default && m.components.default.name) {
-          if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
-            obj = { name: m.components.default.name, path: path, query: query };
-          }
-        }
-      });
-    }
-    return store.dispatch('tagsView/delCachedView', obj).then(() => {
-      const { path, query } = obj
-      router.replace({
-        path: '/redirect' + path,
-        query: query
-      })
-    })
-  },
-  // 关闭当前tab页签，打开新页签
-  closeOpenPage(obj) {
-    store.dispatch("tagsView/delView", router.currentRoute);
-    if (obj !== undefined) {
-      return router.push(obj);
-    }
-  },
-  // 关闭指定tab页签
-  closePage(obj) {
-    if (obj === undefined) {
-      return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => {
-        return router.push(lastPath || '/');
-      });
-    }
-    return store.dispatch('tagsView/delView', obj);
-  },
-  // 关闭所有tab页签
-  closeAllPage() {
-    return store.dispatch('tagsView/delAllViews');
-  },
-  // 关闭左侧tab页签
-  closeLeftPage(obj) {
-    return store.dispatch('tagsView/delLeftTags', obj || router.currentRoute);
-  },
-  // 关闭右侧tab页签
-  closeRightPage(obj) {
-    return store.dispatch('tagsView/delRightTags', obj || router.currentRoute);
-  },
-  // 关闭其他tab页签
-  closeOtherPage(obj) {
-    return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
-  },
-  // 添加tab页签
-  openPage(title, url, params) {
-    var obj = { path: url, meta: { title: title } }
-    store.dispatch('tagsView/addView', obj);
-    return router.push({ path: url, query: params });
-  },
-  // 修改tab页签
-  updatePage(obj) {
-    return store.dispatch('tagsView/updateVisitedView', obj);
-  }
-}
diff --git a/fuintAdmin_zt/src/router/index.js b/fuintAdmin_zt/src/router/index.js
deleted file mode 100644
index 23355ef9d..000000000
--- a/fuintAdmin_zt/src/router/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-Vue.use(Router)
-
-/* Layout */
-import Layout from '@/layout'
-
-/**
- * Note: 路由配置项
- *
- * hidden: true                     // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
- * alwaysShow: true                 // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- *                                  // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
- *                                  // 若你想不管路由下面的 children 声明的个数都显示你的根路由
- *                                  // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
- * redirect: noRedirect             // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name'               // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
- * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数
- * roles: ['admin', 'common']       // 访问路由的角色权限
- * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
- * meta : {
-    noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
-    activeMenu: '/system/account'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
-  }
- */
-
-// 公共路由
-export const constantRoutes = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
-      }
-    ]
-  },
-  {
-    path: '/login',
-    component: () => import('@/views/login'),
-    hidden: true
-  },
-  {
-    path: '/404',
-    component: () => import('@/views/error/404'),
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: () => import('@/views/error/401'),
-    hidden: true
-  },
-  {
-    path: '',
-    component: Layout,
-    redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index.vue'),
-        name: 'Index',
-        meta: { title: '系统首页', icon: 'dashboard', affix: true }
-      },
-      {
-        path: 'resource_oilbank',
-        component: () => import('@/views/Service/index.vue'),
-        name: 'Index',
-        meta: { title: '系统首页', icon: 'dashboard', affix: true }
-      }
-    ]
-  },
-  {
-    path: '/account',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [
-      {
-        path: 'profile',
-        component: () => import('@/views/system/account/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
-      }
-    ]
-  }
-]
-
-// 动态路由，基于用户权限动态去加载
-export const dynamicRoutes = []
-
-// 防止连续点击多次路由报错
-let routerPush = Router.prototype.push;
-Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(err => err)
-}
-
-export default new Router({
-  mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
-})
diff --git a/fuintAdmin_zt/src/settings.js b/fuintAdmin_zt/src/settings.js
deleted file mode 100644
index b6990cde8..000000000
--- a/fuintAdmin_zt/src/settings.js
+++ /dev/null
@@ -1,44 +0,0 @@
-module.exports = {
-  /**
-   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
-   */
-  sideTheme: 'theme-dark',
-
-  /**
-   * 是否系统布局配置
-   */
-  showSettings: false,
-
-  /**
-   * 是否显示顶部导航
-   */
-  topNav: false,
-
-  /**
-   * 是否显示 tagsView
-   */
-  tagsView: true,
-
-  /**
-   * 是否固定头部
-   */
-  fixedHeader: true,
-
-  /**
-   * 是否显示logo
-   */
-  sidebarLogo: true,
-
-  /**
-   * 是否显示动态标题
-   */
-  dynamicTitle: false,
-
-  /**
-   * @type {string | array} 'production' | ['production', 'development']
-   * @description Need show err logs component.
-   * The default is only used in the production env
-   * If you want to also use it in dev, you can pass ['production', 'development']
-   */
-  errorLog: 'development'
-}
diff --git a/fuintAdmin_zt/src/store/getters.js b/fuintAdmin_zt/src/store/getters.js
deleted file mode 100644
index 4b5a68df6..000000000
--- a/fuintAdmin_zt/src/store/getters.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const getters = {
-  sidebar: state => state.app.sidebar,
-  size: state => state.app.size,
-  device: state => state.app.device,
-  visitedViews: state => state.tagsView.visitedViews,
-  cachedViews: state => state.tagsView.cachedViews,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  introduction: state => state.user.introduction,
-  roles: state => state.user.roles,
-  permissions: state => state.user.permissions,
-  merchantId: state => state.user.merchantId,
-  merchantName: state => state.user.merchantName,
-  storeId: state => state.user.storeId,
-  storeName: state => state.user.storeName,
-  permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
-}
-export default getters
diff --git a/fuintAdmin_zt/src/store/index.js b/fuintAdmin_zt/src/store/index.js
deleted file mode 100644
index 53ab377c2..000000000
--- a/fuintAdmin_zt/src/store/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import app from './modules/app'
-import user from './modules/user'
-import tagsView from './modules/tagsView'
-import permission from './modules/permission'
-import settings from './modules/settings'
-import token from './modules/token'
-import getters from './getters'
-import createPersistedState from "vuex-persistedstate";
-
-Vue.use(Vuex)
-
-const store = new Vuex.Store({
-
-  modules: {
-    app,
-    user,
-    tagsView,
-    permission,
-    settings,
-    token
-  },
-
-  plugins:[
-    createPersistedState({
-      key:'token',// 存数据的key名   自定义的  要有语义化
-      paths: ['token'] // 要把那些模块加入缓存
-    }) 
-  ],
-
-  getters
-})
-
-export default store
diff --git a/fuintAdmin_zt/src/store/modules/app.js b/fuintAdmin_zt/src/store/modules/app.js
deleted file mode 100644
index 3e22d1c16..000000000
--- a/fuintAdmin_zt/src/store/modules/app.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import Cookies from 'js-cookie'
-
-const state = {
-  sidebar: {
-    opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
-    withoutAnimation: false,
-    hide: false
-  },
-  device: 'desktop',
-  size: Cookies.get('size') || 'medium'
-}
-
-const mutations = {
-  TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.hide) {
-      return false;
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-  },
-  CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 0)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
-  },
-  TOGGLE_DEVICE: (state, device) => {
-    state.device = device
-  },
-  SET_SIZE: (state, size) => {
-    state.size = size
-    Cookies.set('size', size)
-  },
-  SET_SIDEBAR_HIDE: (state, status) => {
-    state.sidebar.hide = status
-  }
-}
-
-const actions = {
-  toggleSideBar({ commit }) {
-    commit('TOGGLE_SIDEBAR')
-  },
-  closeSideBar({ commit }, { withoutAnimation }) {
-    commit('CLOSE_SIDEBAR', withoutAnimation)
-  },
-  toggleDevice({ commit }, device) {
-    commit('TOGGLE_DEVICE', device)
-  },
-  setSize({ commit }, size) {
-    commit('SET_SIZE', size)
-  },
-  toggleSideBarHide({ commit }, status) {
-    commit('SET_SIDEBAR_HIDE', status)
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
diff --git a/fuintAdmin_zt/src/store/modules/permission.js b/fuintAdmin_zt/src/store/modules/permission.js
deleted file mode 100644
index 228766550..000000000
--- a/fuintAdmin_zt/src/store/modules/permission.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import auth from '@/plugins/auth'
-import router, { constantRoutes, dynamicRoutes } from '@/router'
-import { getRouters } from '@/api/menu'
-import Layout from '@/layout/index'
-import ParentView from '@/components/ParentView'
-import InnerLink from '@/layout/components/InnerLink'
-
-const permission = {
-  state: {
-    routes: [],
-    addRoutes: [],
-    defaultRoutes: [],
-    topbarRouters: [],
-    sidebarRouters: []
-  },
-  mutations: {
-    SET_ROUTES: (state, routes) => {
-      state.addRoutes = routes
-      state.routes = constantRoutes.concat(routes)
-    },
-    SET_DEFAULT_ROUTES: (state, routes) => {
-      state.defaultRoutes = constantRoutes.concat(routes)
-    },
-    SET_TOPBAR_ROUTES: (state, routes) => {
-      state.topbarRouters = routes
-    },
-    SET_SIDEBAR_ROUTERS: (state, routes) => {
-      state.sidebarRouters = routes
-    },
-  },
-  actions: {
-    // 生成路由
-    GenerateRoutes({ commit }) {
-      return new Promise(resolve => {
-        // 向后端请求路由数据
-        getRouters().then(res => {
-          const sdata = JSON.parse(JSON.stringify(res.data))
-          const rdata = JSON.parse(JSON.stringify(res.data))
-          const sidebarRoutes = filterAsyncRouter(sdata)
-          const rewriteRoutes = filterAsyncRouter(rdata, false, true)
-          const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
-          rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
-          router.addRoutes(asyncRoutes);
-          commit('SET_ROUTES', rewriteRoutes)
-          commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
-          commit('SET_DEFAULT_ROUTES', sidebarRoutes)
-          commit('SET_TOPBAR_ROUTES', sidebarRoutes)
-          resolve(rewriteRoutes)
-        })
-      })
-    }
-  }
-}
-
-// 遍历后台传来的路由字符串，转换为组件对象
-function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
-  return asyncRouterMap.filter(route => {
-    if (type && route.children) {
-      route.children = filterChildren(route.children)
-    }
-    if (route.component) {
-      // Layout ParentView 组件特殊处理
-      if (route.component === 'Layout') {
-        route.component = Layout
-      } else if (route.component === 'ParentView') {
-        route.component = ParentView
-      } else if (route.component === 'InnerLink') {
-        route.component = InnerLink
-      } else {
-        route.component = loadView(route.component)
-      }
-    }
-    if (route.children != null && route.children && route.children.length) {
-      route.children = filterAsyncRouter(route.children, route, type)
-    } else {
-      delete route['children']
-      delete route['redirect']
-    }
-    return true
-  })
-}
-
-function filterChildren(childrenMap, lastRouter = false) {
-  var children = []
-  childrenMap.forEach((el, index) => {
-    if (el.children && el.children.length) {
-      if (el.component === 'ParentView' && !lastRouter) {
-        el.children.forEach(c => {
-          c.path = el.path + '/' + c.path
-          if (c.children && c.children.length) {
-            children = children.concat(filterChildren(c.children, c))
-            return
-          }
-          children.push(c)
-        })
-        return
-      }
-    }
-    if (lastRouter) {
-      el.path = lastRouter.path + '/' + el.path
-    }
-    children = children.concat(el)
-  })
-  return children
-}
-
-// 动态路由遍历，验证是否具备权限
-export function filterDynamicRoutes(routes) {
-  const res = []
-  routes.forEach(route => {
-    if (route.permissions) {
-      if (auth.hasPermiOr(route.permissions)) {
-        res.push(route)
-      }
-    } else if (route.roles) {
-      if (auth.hasRoleOr(route.roles)) {
-        res.push(route)
-      }
-    }
-  })
-  return res
-}
-
-export const loadView = (view) => {
-  if (process.env.NODE_ENV === 'development') {
-    return (resolve) => require([`@/views/${view}`], resolve)
-  } else {
-    // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`)
-  }
-}
-
-export default permission
diff --git a/fuintAdmin_zt/src/store/modules/settings.js b/fuintAdmin_zt/src/store/modules/settings.js
deleted file mode 100644
index 630a2d164..000000000
--- a/fuintAdmin_zt/src/store/modules/settings.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import defaultSettings from '@/settings'
-
-const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
-
-const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
-const state = {
-  title: '',
-  theme:  '#FF9655',
-  sideTheme: storageSetting.sideTheme || sideTheme,
-  showSettings: showSettings,
-  topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
-  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
-  fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
-  sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
-  dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
-}
-const mutations = {
-  CHANGE_SETTING: (state, { key, value }) => {
-    if (state.hasOwnProperty(key)) {
-      state[key] = value
-    }
-  }
-}
-
-const actions = {
-  // 修改布局设置
-  changeSetting({ commit }, data) {
-    commit('CHANGE_SETTING', data)
-  },
-  // 设置网页标题
-  setTitle({ commit }, title) {
-    state.title = title
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
-
diff --git a/fuintAdmin_zt/src/store/modules/tagsView.js b/fuintAdmin_zt/src/store/modules/tagsView.js
deleted file mode 100644
index d12c8d8a7..000000000
--- a/fuintAdmin_zt/src/store/modules/tagsView.js
+++ /dev/null
@@ -1,207 +0,0 @@
-const state = {
-  visitedViews: [],
-  cachedViews: []
-}
-
-const mutations = {
-  ADD_VISITED_VIEW: (state, view) => {
-    if (state.visitedViews.some(v => v.path === view.path)) return
-    state.visitedViews.push(
-      Object.assign({}, view, {
-        title: view.meta.title || 'no-name'
-      })
-    )
-  },
-  ADD_CACHED_VIEW: (state, view) => {
-    if (state.cachedViews.includes(view.name)) return
-    if (view.meta && !view.meta.noCache) {
-      state.cachedViews.push(view.name)
-    }
-  },
-
-  DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
-      }
-    }
-  },
-  DEL_CACHED_VIEW: (state, view) => {
-    const index = state.cachedViews.indexOf(view.name)
-    index > -1 && state.cachedViews.splice(index, 1)
-  },
-
-  DEL_OTHERS_VISITED_VIEWS: (state, view) => {
-    state.visitedViews = state.visitedViews.filter(v => {
-      return v.meta.affix || v.path === view.path
-    })
-  },
-  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
-    const index = state.cachedViews.indexOf(view.name)
-    if (index > -1) {
-      state.cachedViews = state.cachedViews.slice(index, index + 1)
-    } else {
-      state.cachedViews = []
-    }
-  },
-
-  DEL_ALL_VISITED_VIEWS: state => {
-    // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
-    state.visitedViews = affixTags
-  },
-  DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
-  },
-
-  UPDATE_VISITED_VIEW: (state, view) => {
-    for (let v of state.visitedViews) {
-      if (v.path === view.path) {
-        v = Object.assign(v, view)
-        break
-      }
-    }
-  },
-  
-  DEL_RIGHT_VIEWS: (state, view) => {
-    const index = state.visitedViews.findIndex(v => v.path === view.path)
-    if (index === -1) {
-      return
-    }
-    state.visitedViews = state.visitedViews.filter((item, idx) => {
-      if (idx <= index || (item.meta && item.meta.affix)) {
-        return true
-      }
-      const i = state.cachedViews.indexOf(item.name)
-      if (i > -1) {
-        state.cachedViews.splice(i, 1)
-      }
-      return false
-    })
-  },
-
-  DEL_LEFT_VIEWS: (state, view) => {
-    const index = state.visitedViews.findIndex(v => v.path === view.path)
-    if (index === -1) {
-      return
-    }
-    state.visitedViews = state.visitedViews.filter((item, idx) => {
-      if (idx >= index || (item.meta && item.meta.affix)) {
-        return true
-      }
-      const i = state.cachedViews.indexOf(item.name)
-      if (i > -1) {
-        state.cachedViews.splice(i, 1)
-      }
-      return false
-    })
-  }
-}
-
-const actions = {
-  addView({ dispatch }, view) {
-    dispatch('addVisitedView', view)
-    dispatch('addCachedView', view)
-  },
-  addVisitedView({ commit }, view) {
-    commit('ADD_VISITED_VIEW', view)
-  },
-  addCachedView({ commit }, view) {
-    commit('ADD_CACHED_VIEW', view)
-  },
-
-  delView({ dispatch, state }, view) {
-    return new Promise(resolve => {
-      dispatch('delVisitedView', view)
-      dispatch('delCachedView', view)
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews]
-      })
-    })
-  },
-  delVisitedView({ commit, state }, view) {
-    return new Promise(resolve => {
-      commit('DEL_VISITED_VIEW', view)
-      resolve([...state.visitedViews])
-    })
-  },
-  delCachedView({ commit, state }, view) {
-    return new Promise(resolve => {
-      commit('DEL_CACHED_VIEW', view)
-      resolve([...state.cachedViews])
-    })
-  },
-
-  delOthersViews({ dispatch, state }, view) {
-    return new Promise(resolve => {
-      dispatch('delOthersVisitedViews', view)
-      dispatch('delOthersCachedViews', view)
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews]
-      })
-    })
-  },
-  delOthersVisitedViews({ commit, state }, view) {
-    return new Promise(resolve => {
-      commit('DEL_OTHERS_VISITED_VIEWS', view)
-      resolve([...state.visitedViews])
-    })
-  },
-  delOthersCachedViews({ commit, state }, view) {
-    return new Promise(resolve => {
-      commit('DEL_OTHERS_CACHED_VIEWS', view)
-      resolve([...state.cachedViews])
-    })
-  },
-
-  delAllViews({ dispatch, state }, view) {
-    return new Promise(resolve => {
-      dispatch('delAllVisitedViews', view)
-      dispatch('delAllCachedViews', view)
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews]
-      })
-    })
-  },
-  delAllVisitedViews({ commit, state }) {
-    return new Promise(resolve => {
-      commit('DEL_ALL_VISITED_VIEWS')
-      resolve([...state.visitedViews])
-    })
-  },
-  delAllCachedViews({ commit, state }) {
-    return new Promise(resolve => {
-      commit('DEL_ALL_CACHED_VIEWS')
-      resolve([...state.cachedViews])
-    })
-  },
-
-  updateVisitedView({ commit }, view) {
-    commit('UPDATE_VISITED_VIEW', view)
-  },
-
-  delRightTags({ commit }, view) {
-    return new Promise(resolve => {
-      commit('DEL_RIGHT_VIEWS', view)
-      resolve([...state.visitedViews])
-    })
-  },
-
-  delLeftTags({ commit }, view) {
-    return new Promise(resolve => {
-      commit('DEL_LEFT_VIEWS', view)
-      resolve([...state.visitedViews])
-    })
-  },
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
diff --git a/fuintAdmin_zt/src/store/modules/token.js b/fuintAdmin_zt/src/store/modules/token.js
deleted file mode 100644
index 5c95d2a3e..000000000
--- a/fuintAdmin_zt/src/store/modules/token.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-const token = {
-    state: {
-        token:''
-    },
-
-    mutations: {
-        setToken: (state, token) => {
-            state.token = token;
-        },
-        getToken: (state, token) => {
-        state.token = token;
-        }
-    },
-
-    actions: {
-        async setTokenAsync({ commit }, token) {
-            // 这里可以进行异步操作，例如 API 调用等
-            // 假设你在这里调用了异步 API 获取 token
-            const response = await api.getToken();
-            const fetchedToken = response.data.token;
-        
-            // 提交 mutation 更新 token
-            commit('setToken', fetchedToken);
-        },
-    }
-}
-
-export default token
diff --git a/fuintAdmin_zt/src/store/modules/user.js b/fuintAdmin_zt/src/store/modules/user.js
deleted file mode 100644
index 22e8f4112..000000000
--- a/fuintAdmin_zt/src/store/modules/user.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
-import Cookies from "js-cookie";
-
-const user = {
-  state: {
-    token: getToken(),
-    name: '',
-    avatar: '',
-    roles: [],
-    permissions: [],
-    merchantId: '',
-    merchantName: '',
-    storeId: '',
-    storeName: ''
-  },
-
-  mutations: {
-    SET_TOKEN: (state, token) => {
-      state.token = token
-    },
-    SET_NAME: (state, name) => {
-      state.name = name
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
-    },
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-    },
-    SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-    },
-    SET_MERCHANT_ID: (state, merchantId) => {
-      state.merchantId = merchantId
-    },
-    SET_MERCHANT_NAME: (state, merchantName) => {
-      state.merchantName = merchantName
-    },
-    SET_STORE_ID: (state, storeId) => {
-      state.storeId = storeId
-    },
-    SET_STORE_NAME: (state, storeName) => {
-      state.storeName = storeName
-    },
-  },
-
-  actions: {
-    // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const captchaCode = userInfo.captchaCode
-      const uuid = userInfo.uuid
-      return new Promise((resolve, reject) => {
-        login(username, password, captchaCode, uuid).then(res => {
-
-
-          console.log("user_58",res.data)
-          if (res.data.ownerId !== "3") {
-            setToken(res.data.token)
-            commit('SET_TOKEN', res.data.token)
-            // Cookies.remove('IS_BK_LOGIN');
-            sessionStorage.removeItem('IS_BK_LOGIN');
-
-          }else {
-            // Cookies.set("IS_BK_LOGIN", JSON.stringify(res.data));
-            sessionStorage.setItem("IS_BK_LOGIN", JSON.stringify(res.data));
-            const storedValue = sessionStorage.getItem('IS_BK_LOGIN');
-            console.log(storedValue); // 输出: "value"
-          }
-
-
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 获取用户信息
-    GetInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.data.accountInfo
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/avatar.png") : process.env.VUE_APP_BASE_API + user.avatar;
-          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-              commit('SET_ROLES', res.data.roles)
-              commit('SET_PERMISSIONS', res.data.permissions)
-          } else {
-              commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', user.accountName)
-          commit('SET_AVATAR', avatar)
-          commit('SET_MERCHANT_ID',  user.merchantId)
-          commit('SET_MERCHANT_NAME',  user.merchantName)
-          commit('SET_STORE_ID',  user.storeId)
-          commit('SET_STORE_NAME',  user.storeName)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 退出系统
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          commit('SET_MERCHANT_ID',  '')
-          commit('SET_MERCHANT_NAME',  '')
-          commit('SET_STORE_ID', '')
-          commit('SET_STORE_NAME', '')
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    }
-  }
-}
-
-export default user
diff --git a/fuintAdmin_zt/src/utils/auth.js b/fuintAdmin_zt/src/utils/auth.js
deleted file mode 100644
index 5da32d74c..000000000
--- a/fuintAdmin_zt/src/utils/auth.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// import Cookies from 'js-cookie'
-
-// const TokenKey = 'Access-Token-Admin'
-// const UserKey = 'User-Id'
-
-// export function getToken() {
-//   return Cookies.get(TokenKey)
-// }
-
-// export function setToken(token) {
-//   return Cookies.set(TokenKey, token)
-// }
-
-// export function removeToken() {
-//   return Cookies.remove(TokenKey)
-// }
-
-// export function getUserId() {
-//   return Cookies.get(UserKey)
-// }
-
-// export function setUserId(userId) {
-//   return Cookies.set(UserKey, userId)
-// }
-
-// export function removeUserId() {
-//   return Cookies.remove(UserKey)
-// }
-
-
-
-import store from '@/store/index'
-
-import Cookies from 'js-cookie'
-
-// import localStorage from 'localStorage';
-
-const TokenKey = 'Access-Token-Admin'
-const UserKey = 'User-Id'
-
-export function getToken() {
-  let token
-  if( store) {
-    // console.log("store",store.state.token.token)
-
-    token  = store.state.token.token
-  }
-  return token
-  // const currentToken = store.state.token;
-  // console.log('Current Token:', currentToken.token);
-  // console.log("111111111",currentToken)
-  // return Cookies.get(TokenKey)
-  // return store.state.token
-}
-
-export function setToken(token) {
-  return store.commit('setToken', token);
-}
-
-export function removeToken() {
-
-  // 从本地存储中删除持久化的信息
-  localStorage.removeItem('token'); 
-  return store.state.token = ''
-}
-
-export function getUserId() {
-  return Cookies.get(UserKey)
-}
-
-export function setUserId(userId) {
-  return Cookies.set(UserKey, userId)
-}
-
-export function removeUserId() {
-  return Cookies.remove(UserKey)
-}
diff --git a/fuintAdmin_zt/src/utils/dict/Dict.js b/fuintAdmin_zt/src/utils/dict/Dict.js
deleted file mode 100644
index c5b674721..000000000
--- a/fuintAdmin_zt/src/utils/dict/Dict.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import Vue from 'vue'
-import { mergeRecursive } from "@/utils/fuint";
-import DictMeta from './DictMeta'
-import DictData from './DictData'
-
-const DEFAULT_DICT_OPTIONS = {
-  types: [],
-}
-
-/**
- * @classdesc 字典
- * @property {Object} label 标签对象，内部属性名为字典类型名称
- * @property {Object} dict 字段数组，内部属性名为字典类型名称
- * @property {Array.<DictMeta>} _dictMetas 字典元数据数组
- */
-export default class Dict {
-  constructor() {
-    this.owner = null
-    this.label = {}
-    this.type = {}
-  }
-
-  init(options) {
-    if (options instanceof Array) {
-      options = { types: options }
-    }
-    const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options)
-    if (opts.types === undefined) {
-      throw new Error('need dict types')
-    }
-    const ps = []
-    this._dictMetas = opts.types.map(t => DictMeta.parse(t))
-    this._dictMetas.forEach(dictMeta => {
-      const type = dictMeta.type
-      Vue.set(this.label, type, {})
-      Vue.set(this.type, type, [])
-      if (dictMeta.lazy) {
-        return
-      }
-      ps.push(loadDict(this, dictMeta))
-    })
-    return Promise.all(ps)
-  }
-
-  /**
-   * 重新加载字典
-   * @param {String} type 字典类型
-   */
-  reloadDict(type) {
-    const dictMeta = this._dictMetas.find(e => e.type === type)
-    if (dictMeta === undefined) {
-      return Promise.reject(`the dict meta of ${type} was not found`)
-    }
-    return loadDict(this, dictMeta)
-  }
-}
-
-/**
- * 加载字典
- * @param {Dict} dict 字典
- * @param {DictMeta} dictMeta 字典元数据
- * @returns {Promise}
- */
-function loadDict(dict, dictMeta) {
-  return dictMeta.request(dictMeta)
-    .then(response => {
-      const type = dictMeta.type
-      let dicts = dictMeta.responseConverter(response, dictMeta)
-      if (!(dicts instanceof Array)) {
-        console.error('the return of responseConverter must be Array.<DictData>')
-        dicts = []
-      } else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) {
-        console.error('the type of elements in dicts must be DictData')
-        dicts = []
-      }
-      dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts)
-      dicts.forEach(d => {
-        Vue.set(dict.label[type], d.value, d.label)
-      })
-      return dicts
-    })
-}
diff --git a/fuintAdmin_zt/src/utils/dict/DictConverter.js b/fuintAdmin_zt/src/utils/dict/DictConverter.js
deleted file mode 100644
index 0cf5df863..000000000
--- a/fuintAdmin_zt/src/utils/dict/DictConverter.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import DictOptions from './DictOptions'
-import DictData from './DictData'
-
-export default function(dict, dictMeta) {
-  const label = determineDictField(dict, dictMeta.labelField, ...DictOptions.DEFAULT_LABEL_FIELDS)
-  const value = determineDictField(dict, dictMeta.valueField, ...DictOptions.DEFAULT_VALUE_FIELDS)
-  return new DictData(dict[label], dict[value], dict)
-}
-
-/**
- * 确定字典字段
- * @param {DictData} dict
- * @param  {...String} fields
- */
-function determineDictField(dict, ...fields) {
-  return fields.find(f => Object.prototype.hasOwnProperty.call(dict, f))
-}
diff --git a/fuintAdmin_zt/src/utils/dict/DictData.js b/fuintAdmin_zt/src/utils/dict/DictData.js
deleted file mode 100644
index afc763e80..000000000
--- a/fuintAdmin_zt/src/utils/dict/DictData.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @classdesc 字典数据
- * @property {String} label 标签
- * @property {*} value 标签
- * @property {Object} raw 原始数据
- */
-export default class DictData {
-  constructor(label, value, raw) {
-    this.label = label
-    this.value = value
-    this.raw = raw
-  }
-}
diff --git a/fuintAdmin_zt/src/utils/dict/DictMeta.js b/fuintAdmin_zt/src/utils/dict/DictMeta.js
deleted file mode 100644
index 7582643eb..000000000
--- a/fuintAdmin_zt/src/utils/dict/DictMeta.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { mergeRecursive } from "@/utils/fuint";
-import DictOptions from './DictOptions'
-
-/**
- * @classdesc 字典元数据
- * @property {String} type 类型
- * @property {Function} request 请求
- * @property {String} label 标签字段
- * @property {String} value 值字段
- */
-export default class DictMeta {
-  constructor(options) {
-    this.type = options.type
-    this.request = options.request,
-    this.responseConverter = options.responseConverter
-    this.labelField = options.labelField
-    this.valueField = options.valueField
-    this.lazy = options.lazy === true
-  }
-}
-
-
-/**
- * 解析字典元数据
- * @param {Object} options
- * @returns {DictMeta}
- */
-DictMeta.parse= function(options) {
-  let opts = null
-  if (typeof options === 'string') {
-    opts = DictOptions.metas[options] || {}
-    opts.type = options
-  } else if (typeof options === 'object') {
-    opts = options
-  }
-  opts = mergeRecursive(DictOptions.metas['*'], opts)
-  return new DictMeta(opts)
-}
diff --git a/fuintAdmin_zt/src/utils/dict/DictOptions.js b/fuintAdmin_zt/src/utils/dict/DictOptions.js
deleted file mode 100644
index 83dac7e92..000000000
--- a/fuintAdmin_zt/src/utils/dict/DictOptions.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { mergeRecursive } from "@/utils/fuint";
-import dictConverter from './DictConverter'
-
-export const options = {
-  metas: {
-    '*': {
-      /**
-       * 字典请求，方法签名为function(dictMeta: DictMeta): Promise
-       */
-      request: (dictMeta) => {
-        console.log(`load dict ${dictMeta.type}`)
-        return Promise.resolve([])
-      },
-      /**
-       * 字典响应数据转换器，方法签名为function(response: Object, dictMeta: DictMeta): DictData
-       */
-      responseConverter,
-      labelField: 'label',
-      valueField: 'value',
-    },
-  },
-  /**
-   * 默认标签字段
-   */
-  DEFAULT_LABEL_FIELDS: ['label', 'name', 'title'],
-  /**
-   * 默认值字段
-   */
-  DEFAULT_VALUE_FIELDS: ['value', 'id', 'uid', 'key'],
-}
-
-/**
- * 映射字典
- * @param {Object} response 字典数据
- * @param {DictMeta} dictMeta 字典元数据
- * @returns {DictData}
- */
-function responseConverter(response, dictMeta) {
-  const dicts = response.content instanceof Array ? response.content : response
-  if (dicts === undefined) {
-    console.warn(`no dict data of "${dictMeta.type}" found in the response`)
-    return []
-  }
-  return dicts.map(d => dictConverter(d, dictMeta))
-}
-
-export function mergeOptions(src) {
-  mergeRecursive(options, src)
-}
-
-export default options
diff --git a/fuintAdmin_zt/src/utils/dict/index.js b/fuintAdmin_zt/src/utils/dict/index.js
deleted file mode 100644
index 215eb9e05..000000000
--- a/fuintAdmin_zt/src/utils/dict/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Dict from './Dict'
-import { mergeOptions } from './DictOptions'
-
-export default function(Vue, options) {
-  mergeOptions(options)
-  Vue.mixin({
-    data() {
-      if (this.$options === undefined || this.$options.dicts === undefined || this.$options.dicts === null) {
-        return {}
-      }
-      const dict = new Dict()
-      dict.owner = this
-      return {
-        dict
-      }
-    },
-    created() {
-      if (!(this.dict instanceof Dict)) {
-        return
-      }
-      options.onCreated && options.onCreated(this.dict)
-      this.dict.init(this.$options.dicts).then(() => {
-        options.onReady && options.onReady(this.dict)
-        this.$nextTick(() => {
-          this.$emit('dictReady', this.dict)
-          if (this.$options.methods && this.$options.methods.onDictReady instanceof Function) {
-            this.$options.methods.onDictReady.call(this, this.dict)
-          }
-        })
-      })
-    },
-  })
-}
diff --git a/fuintAdmin_zt/src/utils/errorCode.js b/fuintAdmin_zt/src/utils/errorCode.js
deleted file mode 100644
index 598a100d3..000000000
--- a/fuintAdmin_zt/src/utils/errorCode.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  '401': '认证失败，无法访问系统资源',
-  '403': '当前操作没有权限',
-  '404': '您访问资源不存在',
-  'default': '系统未知错误，请反馈给管理员'
-}
diff --git a/fuintAdmin_zt/src/utils/fuint.js b/fuintAdmin_zt/src/utils/fuint.js
deleted file mode 100644
index bddb219d2..000000000
--- a/fuintAdmin_zt/src/utils/fuint.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * 通用js方法封装处理
- * Copyright (c) 2022 https://www.fuint.cn
- */
-
-// 获取过去n天时间
-export function getNumDayTime(dayNum) {
-  let currentDate = new Date(); // 获取当前日期
-  currentDate.setDate(currentDate.getDate() - dayNum); // 将当前日期减去30天
-
-  let year = currentDate.getFullYear(); // 获取年份
-  let month = currentDate.getMonth() + 1; // 获取月份（注意月份从0开始，需要加1）
-  let day = currentDate.getDate(); // 获取日期
-  let h = dayNum > 0 ? 0 : currentDate.getHours();
-  let m = dayNum > 0 ? 0 : currentDate.getMinutes();
-  let i = dayNum > 0 ? 0 : currentDate.getSeconds();
-
-  // 格式化日期为字符串（例如：YYYY-MM-DD）
-  let formattedDate = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day} ${h}:${m}:${i}`;
-  return formattedDate;
-}
-
-
-// 日期格式化
-export function parseTime(time, pattern) {
-  if (arguments.length === 0 || !time) {
-    return null
-  }
-  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
-    } else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
-    }
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
-      time = time * 1000
-    }
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return time_str
-}
-
-// 表单重置
-export function resetForm(refName) {
-  if (this.$refs[refName]) {
-    this.$refs[refName].resetFields();
-  }
-}
-
-// 添加日期范围
-export function addDateRange(params, dateRange, propName) {
-  let search = params;
-  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
-  dateRange = Array.isArray(dateRange) ? dateRange : [];
-  if (typeof (propName) === 'undefined') {
-    search.params['beginTime'] = dateRange[0];
-    search.params['endTime'] = dateRange[1];
-  } else {
-    search.params['begin' + propName] = dateRange[0];
-    search.params['end' + propName] = dateRange[1];
-  }
-  return search;
-}
-
-// 回显数据字典
-export function getName(datas, value) {
-   if (datas.length < 1) {
-       return "-"
-   }
-   let result = "-";
-   datas.forEach(function(item) {
-      if (item.id == value || item.key == value) {
-          result = item.name;
-      }
-   })
-   return result
-}
-
-// 字符串格式化(%s )
-export function sprintf(str) {
-  var args = arguments, flag = true, i = 1;
-  str = str.replace(/%s/g, function () {
-    var arg = args[i++];
-    if (typeof arg === 'undefined') {
-      flag = false;
-      return '';
-    }
-    return arg;
-  });
-  return flag ? str : '';
-}
-
-// 转换字符串，undefined,null等转化为""
-export function parseStrEmpty(str) {
-  if (!str || str == "undefined" || str == "null") {
-    return "";
-  }
-  return str;
-}
-
-// 数据合并
-export function mergeRecursive(source, target) {
-  for (var p in target) {
-    try {
-      if (target[p].constructor == Object) {
-        source[p] = mergeRecursive(source[p], target[p]);
-      } else {
-        source[p] = target[p];
-      }
-    } catch (e) {
-      source[p] = target[p];
-    }
-  }
-  return source;
-};
-
-/**
- * 构造树型结构数据
- * @param {*} data 数据源
- * @param {*} id id字段 默认 'id'
- * @param {*} parentId 父节点字段 默认 'parentId'
- * @param {*} children 孩子节点字段 默认 'children'
- */
-export function handleTree(data, id, parentId, children) {
-  let config = {
-    id: id || 'id',
-    parentId: parentId || 'parentId',
-    childrenList: children || 'children'
-  };
-
-  var childrenListMap = {};
-  var nodeIds = {};
-  var tree = [];
-
-  for (let d of data) {
-    let parentId = d[config.parentId];
-    if (childrenListMap[parentId] == null) {
-      childrenListMap[parentId] = [];
-    }
-    nodeIds[d[config.id]] = d;
-    childrenListMap[parentId].push(d);
-  }
-
-  for (let d of data) {
-    let parentId = d[config.parentId];
-    if (nodeIds[parentId] == null) {
-      tree.push(d);
-    }
-  }
-
-  for (let t of tree) {
-    adaptToChildrenList(t);
-  }
-
-  function adaptToChildrenList(o) {
-    if (childrenListMap[o[config.id]] !== null) {
-      o[config.childrenList] = childrenListMap[o[config.id]];
-    }
-    if (o[config.childrenList]) {
-      for (let c of o[config.childrenList]) {
-        adaptToChildrenList(c);
-      }
-    }
-  }
-  return tree;
-}
-
-/**
-* 参数处理
-* @param {*} params  参数
-*/
-export function tansParams(params) {
-  let result = ''
-  for (const propName of Object.keys(params)) {
-    const value = params[propName];
-    var part = encodeURIComponent(propName) + "=";
-    if (value !== null && typeof (value) !== "undefined") {
-      if (typeof value === 'object') {
-        for (const key of Object.keys(value)) {
-          if (value[key] !== null && typeof (value[key]) !== 'undefined') {
-            let params = propName + '[' + key + ']';
-            var subPart = encodeURIComponent(params) + "=";
-            result += subPart + encodeURIComponent(value[key]) + "&";
-          }
-        }
-      } else {
-        result += part + encodeURIComponent(value) + "&";
-      }
-    }
-  }
-  return result
-}
-
-// 验证是否为blob格式
-export async function blobValidate(data) {
-  try {
-    const text = await data.text();
-    JSON.parse(text);
-    return false;
-  } catch (error) {
-    return true;
-  }
-}
-
diff --git a/fuintAdmin_zt/src/utils/generator/config.js b/fuintAdmin_zt/src/utils/generator/config.js
deleted file mode 100644
index 7abf227d5..000000000
--- a/fuintAdmin_zt/src/utils/generator/config.js
+++ /dev/null
@@ -1,438 +0,0 @@
-export const formConf = {
-  formRef: 'elForm',
-  formModel: 'formData',
-  size: 'medium',
-  labelPosition: 'right',
-  labelWidth: 100,
-  formRules: 'rules',
-  gutter: 15,
-  disabled: false,
-  span: 24,
-  formBtns: true
-}
-
-export const inputComponents = [
-  {
-    label: '单行文本',
-    tag: 'el-input',
-    tagIcon: 'input',
-    placeholder: '请输入',
-    defaultValue: undefined,
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    clearable: true,
-    prepend: '',
-    append: '',
-    'prefix-icon': '',
-    'suffix-icon': '',
-    maxlength: null,
-    'show-word-limit': false,
-    readonly: false,
-    disabled: false,
-    required: true,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/input'
-  },
-  {
-    label: '多行文本',
-    tag: 'el-input',
-    tagIcon: 'textarea',
-    type: 'textarea',
-    placeholder: '请输入',
-    defaultValue: undefined,
-    span: 24,
-    labelWidth: null,
-    autosize: {
-      minRows: 4,
-      maxRows: 4
-    },
-    style: { width: '100%' },
-    maxlength: null,
-    'show-word-limit': false,
-    readonly: false,
-    disabled: false,
-    required: true,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/input'
-  },
-  {
-    label: '密码',
-    tag: 'el-input',
-    tagIcon: 'password',
-    placeholder: '请输入',
-    defaultValue: undefined,
-    span: 24,
-    'show-password': true,
-    labelWidth: null,
-    style: { width: '100%' },
-    clearable: true,
-    prepend: '',
-    append: '',
-    'prefix-icon': '',
-    'suffix-icon': '',
-    maxlength: null,
-    'show-word-limit': false,
-    readonly: false,
-    disabled: false,
-    required: true,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/input'
-  },
-  {
-    label: '计数器',
-    tag: 'el-input-number',
-    tagIcon: 'number',
-    placeholder: '',
-    defaultValue: undefined,
-    span: 24,
-    labelWidth: null,
-    min: undefined,
-    max: undefined,
-    step: undefined,
-    'step-strictly': false,
-    precision: undefined,
-    'controls-position': '',
-    disabled: false,
-    required: true,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/input-number'
-  }
-]
-
-export const selectComponents = [
-  {
-    label: '下拉选择',
-    tag: 'el-select',
-    tagIcon: 'select',
-    placeholder: '请选择',
-    defaultValue: undefined,
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    clearable: true,
-    disabled: false,
-    required: true,
-    filterable: false,
-    multiple: false,
-    options: [{
-      label: '选项一',
-      value: 1
-    }, {
-      label: '选项二',
-      value: 2
-    }],
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/select'
-  },
-  {
-    label: '级联选择',
-    tag: 'el-cascader',
-    tagIcon: 'cascader',
-    placeholder: '请选择',
-    defaultValue: [],
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    props: {
-      props: {
-        multiple: false
-      }
-    },
-    'show-all-levels': true,
-    disabled: false,
-    clearable: true,
-    filterable: false,
-    required: true,
-    options: [{
-      id: 1,
-      value: 1,
-      label: '选项1',
-      children: [{
-        id: 2,
-        value: 2,
-        label: '选项1-1'
-      }]
-    }],
-    dataType: 'dynamic',
-    labelKey: 'label',
-    valueKey: 'value',
-    childrenKey: 'children',
-    separator: '/',
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/cascader'
-  },
-  {
-    label: '单选框组',
-    tag: 'el-radio-group',
-    tagIcon: 'radio',
-    defaultValue: undefined,
-    span: 24,
-    labelWidth: null,
-    style: {},
-    optionType: 'default',
-    border: false,
-    size: 'medium',
-    disabled: false,
-    required: true,
-    options: [{
-      label: '选项一',
-      value: 1
-    }, {
-      label: '选项二',
-      value: 2
-    }],
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/radio'
-  },
-  {
-    label: '多选框组',
-    tag: 'el-checkbox-group',
-    tagIcon: 'checkbox',
-    defaultValue: [],
-    span: 24,
-    labelWidth: null,
-    style: {},
-    optionType: 'default',
-    border: false,
-    size: 'medium',
-    disabled: false,
-    required: true,
-    options: [{
-      label: '选项一',
-      value: 1
-    }, {
-      label: '选项二',
-      value: 2
-    }],
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/checkbox'
-  },
-  {
-    label: '开关',
-    tag: 'el-switch',
-    tagIcon: 'switch',
-    defaultValue: false,
-    span: 24,
-    labelWidth: null,
-    style: {},
-    disabled: false,
-    required: true,
-    'active-text': '',
-    'inactive-text': '',
-    'active-color': null,
-    'inactive-color': null,
-    'active-value': true,
-    'inactive-value': false,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/switch'
-  },
-  {
-    label: '滑块',
-    tag: 'el-slider',
-    tagIcon: 'slider',
-    defaultValue: null,
-    span: 24,
-    labelWidth: null,
-    disabled: false,
-    required: true,
-    min: 0,
-    max: 100,
-    step: 1,
-    'show-stops': false,
-    range: false,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/slider'
-  },
-  {
-    label: '时间选择',
-    tag: 'el-time-picker',
-    tagIcon: 'time',
-    placeholder: '请选择',
-    defaultValue: null,
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    disabled: false,
-    clearable: true,
-    required: true,
-    'picker-options': {
-      selectableRange: '00:00:00-23:59:59'
-    },
-    format: 'HH:mm:ss',
-    'value-format': 'HH:mm:ss',
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/time-picker'
-  },
-  {
-    label: '时间范围',
-    tag: 'el-time-picker',
-    tagIcon: 'time-range',
-    defaultValue: null,
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    disabled: false,
-    clearable: true,
-    required: true,
-    'is-range': true,
-    'range-separator': '至',
-    'start-placeholder': '开始时间',
-    'end-placeholder': '结束时间',
-    format: 'HH:mm:ss',
-    'value-format': 'HH:mm:ss',
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/time-picker'
-  },
-  {
-    label: '日期选择',
-    tag: 'el-date-picker',
-    tagIcon: 'date',
-    placeholder: '请选择',
-    defaultValue: null,
-    type: 'date',
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    disabled: false,
-    clearable: true,
-    required: true,
-    format: 'yyyy-MM-dd',
-    'value-format': 'yyyy-MM-dd',
-    readonly: false,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/date-picker'
-  },
-  {
-    label: '日期范围',
-    tag: 'el-date-picker',
-    tagIcon: 'date-range',
-    defaultValue: null,
-    span: 24,
-    labelWidth: null,
-    style: { width: '100%' },
-    type: 'daterange',
-    'range-separator': '至',
-    'start-placeholder': '开始日期',
-    'end-placeholder': '结束日期',
-    disabled: false,
-    clearable: true,
-    required: true,
-    format: 'yyyy-MM-dd',
-    'value-format': 'yyyy-MM-dd',
-    readonly: false,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/date-picker'
-  },
-  {
-    label: '评分',
-    tag: 'el-rate',
-    tagIcon: 'rate',
-    defaultValue: 0,
-    span: 24,
-    labelWidth: null,
-    style: {},
-    max: 5,
-    'allow-half': false,
-    'show-text': false,
-    'show-score': false,
-    disabled: false,
-    required: true,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/rate'
-  },
-  {
-    label: '颜色选择',
-    tag: 'el-color-picker',
-    tagIcon: 'color',
-    defaultValue: null,
-    labelWidth: null,
-    'show-alpha': false,
-    'color-format': '',
-    disabled: false,
-    required: true,
-    size: 'medium',
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/color-picker'
-  },
-  {
-    label: '上传',
-    tag: 'el-upload',
-    tagIcon: 'upload',
-    action: 'https://jsonplaceholder.typicode.com/posts/',
-    defaultValue: null,
-    labelWidth: null,
-    disabled: false,
-    required: true,
-    accept: '',
-    name: 'file',
-    'auto-upload': true,
-    showTip: false,
-    buttonText: '点击上传',
-    fileSize: 2,
-    sizeUnit: 'MB',
-    'list-type': 'text',
-    multiple: false,
-    regList: [],
-    changeTag: true,
-    document: 'https://element.eleme.cn/#/zh-CN/component/upload'
-  }
-]
-
-export const layoutComponents = [
-  {
-    layout: 'rowFormItem',
-    tagIcon: 'row',
-    type: 'default',
-    justify: 'start',
-    align: 'top',
-    label: '行容器',
-    layoutTree: true,
-    children: [],
-    document: 'https://element.eleme.cn/#/zh-CN/component/layout'
-  },
-  {
-    layout: 'colFormItem',
-    label: '按钮',
-    changeTag: true,
-    labelWidth: null,
-    tag: 'el-button',
-    tagIcon: 'button',
-    span: 24,
-    default: '主要按钮',
-    type: 'primary',
-    icon: 'el-icon-search',
-    size: 'medium',
-    disabled: false,
-    document: 'https://element.eleme.cn/#/zh-CN/component/button'
-  }
-]
-
-// 组件rule的触发方式，无触发方式的组件不生成rule
-export const trigger = {
-  'el-input': 'blur',
-  'el-input-number': 'blur',
-  'el-select': 'change',
-  'el-radio-group': 'change',
-  'el-checkbox-group': 'change',
-  'el-cascader': 'change',
-  'el-time-picker': 'change',
-  'el-date-picker': 'change',
-  'el-rate': 'change'
-}
diff --git a/fuintAdmin_zt/src/utils/generator/css.js b/fuintAdmin_zt/src/utils/generator/css.js
deleted file mode 100644
index c1c62e607..000000000
--- a/fuintAdmin_zt/src/utils/generator/css.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const styles = {
-  'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}',
-  'el-upload': '.el-upload__tip{line-height: 1.2;}'
-}
-
-function addCss(cssList, el) {
-  const css = styles[el.tag]
-  css && cssList.indexOf(css) === -1 && cssList.push(css)
-  if (el.children) {
-    el.children.forEach(el2 => addCss(cssList, el2))
-  }
-}
-
-export function makeUpCss(conf) {
-  const cssList = []
-  conf.fields.forEach(el => addCss(cssList, el))
-  return cssList.join('\n')
-}
diff --git a/fuintAdmin_zt/src/utils/generator/drawingDefault.js b/fuintAdmin_zt/src/utils/generator/drawingDefault.js
deleted file mode 100644
index 09f133ca1..000000000
--- a/fuintAdmin_zt/src/utils/generator/drawingDefault.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export default [
-  {
-    layout: 'colFormItem',
-    tagIcon: 'input',
-    label: '手机号',
-    vModel: 'mobile',
-    formId: 6,
-    tag: 'el-input',
-    placeholder: '请输入手机号',
-    defaultValue: '',
-    span: 24,
-    style: { width: '100%' },
-    clearable: true,
-    prepend: '',
-    append: '',
-    'prefix-icon': 'el-icon-mobile',
-    'suffix-icon': '',
-    maxlength: 11,
-    'show-word-limit': true,
-    readonly: false,
-    disabled: false,
-    required: true,
-    changeTag: true,
-    regList: [{
-      pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
-      message: '手机号格式错误'
-    }]
-  }
-]
diff --git a/fuintAdmin_zt/src/utils/generator/html.js b/fuintAdmin_zt/src/utils/generator/html.js
deleted file mode 100644
index 9bcc5361d..000000000
--- a/fuintAdmin_zt/src/utils/generator/html.js
+++ /dev/null
@@ -1,359 +0,0 @@
-/* eslint-disable max-len */
-import { trigger } from './config'
-
-let confGlobal
-let someSpanIsNot24
-
-export function dialogWrapper(str) {
-  return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Title">
-    ${str}
-    <div slot="footer">
-      <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="handleConfirm">确定</el-button>
-    </div>
-  </el-dialog>`
-}
-
-export function vueTemplate(str) {
-  return `<template>
-    <div>
-      ${str}
-    </div>
-  </template>`
-}
-
-export function vueScript(str) {
-  return `<script>
-    ${str}
-  </script>`
-}
-
-export function cssStyle(cssStr) {
-  return `<style>
-    ${cssStr}
-  </style>`
-}
-
-function buildFormTemplate(conf, child, type) {
-  let labelPosition = ''
-  if (conf.labelPosition !== 'right') {
-    labelPosition = `label-position="${conf.labelPosition}"`
-  }
-  const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : ''
-  let str = `<el-form ref="${conf.formRef}" :model="${conf.formModel}" :rules="${conf.formRules}" size="${conf.size}" ${disabled} label-width="${conf.labelWidth}px" ${labelPosition}>
-      ${child}
-      ${buildFromBtns(conf, type)}
-    </el-form>`
-  if (someSpanIsNot24) {
-    str = `<el-row :gutter="${conf.gutter}">
-        ${str}
-      </el-row>`
-  }
-  return str
-}
-
-function buildFromBtns(conf, type) {
-  let str = ''
-  if (conf.formBtns && type === 'file') {
-    str = `<el-form-item size="large">
-          <el-button type="primary" @click="submitForm">提交</el-button>
-          <el-button @click="resetForm">重置</el-button>
-        </el-form-item>`
-    if (someSpanIsNot24) {
-      str = `<el-col :span="24">
-          ${str}
-        </el-col>`
-    }
-  }
-  return str
-}
-
-// span不为24的用el-col包裹
-function colWrapper(element, str) {
-  if (someSpanIsNot24 || element.span !== 24) {
-    return `<el-col :span="${element.span}">
-      ${str}
-    </el-col>`
-  }
-  return str
-}
-
-const layouts = {
-  colFormItem(element) {
-    let labelWidth = ''
-    if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) {
-      labelWidth = `label-width="${element.labelWidth}px"`
-    }
-    const required = !trigger[element.tag] && element.required ? 'required' : ''
-    const tagDom = tags[element.tag] ? tags[element.tag](element) : null
-    let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}>
-        ${tagDom}
-      </el-form-item>`
-    str = colWrapper(element, str)
-    return str
-  },
-  rowFormItem(element) {
-    const type = element.type === 'default' ? '' : `type="${element.type}"`
-    const justify = element.type === 'default' ? '' : `justify="${element.justify}"`
-    const align = element.type === 'default' ? '' : `align="${element.align}"`
-    const gutter = element.gutter ? `gutter="${element.gutter}"` : ''
-    const children = element.children.map(el => layouts[el.layout](el))
-    let str = `<el-row ${type} ${justify} ${align} ${gutter}>
-      ${children.join('\n')}
-    </el-row>`
-    str = colWrapper(element, str)
-    return str
-  }
-}
-
-const tags = {
-  'el-button': el => {
-    const {
-      tag, disabled
-    } = attrBuilder(el)
-    const type = el.type ? `type="${el.type}"` : ''
-    const icon = el.icon ? `icon="${el.icon}"` : ''
-    const size = el.size ? `size="${el.size}"` : ''
-    let child = buildElButtonChild(el)
-
-    if (child) child = `\n${child}\n` // 换行
-    return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>`
-  },
-  'el-input': el => {
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
-    const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
-    const readonly = el.readonly ? 'readonly' : ''
-    const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : ''
-    const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : ''
-    const showPassword = el['show-password'] ? 'show-password' : ''
-    const type = el.type ? `type="${el.type}"` : ''
-    const autosize = el.autosize && el.autosize.minRows
-      ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"`
-      : ''
-    let child = buildElInputChild(el)
-
-    if (child) child = `\n${child}\n` // 换行
-    return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}</${el.tag}>`
-  },
-  'el-input-number': el => {
-    const { disabled, vModel, placeholder } = attrBuilder(el)
-    const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : ''
-    const min = el.min ? `:min='${el.min}'` : ''
-    const max = el.max ? `:max='${el.max}'` : ''
-    const step = el.step ? `:step='${el.step}'` : ''
-    const stepStrictly = el['step-strictly'] ? 'step-strictly' : ''
-    const precision = el.precision ? `:precision='${el.precision}'` : ''
-
-    return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}></${el.tag}>`
-  },
-  'el-select': el => {
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const filterable = el.filterable ? 'filterable' : ''
-    const multiple = el.multiple ? 'multiple' : ''
-    let child = buildElSelectChild(el)
-
-    if (child) child = `\n${child}\n` // 换行
-    return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}</${el.tag}>`
-  },
-  'el-radio-group': el => {
-    const { disabled, vModel } = attrBuilder(el)
-    const size = `size="${el.size}"`
-    let child = buildElRadioGroupChild(el)
-
-    if (child) child = `\n${child}\n` // 换行
-    return `<${el.tag} ${vModel} ${size} ${disabled}>${child}</${el.tag}>`
-  },
-  'el-checkbox-group': el => {
-    const { disabled, vModel } = attrBuilder(el)
-    const size = `size="${el.size}"`
-    const min = el.min ? `:min="${el.min}"` : ''
-    const max = el.max ? `:max="${el.max}"` : ''
-    let child = buildElCheckboxGroupChild(el)
-
-    if (child) child = `\n${child}\n` // 换行
-    return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}</${el.tag}>`
-  },
-  'el-switch': el => {
-    const { disabled, vModel } = attrBuilder(el)
-    const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : ''
-    const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : ''
-    const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : ''
-    const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : ''
-    const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : ''
-    const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : ''
-
-    return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}></${el.tag}>`
-  },
-  'el-cascader': el => {
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const options = el.options ? `:options="${el.vModel}Options"` : ''
-    const props = el.props ? `:props="${el.vModel}Props"` : ''
-    const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"'
-    const filterable = el.filterable ? 'filterable' : ''
-    const separator = el.separator === '/' ? '' : `separator="${el.separator}"`
-
-    return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}></${el.tag}>`
-  },
-  'el-slider': el => {
-    const { disabled, vModel } = attrBuilder(el)
-    const min = el.min ? `:min='${el.min}'` : ''
-    const max = el.max ? `:max='${el.max}'` : ''
-    const step = el.step ? `:step='${el.step}'` : ''
-    const range = el.range ? 'range' : ''
-    const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : ''
-
-    return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}></${el.tag}>`
-  },
-  'el-time-picker': el => {
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
-    const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
-    const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
-    const isRange = el['is-range'] ? 'is-range' : ''
-    const format = el.format ? `format="${el.format}"` : ''
-    const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
-    const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : ''
-
-    return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}></${el.tag}>`
-  },
-  'el-date-picker': el => {
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
-    const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
-    const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
-    const format = el.format ? `format="${el.format}"` : ''
-    const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
-    const type = el.type === 'date' ? '' : `type="${el.type}"`
-    const readonly = el.readonly ? 'readonly' : ''
-
-    return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}></${el.tag}>`
-  },
-  'el-rate': el => {
-    const { disabled, vModel } = attrBuilder(el)
-    const max = el.max ? `:max='${el.max}'` : ''
-    const allowHalf = el['allow-half'] ? 'allow-half' : ''
-    const showText = el['show-text'] ? 'show-text' : ''
-    const showScore = el['show-score'] ? 'show-score' : ''
-
-    return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}></${el.tag}>`
-  },
-  'el-color-picker': el => {
-    const { disabled, vModel } = attrBuilder(el)
-    const size = `size="${el.size}"`
-    const showAlpha = el['show-alpha'] ? 'show-alpha' : ''
-    const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : ''
-
-    return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}></${el.tag}>`
-  },
-  'el-upload': el => {
-    const disabled = el.disabled ? ':disabled=\'true\'' : ''
-    const action = el.action ? `:action="${el.vModel}Action"` : ''
-    const multiple = el.multiple ? 'multiple' : ''
-    const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : ''
-    const accept = el.accept ? `accept="${el.accept}"` : ''
-    const name = el.name !== 'file' ? `name="${el.name}"` : ''
-    const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : ''
-    const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"`
-    const fileList = `:file-list="${el.vModel}fileList"`
-    const ref = `ref="${el.vModel}"`
-    let child = buildElUploadChild(el)
-
-    if (child) child = `\n${child}\n` // 换行
-    return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.tag}>`
-  }
-}
-
-function attrBuilder(el) {
-  return {
-    vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`,
-    clearable: el.clearable ? 'clearable' : '',
-    placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '',
-    width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '',
-    disabled: el.disabled ? ':disabled=\'true\'' : ''
-  }
-}
-
-// el-buttin 子级
-function buildElButtonChild(conf) {
-  const children = []
-  if (conf.default) {
-    children.push(conf.default)
-  }
-  return children.join('\n')
-}
-
-// el-input innerHTML
-function buildElInputChild(conf) {
-  const children = []
-  if (conf.prepend) {
-    children.push(`<template slot="prepend">${conf.prepend}</template>`)
-  }
-  if (conf.append) {
-    children.push(`<template slot="append">${conf.append}</template>`)
-  }
-  return children.join('\n')
-}
-
-function buildElSelectChild(conf) {
-  const children = []
-  if (conf.options && conf.options.length) {
-    children.push(`<el-option v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>`)
-  }
-  return children.join('\n')
-}
-
-function buildElRadioGroupChild(conf) {
-  const children = []
-  if (conf.options && conf.options.length) {
-    const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio'
-    const border = conf.border ? 'border' : ''
-    children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
-  }
-  return children.join('\n')
-}
-
-function buildElCheckboxGroupChild(conf) {
-  const children = []
-  if (conf.options && conf.options.length) {
-    const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
-    const border = conf.border ? 'border' : ''
-    children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
-  }
-  return children.join('\n')
-}
-
-function buildElUploadChild(conf) {
-  const list = []
-  if (conf['list-type'] === 'picture-card') list.push('<i class="el-icon-plus"></i>')
-  else list.push(`<el-button size="small" type="primary" icon="el-icon-upload">${conf.buttonText}</el-button>`)
-  if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件</div>`)
-  return list.join('\n')
-}
-
-export function makeUpHtml(conf, type) {
-  const htmlList = []
-  confGlobal = conf
-  someSpanIsNot24 = conf.fields.some(item => item.span !== 24)
-  conf.fields.forEach(el => {
-    htmlList.push(layouts[el.layout](el))
-  })
-  const htmlStr = htmlList.join('\n')
-
-  let temp = buildFormTemplate(conf, htmlStr, type)
-  if (type === 'dialog') {
-    temp = dialogWrapper(temp)
-  }
-  confGlobal = null
-  return temp
-}
diff --git a/fuintAdmin_zt/src/utils/generator/icon.json b/fuintAdmin_zt/src/utils/generator/icon.json
deleted file mode 100644
index 2d9999a31..000000000
--- a/fuintAdmin_zt/src/utils/generator/icon.json
+++ /dev/null
@@ -1 +0,0 @@
-["platform-eleme","eleme","delete-solid","delete","s-tools","setting","user-solid","user","phone","phone-outline","more","more-outline","star-on","star-off","s-goods","goods","warning","warning-outline","question","info","remove","circle-plus","success","error","zoom-in","zoom-out","remove-outline","circle-plus-outline","circle-check","circle-close","s-help","help","minus","plus","check","close","picture","picture-outline","picture-outline-round","upload","upload2","download","camera-solid","camera","video-camera-solid","video-camera","message-solid","bell","s-cooperation","s-order","s-platform","s-fold","s-unfold","s-operation","s-promotion","s-home","s-release","s-ticket","s-management","s-open","s-shop","s-marketing","s-flag","s-comment","s-finance","s-claim","s-custom","s-opportunity","s-data","s-check","s-grid","menu","share","d-caret","caret-left","caret-right","caret-bottom","caret-top","bottom-left","bottom-right","back","right","bottom","top","top-left","top-right","arrow-left","arrow-right","arrow-down","arrow-up","d-arrow-left","d-arrow-right","video-pause","video-play","refresh","refresh-right","refresh-left","finished","sort","sort-up","sort-down","rank","loading","view","c-scale-to-original","date","edit","edit-outline","folder","folder-opened","folder-add","folder-remove","folder-delete","folder-checked","tickets","document-remove","document-delete","document-copy","document-checked","document","document-add","printer","paperclip","takeaway-box","search","monitor","attract","mobile","scissors","umbrella","headset","brush","mouse","coordinate","magic-stick","reading","data-line","data-board","pie-chart","data-analysis","collection-tag","film","suitcase","suitcase-1","receiving","collection","files","notebook-1","notebook-2","toilet-paper","office-building","school","table-lamp","house","no-smoking","smoking","shopping-cart-full","shopping-cart-1","shopping-cart-2","shopping-bag-1","shopping-bag-2","sold-out","sell","present","box","bank-card","money","coin","wallet","discount","price-tag","news","guide","male","female","thumb","cpu","link","connection","open","turn-off","set-up","chat-round","chat-line-round","chat-square","chat-dot-round","chat-dot-square","chat-line-square","message","postcard","position","turn-off-microphone","microphone","close-notification","bangzhu","time","odometer","crop","aim","switch-button","full-screen","copy-document","mic","stopwatch","medal-1","medal","trophy","trophy-1","first-aid-kit","discover","place","location","location-outline","location-information","add-location","delete-location","map-location","alarm-clock","timer","watch-1","watch","lock","unlock","key","service","mobile-phone","bicycle","truck","ship","basketball","football","soccer","baseball","wind-power","light-rain","lightning","heavy-rain","sunrise","sunrise-1","sunset","sunny","cloudy","partly-cloudy","cloudy-and-sunny","moon","moon-night","dish","dish-1","food","chicken","fork-spoon","knife-fork","burger","tableware","sugar","dessert","ice-cream","hot-water","water-cup","coffee-cup","cold-drink","goblet","goblet-full","goblet-square","goblet-square-full","refrigerator","grape","watermelon","cherry","apple","pear","orange","coffee","ice-tea","ice-drink","milk-tea","potato-strips","lollipop","ice-cream-square","ice-cream-round"]
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/utils/generator/js.js b/fuintAdmin_zt/src/utils/generator/js.js
deleted file mode 100644
index 35e3e21a7..000000000
--- a/fuintAdmin_zt/src/utils/generator/js.js
+++ /dev/null
@@ -1,236 +0,0 @@
-import { isArray } from 'util'
-import { exportDefault, titleCase } from '@/utils/index'
-import { trigger } from './config'
-
-const units = {
-  KB: '1024',
-  MB: '1024 / 1024',
-  GB: '1024 / 1024 / 1024'
-}
-let confGlobal
-const inheritAttrs = {
-  file: '',
-  dialog: 'inheritAttrs: false,'
-}
-
-
-export function makeUpJs(conf, type) {
-  confGlobal = conf = JSON.parse(JSON.stringify(conf))
-  const dataList = []
-  const ruleList = []
-  const optionsList = []
-  const propsList = []
-  const methodList = mixinMethod(type)
-  const uploadVarList = []
-
-  conf.fields.forEach(el => {
-    buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
-  })
-
-  const script = buildexport(
-    conf,
-    type,
-    dataList.join('\n'),
-    ruleList.join('\n'),
-    optionsList.join('\n'),
-    uploadVarList.join('\n'),
-    propsList.join('\n'),
-    methodList.join('\n')
-  )
-  confGlobal = null
-  return script
-}
-
-function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) {
-  buildData(el, dataList)
-  buildRules(el, ruleList)
-
-  if (el.options && el.options.length) {
-    buildOptions(el, optionsList)
-    if (el.dataType === 'dynamic') {
-      const model = `${el.vModel}Options`
-      const options = titleCase(model)
-      buildOptionMethod(`get${options}`, model, methodList)
-    }
-  }
-
-  if (el.props && el.props.props) {
-    buildProps(el, propsList)
-  }
-
-  if (el.action && el.tag === 'el-upload') {
-    uploadVarList.push(
-      `${el.vModel}Action: '${el.action}',
-      ${el.vModel}fileList: [],`
-    )
-    methodList.push(buildBeforeUpload(el))
-    if (!el['auto-upload']) {
-      methodList.push(buildSubmitUpload(el))
-    }
-  }
-
-  if (el.children) {
-    el.children.forEach(el2 => {
-      buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
-    })
-  }
-}
-
-function mixinMethod(type) {
-  const list = []; const
-    minxins = {
-      file: confGlobal.formBtns ? {
-        submitForm: `submitForm() {
-        this.$refs['${confGlobal.formRef}'].validate(valid => {
-          if(!valid) return
-          // TODO 提交表单
-        })
-      },`,
-        resetForm: `resetForm() {
-        this.$refs['${confGlobal.formRef}'].resetFields()
-      },`
-      } : null,
-      dialog: {
-        onOpen: 'onOpen() {},',
-        onClose: `onClose() {
-        this.$refs['${confGlobal.formRef}'].resetFields()
-      },`,
-        close: `close() {
-        this.$emit('update:visible', false)
-      },`,
-        handleConfirm: `handleConfirm() {
-        this.$refs['${confGlobal.formRef}'].validate(valid => {
-          if(!valid) return
-          this.close()
-        })
-      },`
-      }
-    }
-
-  const methods = minxins[type]
-  if (methods) {
-    Object.keys(methods).forEach(key => {
-      list.push(methods[key])
-    })
-  }
-
-  return list
-}
-
-function buildData(conf, dataList) {
-  if (conf.vModel === undefined) return
-  let defaultValue
-  if (typeof (conf.defaultValue) === 'string' && !conf.multiple) {
-    defaultValue = `'${conf.defaultValue}'`
-  } else {
-    defaultValue = `${JSON.stringify(conf.defaultValue)}`
-  }
-  dataList.push(`${conf.vModel}: ${defaultValue},`)
-}
-
-function buildRules(conf, ruleList) {
-  if (conf.vModel === undefined) return
-  const rules = []
-  if (trigger[conf.tag]) {
-    if (conf.required) {
-      const type = isArray(conf.defaultValue) ? 'type: \'array\',' : ''
-      let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
-      if (message === undefined) message = `${conf.label}不能为空`
-      rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`)
-    }
-    if (conf.regList && isArray(conf.regList)) {
-      conf.regList.forEach(item => {
-        if (item.pattern) {
-          rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`)
-        }
-      })
-    }
-    ruleList.push(`${conf.vModel}: [${rules.join(',')}],`)
-  }
-}
-
-function buildOptions(conf, optionsList) {
-  if (conf.vModel === undefined) return
-  if (conf.dataType === 'dynamic') { conf.options = [] }
-  const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},`
-  optionsList.push(str)
-}
-
-function buildProps(conf, propsList) {
-  if (conf.dataType === 'dynamic') {
-    conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey)
-    conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey)
-    conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey)
-  }
-  const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},`
-  propsList.push(str)
-}
-
-function buildBeforeUpload(conf) {
-  const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const
-    returnList = []
-  if (conf.fileSize) {
-    rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize}
-    if(!isRightSize){
-      this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}')
-    }`
-    returnList.push('isRightSize')
-  }
-  if (conf.accept) {
-    acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type)
-    if(!isAccept){
-      this.$message.error('应该选择${conf.accept}类型的文件')
-    }`
-    returnList.push('isAccept')
-  }
-  const str = `${conf.vModel}BeforeUpload(file) {
-    ${rightSizeCode}
-    ${acceptCode}
-    return ${returnList.join('&&')}
-  },`
-  return returnList.length ? str : ''
-}
-
-function buildSubmitUpload(conf) {
-  const str = `submitUpload() {
-    this.$refs['${conf.vModel}'].submit()
-  },`
-  return str
-}
-
-function buildOptionMethod(methodName, model, methodList) {
-  const str = `${methodName}() {
-    // TODO 发起请求获取数据
-    this.${model}
-  },`
-  methodList.push(str)
-}
-
-function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) {
-  const str = `${exportDefault}{
-  ${inheritAttrs[type]}
-  components: {},
-  props: [],
-  data () {
-    return {
-      ${conf.formModel}: {
-        ${data}
-      },
-      ${conf.formRules}: {
-        ${rules}
-      },
-      ${uploadVar}
-      ${selectOptions}
-      ${props}
-    }
-  },
-  computed: {},
-  watch: {},
-  created () {},
-  mounted () {},
-  methods: {
-    ${methods}
-  }
-}`
-  return str
-}
diff --git a/fuintAdmin_zt/src/utils/generator/render.js b/fuintAdmin_zt/src/utils/generator/render.js
deleted file mode 100644
index e8640f0a2..000000000
--- a/fuintAdmin_zt/src/utils/generator/render.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { makeMap } from '@/utils/index'
-
-// 参考https://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js
-const isAttr = makeMap(
-  'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,'
-  + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,'
-  + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,'
-  + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,'
-  + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,'
-  + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,'
-  + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,'
-  + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,'
-  + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,'
-  + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,'
-  + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,'
-  + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,'
-  + 'target,title,type,usemap,value,width,wrap'
-)
-
-function vModel(self, dataObject, defaultValue) {
-  dataObject.props.value = defaultValue
-
-  dataObject.on.input = val => {
-    self.$emit('input', val)
-  }
-}
-
-const componentChild = {
-  'el-button': {
-    default(h, conf, key) {
-      return conf[key]
-    },
-  },
-  'el-input': {
-    prepend(h, conf, key) {
-      return <template slot="prepend">{conf[key]}</template>
-    },
-    append(h, conf, key) {
-      return <template slot="append">{conf[key]}</template>
-    }
-  },
-  'el-select': {
-    options(h, conf, key) {
-      const list = []
-      conf.options.forEach(item => {
-        list.push(<el-option label={item.label} value={item.value} disabled={item.disabled}></el-option>)
-      })
-      return list
-    }
-  },
-  'el-radio-group': {
-    options(h, conf, key) {
-      const list = []
-      conf.options.forEach(item => {
-        if (conf.optionType === 'button') list.push(<el-radio-button label={item.value}>{item.label}</el-radio-button>)
-        else list.push(<el-radio label={item.value} border={conf.border}>{item.label}</el-radio>)
-      })
-      return list
-    }
-  },
-  'el-checkbox-group': {
-    options(h, conf, key) {
-      const list = []
-      conf.options.forEach(item => {
-        if (conf.optionType === 'button') {
-          list.push(<el-checkbox-button label={item.value}>{item.label}</el-checkbox-button>)
-        } else {
-          list.push(<el-checkbox label={item.value} border={conf.border}>{item.label}</el-checkbox>)
-        }
-      })
-      return list
-    }
-  },
-  'el-upload': {
-    'list-type': (h, conf, key) => {
-      const list = []
-      if (conf['list-type'] === 'picture-card') {
-        list.push(<i class="el-icon-plus"></i>)
-      } else {
-        list.push(<el-button size="small" type="primary" icon="el-icon-upload">{conf.buttonText}</el-button>)
-      }
-      if (conf.showTip) {
-        list.push(<div slot="tip" class="el-upload__tip">只能上传不超过 {conf.fileSize}{conf.sizeUnit} 的{conf.accept}文件</div>)
-      }
-      return list
-    }
-  }
-}
-
-export default {
-  render(h) {
-    const dataObject = {
-      attrs: {},
-      props: {},
-      on: {},
-      style: {}
-    }
-    const confClone = JSON.parse(JSON.stringify(this.conf))
-    const children = []
-
-    const childObjs = componentChild[confClone.tag]
-    if (childObjs) {
-      Object.keys(childObjs).forEach(key => {
-        const childFunc = childObjs[key]
-        if (confClone[key]) {
-          children.push(childFunc(h, confClone, key))
-        }
-      })
-    }
-
-    Object.keys(confClone).forEach(key => {
-      const val = confClone[key]
-      if (key === 'vModel') {
-        vModel(this, dataObject, confClone.defaultValue)
-      } else if (dataObject[key]) {
-        dataObject[key] = val
-      } else if (!isAttr(key)) {
-        dataObject.props[key] = val
-      } else {
-        dataObject.attrs[key] = val
-      }
-    })
-    return h(this.conf.tag, dataObject, children)
-  },
-  props: ['conf']
-}
diff --git a/fuintAdmin_zt/src/utils/index.js b/fuintAdmin_zt/src/utils/index.js
deleted file mode 100644
index 64fc0bcb8..000000000
--- a/fuintAdmin_zt/src/utils/index.js
+++ /dev/null
@@ -1,390 +0,0 @@
-import { parseTime } from './fuint'
-
-/**
- * 表格时间格式化
- */
-export function formatDate(cellValue) {
-  if (cellValue == null || cellValue == "") return "";
-  var date = new Date(cellValue)
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-  var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-  return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
-}
-
-/**
- * @param {number} time
- * @param {string} option
- * @returns {string}
- */
-export function formatTime(time, option) {
-  if (('' + time).length === 10) {
-    time = parseInt(time) * 1000
-  } else {
-    time = +time
-  }
-  const d = new Date(time)
-  const now = Date.now()
-
-  const diff = (now - d) / 1000
-
-  if (diff < 30) {
-    return '刚刚'
-  } else if (diff < 3600) {
-    // less 1 hour
-    return Math.ceil(diff / 60) + '分钟前'
-  } else if (diff < 3600 * 24) {
-    return Math.ceil(diff / 3600) + '小时前'
-  } else if (diff < 3600 * 24 * 2) {
-    return '1天前'
-  }
-  if (option) {
-    return parseTime(time, option)
-  } else {
-    return (
-      d.getMonth() +
-      1 +
-      '月' +
-      d.getDate() +
-      '日' +
-      d.getHours() +
-      '时' +
-      d.getMinutes() +
-      '分'
-    )
-  }
-}
-
-/**
- * @param {string} url
- * @returns {Object}
- */
-export function getQueryObject(url) {
-  url = url == null ? window.location.href : url
-  const search = url.substring(url.lastIndexOf('?') + 1)
-  const obj = {}
-  const reg = /([^?&=]+)=([^?&=]*)/g
-  search.replace(reg, (rs, $1, $2) => {
-    const name = decodeURIComponent($1)
-    let val = decodeURIComponent($2)
-    val = String(val)
-    obj[name] = val
-    return rs
-  })
-  return obj
-}
-
-/**
- * @param {string} input value
- * @returns {number} output value
- */
-export function byteLength(str) {
-  // returns the byte length of an utf8 string
-  let s = str.length
-  for (var i = str.length - 1; i >= 0; i--) {
-    const code = str.charCodeAt(i)
-    if (code > 0x7f && code <= 0x7ff) s++
-    else if (code > 0x7ff && code <= 0xffff) s += 2
-    if (code >= 0xDC00 && code <= 0xDFFF) i--
-  }
-  return s
-}
-
-/**
- * @param {Array} actual
- * @returns {Array}
- */
-export function cleanArray(actual) {
-  const newArray = []
-  for (let i = 0; i < actual.length; i++) {
-    if (actual[i]) {
-      newArray.push(actual[i])
-    }
-  }
-  return newArray
-}
-
-/**
- * @param {Object} json
- * @returns {Array}
- */
-export function param(json) {
-  if (!json) return ''
-  return cleanArray(
-    Object.keys(json).map(key => {
-      if (json[key] === undefined) return ''
-      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
-    })
-  ).join('&')
-}
-
-/**
- * @param {string} url
- * @returns {Object}
- */
-export function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
-  if (!search) {
-    return {}
-  }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
-    if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
-    }
-  })
-  return obj
-}
-
-/**
- * @param {string} val
- * @returns {string}
- */
-export function html2Text(val) {
-  const div = document.createElement('div')
-  div.innerHTML = val
-  return div.textContent || div.innerText
-}
-
-/**
- * Merges two objects, giving the last one precedence
- * @param {Object} target
- * @param {(Object|Array)} source
- * @returns {Object}
- */
-export function objectMerge(target, source) {
-  if (typeof target !== 'object') {
-    target = {}
-  }
-  if (Array.isArray(source)) {
-    return source.slice()
-  }
-  Object.keys(source).forEach(property => {
-    const sourceProperty = source[property]
-    if (typeof sourceProperty === 'object') {
-      target[property] = objectMerge(target[property], sourceProperty)
-    } else {
-      target[property] = sourceProperty
-    }
-  })
-  return target
-}
-
-/**
- * @param {HTMLElement} element
- * @param {string} className
- */
-export function toggleClass(element, className) {
-  if (!element || !className) {
-    return
-  }
-  let classString = element.className
-  const nameIndex = classString.indexOf(className)
-  if (nameIndex === -1) {
-    classString += '' + className
-  } else {
-    classString =
-      classString.substr(0, nameIndex) +
-      classString.substr(nameIndex + className.length)
-  }
-  element.className = classString
-}
-
-/**
- * @param {string} type
- * @returns {Date}
- */
-export function getTime(type) {
-  if (type === 'start') {
-    return new Date().getTime() - 3600 * 1000 * 24 * 90
-  } else {
-    return new Date(new Date().toDateString())
-  }
-}
-
-/**
- * @param {Function} func
- * @param {number} wait
- * @param {boolean} immediate
- * @return {*}
- */
-export function debounce(func, wait, immediate) {
-  let timeout, args, context, timestamp, result
-
-  const later = function() {
-    // 据上一次触发时间间隔
-    const last = +new Date() - timestamp
-
-    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
-    if (last < wait && last > 0) {
-      timeout = setTimeout(later, wait - last)
-    } else {
-      timeout = null
-      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
-      if (!immediate) {
-        result = func.apply(context, args)
-        if (!timeout) context = args = null
-      }
-    }
-  }
-
-  return function(...args) {
-    context = this
-    timestamp = +new Date()
-    const callNow = immediate && !timeout
-    // 如果延时不存在，重新设定延时
-    if (!timeout) timeout = setTimeout(later, wait)
-    if (callNow) {
-      result = func.apply(context, args)
-      context = args = null
-    }
-
-    return result
-  }
-}
-
-/**
- * This is just a simple version of deep copy
- * Has a lot of edge cases bug
- * If you want to use a perfect deep copy, use lodash's _.cloneDeep
- * @param {Object} source
- * @returns {Object}
- */
-export function deepClone(source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
-  }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
-    if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
-    } else {
-      targetObj[keys] = source[keys]
-    }
-  })
-  return targetObj
-}
-
-/**
- * @param {Array} arr
- * @returns {Array}
- */
-export function uniqueArr(arr) {
-  return Array.from(new Set(arr))
-}
-
-/**
- * @returns {string}
- */
-export function createUniqueString() {
-  const timestamp = +new Date() + ''
-  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
-  return (+(randomNum + timestamp)).toString(32)
-}
-
-/**
- * Check if an element has a class
- * @param {HTMLElement} elm
- * @param {string} cls
- * @returns {boolean}
- */
-export function hasClass(ele, cls) {
-  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
-}
-
-/**
- * Add class to element
- * @param {HTMLElement} elm
- * @param {string} cls
- */
-export function addClass(ele, cls) {
-  if (!hasClass(ele, cls)) ele.className += ' ' + cls
-}
-
-/**
- * Remove class from element
- * @param {HTMLElement} elm
- * @param {string} cls
- */
-export function removeClass(ele, cls) {
-  if (hasClass(ele, cls)) {
-    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
-    ele.className = ele.className.replace(reg, ' ')
-  }
-}
-
-export function makeMap(str, expectsLowerCase) {
-  const map = Object.create(null)
-  const list = str.split(',')
-  for (let i = 0; i < list.length; i++) {
-    map[list[i]] = true
-  }
-  return expectsLowerCase
-    ? val => map[val.toLowerCase()]
-    : val => map[val]
-}
-
-export const exportDefault = 'export default '
-
-export const beautifierConf = {
-  html: {
-    indent_size: '2',
-    indent_char: ' ',
-    max_preserve_newlines: '-1',
-    preserve_newlines: false,
-    keep_array_indentation: false,
-    break_chained_methods: false,
-    indent_scripts: 'separate',
-    brace_style: 'end-expand',
-    space_before_conditional: true,
-    unescape_strings: false,
-    jslint_happy: false,
-    end_with_newline: true,
-    wrap_line_length: '110',
-    indent_inner_html: true,
-    comma_first: false,
-    e4x: true,
-    indent_empty_lines: true
-  },
-  js: {
-    indent_size: '2',
-    indent_char: ' ',
-    max_preserve_newlines: '-1',
-    preserve_newlines: false,
-    keep_array_indentation: false,
-    break_chained_methods: false,
-    indent_scripts: 'normal',
-    brace_style: 'end-expand',
-    space_before_conditional: true,
-    unescape_strings: false,
-    jslint_happy: true,
-    end_with_newline: true,
-    wrap_line_length: '110',
-    indent_inner_html: true,
-    comma_first: false,
-    e4x: true,
-    indent_empty_lines: true
-  }
-}
-
-// 首字母大小
-export function titleCase(str) {
-  return str.replace(/( |^)[a-z]/g, L => L.toUpperCase())
-}
-
-// 下划转驼峰
-export function camelCase(str) {
-  return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase())
-}
-
-export function isNumberStr(str) {
-  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
-}
-
diff --git a/fuintAdmin_zt/src/utils/jsencrypt.js b/fuintAdmin_zt/src/utils/jsencrypt.js
deleted file mode 100644
index 78d95234a..000000000
--- a/fuintAdmin_zt/src/utils/jsencrypt.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
-
-// 密钥对生成 http://web.chacuo.net/netrsakeypair
-
-const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
-  'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
-
-const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
-  '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
-  'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
-  'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
-  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
-  'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
-  'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
-  'UP8iWi1Qw0Y='
-
-// 加密
-export function encrypt(txt) {
-  const encryptor = new JSEncrypt()
-  encryptor.setPublicKey(publicKey) // 设置公钥
-  return encryptor.encrypt(txt) // 对数据进行加密
-}
-
-// 解密
-export function decrypt(txt) {
-  const encryptor = new JSEncrypt()
-  encryptor.setPrivateKey(privateKey) // 设置私钥
-  return encryptor.decrypt(txt) // 对数据进行解密
-}
-
diff --git a/fuintAdmin_zt/src/utils/permission.js b/fuintAdmin_zt/src/utils/permission.js
deleted file mode 100644
index 1730e332c..000000000
--- a/fuintAdmin_zt/src/utils/permission.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import store from '@/store'
-
-/**
- * 字符权限校验
- * @param {Array} value 校验值
- * @returns {Boolean}
- */
-export function checkPermi(value) {
-  if (value && value instanceof Array && value.length > 0) {
-    const permissions = store.getters && store.getters.permissions
-    const permissionDatas = value
-    const all_permission = "*:*:*";
-
-    const hasPermission = permissions.some(permission => {
-      return all_permission === permission || permissionDatas.includes(permission)
-    })
-
-    if (!hasPermission) {
-      return false
-    }
-    return true
-  } else {
-    console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
-    return false
-  }
-}
-
-/**
- * 角色权限校验
- * @param {Array} value 校验值
- * @returns {Boolean}
- */
-export function checkRole(value) {
-  if (value && value instanceof Array && value.length > 0) {
-    const roles = store.getters && store.getters.roles
-    const permissionRoles = value
-    const super_admin = "admin";
-
-    const hasRole = roles.some(role => {
-      return super_admin === role || permissionRoles.includes(role)
-    })
-
-    if (!hasRole) {
-      return false
-    }
-    return true
-  } else {
-    console.error(`need roles! Like checkRole="['admin','editor']"`)
-    return false
-  }
-}
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/utils/request.js b/fuintAdmin_zt/src/utils/request.js
deleted file mode 100644
index 178388b01..000000000
--- a/fuintAdmin_zt/src/utils/request.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
-import { tansParams } from "@/utils/fuint";
-import cache from '@/plugins/cache'
-
-// 是否显示重新登录
-export let isRelogin = { show: false };
-
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
-// 创建axios实例
-const service = axios.create({
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
-  // 超时
-  timeout: 30000
-})
-
-// request拦截器
-service.interceptors.request.use(config => {
-  // 是否需要防止数据重复提交
-  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-
-  if (getToken()) {
-      config.headers['Access-Token'] = getToken();
-  }
-
-  config.headers['platform'] = 'PC';
-
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
-  }
-  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
-    const requestObj = {
-      url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-      time: new Date().getTime()
-    }
-    const sessionObj = cache.session.getJSON('sessionObj')
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-      cache.session.setJSON('sessionObj', requestObj)
-    } else {
-      const s_url = sessionObj.url;                  // 请求地址
-      const s_data = sessionObj.data;                // 请求数据
-      const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = '数据正在处理，请耐心等待';
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
-      } else {
-        cache.session.setJSON('sessionObj', requestObj)
-      }
-    }
-  }
-  return config
-}, error => {
-    console.log(error)
-    Promise.reject(error)
-})
-
-// 响应拦截器
-service.interceptors.response.use(res => {
-    // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
-    // 获取错误信息
-    const msg = errorCode[code] || res.data.message || errorCode['default']
-    // 二进制数据则直接返回
-    if(res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer'){
-      return res.data
-    }
-    if (code === 401) {
-      if (!isRelogin.show) {
-        isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        isRelogin.show = false;
-        store.dispatch('LogOut').then(() => {
-          location.href = '/index';
-        })
-      }).catch(() => {
-        isRelogin.show = false;
-      });
-    }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500) {
-      Message({
-        message: msg,
-        type: 'error'
-      })
-      return Promise.reject(new Error(msg))
-    } else if (code !== 200) {
-      Notification.error({
-        title: msg
-      })
-      return Promise.reject('error')
-    } else {
-      return res.data
-    }
-  },
-  error => {
-    console.log('err' + error)
-    let { message } = error;
-    if (message == "Network Error") {
-        message = "后端接口连接异常";
-    }
-    else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    }
-    else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
-// 通用下载方法
-export function download(url, params) {
-   url = process.env.VUE_APP_BASE_API + url + '?token='+ getToken() + '&'+ param(params)
-   window.open(url, '_blank')
-}
-
-// 组织参数
-export function param(data) {
-   let url = ''
-   for(const k in data) {
-      const value = data[k] !== undefined ? data[k] : ''
-      url += '&' + k + '=' + encodeURIComponent(value)
-   }
-   // 去除第一个&
-   return url ? url.substring(1) : ''
-}
-
-export default service
diff --git a/fuintAdmin_zt/src/utils/scroll-to.js b/fuintAdmin_zt/src/utils/scroll-to.js
deleted file mode 100644
index c5d8e04e0..000000000
--- a/fuintAdmin_zt/src/utils/scroll-to.js
+++ /dev/null
@@ -1,58 +0,0 @@
-Math.easeInOutQuad = function(t, b, c, d) {
-  t /= d / 2
-  if (t < 1) {
-    return c / 2 * t * t + b
-  }
-  t--
-  return -c / 2 * (t * (t - 2) - 1) + b
-}
-
-// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
-var requestAnimFrame = (function() {
-  return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
-})()
-
-/**
- * Because it's so fucking difficult to detect the scrolling element, just move them all
- * @param {number} amount
- */
-function move(amount) {
-  document.documentElement.scrollTop = amount
-  document.body.parentNode.scrollTop = amount
-  document.body.scrollTop = amount
-}
-
-function position() {
-  return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
-}
-
-/**
- * @param {number} to
- * @param {number} duration
- * @param {Function} callback
- */
-export function scrollTo(to, duration, callback) {
-  const start = position()
-  const change = to - start
-  const increment = 20
-  let currentTime = 0
-  duration = (typeof (duration) === 'undefined') ? 500 : duration
-  var animateScroll = function() {
-    // increment the time
-    currentTime += increment
-    // find the value with the quadratic in-out easing function
-    var val = Math.easeInOutQuad(currentTime, start, change, duration)
-    // move the document.body
-    move(val)
-    // do the animation unless its over
-    if (currentTime < duration) {
-      requestAnimFrame(animateScroll)
-    } else {
-      if (callback && typeof (callback) === 'function') {
-        // the animation is done so lets callback
-        callback()
-      }
-    }
-  }
-  animateScroll()
-}
diff --git a/fuintAdmin_zt/src/utils/validate.js b/fuintAdmin_zt/src/utils/validate.js
deleted file mode 100644
index adfa25425..000000000
--- a/fuintAdmin_zt/src/utils/validate.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * @param {string} path
- * @returns {Boolean}
- */
-export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
-}
-
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
-}
-
-/**
- * @param {string} url
- * @returns {Boolean}
- */
-export function validURL(url) {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
-  return reg.test(url)
-}
-
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function validLowerCase(str) {
-  const reg = /^[a-z]+$/
-  return reg.test(str)
-}
-
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function validUpperCase(str) {
-  const reg = /^[A-Z]+$/
-  return reg.test(str)
-}
-
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function validAlphabets(str) {
-  const reg = /^[A-Za-z]+$/
-  return reg.test(str)
-}
-
-/**
- * @param {string} email
- * @returns {Boolean}
- */
-export function validEmail(email) {
-  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-  return reg.test(email)
-}
-
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function isString(str) {
-  if (typeof str === 'string' || str instanceof String) {
-    return true
-  }
-  return false
-}
-
-/**
- * @param {Array} arg
- * @returns {Boolean}
- */
-export function isArray(arg) {
-  if (typeof Array.isArray === 'undefined') {
-    return Object.prototype.toString.call(arg) === '[object Array]'
-  }
-  return Array.isArray(arg)
-}
diff --git a/fuintAdmin_zt/src/views/Service/details.vue b/fuintAdmin_zt/src/views/Service/details.vue
deleted file mode 100644
index 268366cea..000000000
--- a/fuintAdmin_zt/src/views/Service/details.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-  <div class="ap-container">
-    <div class="h-box">
-
-
-  <div class="top_">
-    <div class="tab-box" :class="tabindex == index ? 'active' : ''" v-for="(item,index) in tabList" :key="index" @click="gettab(index)" >
-      {{item.title}}
-    </div>
-  </div>
-                 <jcindex :id="id" v-if="tabindex == 0"></jcindex>
-                <payment  :id="id" :deptId="deptId" v-if="tabindex == 1" ></payment>
-                  <way :id="id" :deptId="deptId" v-if="tabindex == 2"  ></way>
-                  <staff :id="id" v-if="tabindex == 3" ></staff>
-                    <allOrder :id="id" v-if="tabindex == 4"></allOrder>
-
-<!--    <el-card >-->
-<!--      <div class="top-box">-->
-<!--        <el-tabs v-model="activeName" @tab-click="handleClick">-->
-<!--          <el-tab-pane label="基本设置" name="first">-->
-<!--             <jcindex :id="id"></jcindex>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="支付配置" name="second">-->
-<!--             <payment  :id="id"></payment>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="员工管理" name="staff">-->
-<!--            <staff :id="id"></staff>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="订单查看" name="allOrder">-->
-<!--            <allOrder :id="id"></allOrder>-->
-<!--          </el-tab-pane>-->
-
-<!--        </el-tabs>-->
-<!--      </div>-->
-<!--    </el-card >-->
-    </div>
-    </div>
-
-</template>
-
-<script>
-  // import peizhi from '../components/Service/peizhi'
-  import payment from '../components/Service/payment'
-  import staff from '../components/Service/staff'
-  import allOrder from '../components/Service/allOrder'
-  import jcindex from '../components/Service/index'
-  import way from '../components/Service/way'
-  export default {
-    name: 'details',
-    data() {
-      return {
-        id:'',
-        deptId:'',
-        activeName: 'first',
-        tabindex:0,
-        tabList:[
-          {
-            name:'first',
-            title:'基本设置',
-            component:jcindex
-          },
-          {
-            name:'second',
-            title:'支付配置',
-            component:payment
-          },
-          {
-            name:'way',
-            title:'付费方式',
-            component:way
-          },
-          {
-            name:'staff',
-            title:'员工管理',
-            component:staff
-          },
-          {
-            name:'allOrder',
-            title:'订单查看',
-            component:allOrder
-          }
-        ]
-
-      };
-    },
-
-    // peizhi
-    components:{
-      jcindex,staff,payment,allOrder,way
-    },
-    created() {
-      this.id = this.$route.query.id
-      this.deptId = this.$route.query.deptId
-    },
-    mounted() {
-      console.log(this.id)
-
-    },
-    methods: {
-      gettab(index){
-        this.tabindex = index
-        console.log(this.tabindex)
-      },
-      handleClick(tab, event) {
-        console.log(tab, event);
-      }
-    }
-  };
-
-</script>
-
-<style scoped>
-  .ap-container{
-    height: 100vh;
-
-      background: #f9f9f9;
-      box-sizing: border-box;
-
-  }
-  .top-box{
-    width: 100%;
-  }
-  .top_{
-    width: 100%;
-    background: #fff;
-    box-sizing: border-box;
-    padding: 10px 25px;
-    padding-bottom: 0px;
-    display: flex;
-    align-items: center;
-
-  }
-  .active{
-    color: #FF9655 !important;
-    border-bottom: 2px solid #FF9655 !important;
-  }
-  .tab-box{
-    color: #999999;
-    font-size: 14px;
-    height: 40px;
-    width: 60px;
-    border-bottom: 2px solid transparent;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin: 0px 25px;
-    cursor: pointer;
-  }
-  .h-box{
-    height: 100%;
-    background: #f9f9f9;
-
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue
deleted file mode 100644
index 47df0a5f3..000000000
--- a/fuintAdmin_zt/src/views/Service/index.vue
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <div class="top-box">
-        <div class="d-s">
-          <el-input v-model="queryParams.name" placeholder="请输入油站名称" style="width: 200px;margin-right: 15px;"></el-input>
-          <el-select v-model="queryParams.contractDeptId" placeholder="请选择所属机构" style="width: 200px;margin-right: 15px;">
-            <el-option
-              v-for="item in deptListSelect"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId+''"
-            ></el-option>
-          </el-select>
-          <el-select v-model="queryParams.status" placeholder="请选择油站状态" style="width: 200px;margin-right: 15px;">
-            <el-option
-              v-for="dict in dict.type.zhzt"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-          <el-select v-model="queryParams.turnoverType" placeholder="请选择计费方式" style="width: 200px;margin-right: 15px;">
-            <el-option value="1" label="无限制"></el-option>
-            <el-option value="2" label="时间限制"></el-option>
-            <el-option value="3" label="预付费"></el-option>
-            <el-option value="4" label="后付费"></el-option>
-            <el-option value="5" label="年付费"></el-option>
-            <el-option value="6" label="可创建油站站点数量"></el-option>
-          </el-select>
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="结束日期">
-          </el-date-picker>
-        </div>
-        <div class="d-s">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button  icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
-        </div>
-
-      </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column
-          type="index"
-          label="序号"
-          align="center"
-          width="50">
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          align="center"
-          label="油站名称"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          align="center"
-          label="所属机构"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="leaderName"
-          align="center"
-          width="100"
-          label="油站负责人"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="leaderPhone"
-          align="center"
-          label="联系电话"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="turnoverType"
-          align="center"
-          width="80"
-          label="计费方式"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.turnoverType == 1">无限制</span>
-            <span v-if="scope.row.turnoverType == 2">时间限制</span>
-            <span v-if="scope.row.turnoverType == 3">预付费</span>
-            <span v-if="scope.row.turnoverType == 4">后付费</span>
-            <span v-if="scope.row.turnoverType == 5">年付费</span>
-            <span v-if="scope.row.turnoverType == 6">可创建油站站点数量</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="remind"
-          align="center"
-          label="到期提醒"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.remind || "--" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="userTotal"
-          align="center"
-          label="会员人数"
-          width="80"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.userTotal || 0 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="status"
-          align="center"
-          width="80"
-          label="油站状态"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              active-value="qy"
-              inactive-value="jy"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          align="center"
-          label="创建时间"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          align="center"
-          width="180"
-          label="操作">
-          <template slot-scope="scope">
-            <div style="display: flex;justify-content: center;width: 100%">
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['Service:enter']" @click="enterThePetrolStation(scope.row)">进入油站</div>
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" @click="godetails(scope.row.id,scope.row.contractDeptId)">查看详情</div>
-
-            </div>
-
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="margin-top: 20px">
-        <el-pagination
-          background
-          layout="prev, pager, next"
-          :total="total">
-        </el-pagination>
-      </div>
-
-    </el-card>
-
-<!--    <el-card style="margin-top: 20px" v-for="(item,index) in arrlist" :key="index">-->
-<!--      <div slot="header" class="clearfix">-->
-<!--        <span>{{item.storeName || ''}}</span>-->
-
-<!--      </div>-->
-<!--      <div class="box-wrap">-->
-<!--        <div class="zong-box" v-for="(items,index) in item.storeList" :key="index" >-->
-<!--          <div class="pur-box" @click="godetails(items.id,items.contractDeptId)">-->
-<!--            <el-tag type="success" v-if="items.status=='qy'">启用</el-tag>-->
-<!--            <el-tag type="danger" v-else>禁用</el-tag>-->
-<!--            <div class="disper-box">-->
-<!--              <div class="box-img">-->
-<!--                <img v-if="items.logo" :src="imagePath + items.logo" style="width: 96px;height: 96px">-->
-<!--                <img v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" style="width: 96px;height: 96px">-->
-<!--              </div>-->
-<!--              <div >-->
-<!--                <div class="title">{{items.name || ''}}</div>-->
-<!--                <div class="box-hui">-->
-<!--                  <div>注册时间：</div>-->
-<!--                  <div>{{    items.createTime.substring(0,10) || ''}}</div>-->
-<!--                </div>-->
-<!--                <div class="box-hui">-->
-<!--                  <div>联系人：</div>-->
-<!--                  <div>{{items.contact || '暂无'}}</div>-->
-<!--                </div>-->
-<!--                <div class="box-hui">-->
-<!--                  <div>联系电话：</div>-->
-<!--                  <div>{{items.phone || '暂无'}}</div>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-
-<!--          </div>-->
-<!--          <div class="hui-bottom">-->
-<!--            <div>-->
-<!--              <div class="shang-biao">{{item.storeList.length || 0}}</div>-->
-<!--              <div class="xia-biao">创建门店数（个）</div>-->
-<!--            </div>-->
-<!--            <div>-->
-<!--              &lt;!&ndash; <div class="shang-biao">{{ items.userNum}}</div> &ndash;&gt;-->
-<!--              <div class="shang-biao">{{ items.userNum}}</div>-->
-<!--              <div class="xia-biao">会员数（人）</div>-->
-<!--            </div>-->
-<!--            <div>-->
-<!--              <div class="shang-biao">{{  items.orderNum}}</div>-->
-<!--              <div class="xia-biao">支付订单（笔）</div>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-
-<!--      </div>-->
-<!--    </el-card>-->
-  </div>
-</template>
-
-<script>
-import {
-  Storelist, getUserNumApi,
-  getOrderNumApi, getStorelist, singleSignOnApi
-} from "@/api/service/service";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-export default {
-  name: 'service',
-  dicts: ['zhzt'],
-  data(){
-    return{
-      total:0,
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: '',
-      tableData: [],
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      },
-      imagePath: process.env.VUE_APP_SERVER_URL,
-
-      arrlist:[],
-      value1:'',
-      queryParams: {
-        name: '',
-        contractDeptId:'',
-        status: '',
-        pageNo: 1,
-        pageSize: 10,
-
-      },
-      beginTime:"",
-      endTime:"",
-      deptListSelect:[]
-    }
-  },
-  created() {
-    this.getStoreList();
-    this.selectChildByDeptIdApi();
-  },
-  async mounted() {
-    await this.getlist()
-  },
-  methods:{
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        name: '',
-        contractDeptId:'',
-        status: '',
-        pageNo: 1,
-        pageSize: 10,
-      }
-      this.beginTime = ''
-      this.endTime = ''
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getStoreList();
-    },
-    // 查询
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.deptListSelect = res.data
-      })
-    },
-    getStoreList(){
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime)
-        dateRange.push(this.endTime)
-      }
-      getStorelist(this.addDateRange(this.queryParams,dateRange)).then(res => {
-        this.tableData = res.data.records
-        this.total = res.data.total
-      })
-    },
-    async getlist(){
-      await Storelist(this.queryParams).then(res=>{
-        console.log(res)
-        this.arrlist = res.data.records
-      })
-    },
-
-    res() {
-      this.queryParams= {
-        storeName: '',
-        status: '',
-        pageNo: 1,
-        pageSize: 10,
-
-      }
-
-      this.getlist()
-    },
-    godetails(id,deptId){
-      this.$router.push({
-        path:'/Service/details',
-        query:{
-          id:id,
-          deptId:deptId
-        }
-      })
-
-    },
-    enterThePetrolStation(data) {
-      if (data.status === 'jy') {
-        this.$message('该油站已被禁用');
-
-        return
-      }
-      singleSignOnApi(data.id).then(res=>{
-        if (res.code == 200) {
-          window.open(this.pcUrl+'index?entrance='+data.id)
-        }
-      })
-    },
-
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-
-.app-container{
-  width: 100%;
-  height: 100%;
-  /* height: 100vh; */
-  background: #f9f9f9;
-}
-.ding-top{
-  width: 100%;
-  box-sizing: border-box;
-
-}
-.box-dis{
-  display: flex;
-  align-items: center;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: "";
-}
-.clearfix:after {
-  clear: both
-}
-.box-wrap{
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-}
-.zong-box{
-  width: 18%;
-  overflow: hidden;
-  border-radius: 8px;
-  box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;
-  margin-bottom: 30px;
-  margin-right: 30px;
-}
-.pur-box{
-  width: 100%;
-  padding: 10px;
-
-}
-.disper-box{
-  display: flex;
-  margin-top: 10px;
-}
-.box-img{
-  width: 96px;
-  height: 96px;
-  border-radius: 8px;
-  overflow: hidden;
-  margin-right: 10px;
-}
-.box-hui{
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  color: #99a9bf;
-  margin-top: 4px;
-}
-.title{
-  font-size: 18px;
-  font-weight: bold;
-}
-.hui-bottom{
-  width: 100%;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  background: #fafafc;
-  padding: 20px 10px;
-}
-.shang-biao{
-  font-size: 16px;
-  font-weight: bold;
-  width: 100%;
-  text-align: center;
-}
-.xia-biao{
-  width: 100%;
-  text-align: center;
-  font-size: 12px;
-}
-.top-box{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 20px;
-}
-.d-s{
-  display: flex;
-  align-items: center;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue
deleted file mode 100644
index 6aa56c9aa..000000000
--- a/fuintAdmin_zt/src/views/Site/add.vue
+++ /dev/null
@@ -1,455 +0,0 @@
-<script>
-import {treeselect as menuTreeselect} from "@/api/system/menu";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-import {addRole, getRole, updateRole} from "@/api/system/role";
-
-export default {
-  data() {
-    return {
-      merchantId: "2",
-      isOpen: true,
-      ruleForm: {
-        roleName: '',
-        storeId: '',
-        status: 'A',
-        resource: '',
-        description: '',
-        dutyId: "",
-        checkedKeys: [],
-        roleCode:"0",
-      },
-      checkedKeys:[],
-      isCashier:false,
-      checked:false,
-      rules: {
-        roleName: [
-          {required: true, message: '请输入角色名称', trigger: 'blur'},
-        ],
-        storeId: [
-          {required: true, message: '请选择机构信息', trigger: 'change'}
-        ],
-        roleCode: [
-          {required: true, message: '请选择登录权限', trigger: 'change'}
-        ],
-      },
-      dutyId:'',
-      tableData: [],
-      deptListSelect: [],
-    };
-  },
-  created() {
-    // this.merchantId = this.$route.query.merchantId
-    // this.getMenuTreeselect()
-    if (this.$route.query.dutyId) {
-      this.dutyId = this.$route.query.dutyId
-      this.getRoleMune(this.$route.query.dutyId);
-    }
-    this.selectChildByDeptIdApi()
-
-  },
-  methods: {
-    // 查询菜单树结构
-    getMenuTreeselect() {
-      // merchantId 代表deptType
-      this.tableData = []
-      menuTreeselect({merchantId: this.merchantId, roleId: this.ruleForm.dutyId}).then(response => {
-        let show = false
-        if (this.isCashier) {
-          show = true
-        }
-        let data = {
-          id: 0,
-          label: '收银台',
-          childrens: [],
-          list: [{id: 0,show: show, name: '选中菜单'},]
-        }
-        this.tableData.push(data);
-        this.tableData.push(...response.data);
-      });
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.ruleForm.dutyId) {
-            updateRole(this.ruleForm).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.$router.push({path:"/Site/index",query:{activeName:"duty"}})
-            });
-          } else {
-            addRole(this.ruleForm).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.$router.push({path:"/Site/index",query:{activeName:"duty"}})
-            });
-          }
-        }
-      });
-    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-      this.$router.push({path:"/Site/index",query:{activeName:"duty"}})
-    },
-    // 查询
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.deptListSelect = res.data
-        if (!this.$route.query.dutyId) {
-          this.ruleForm.storeId = res.data[0].deptId
-          this.merchantId = res.data[0].deptType
-          this.ruleForm.deptType = res.data[0].deptType
-          this.getMenuTreeselect()
-        }
-      })
-    },
-    getRoleMune(roleId) {
-      getRole(roleId).then(response => {
-        this.ruleForm.roleName = response.data.roleInfo.name;
-        this.ruleForm.status = response.data.roleInfo.status;
-        this.ruleForm.dutyId = response.data.roleInfo.id;
-        this.ruleForm.roleType = response.data.roleInfo.type;
-        this.ruleForm.storeId = response.data.roleInfo.storeId;
-        this.ruleForm.description = response.data.roleInfo.description;
-        let checkedKeys = response.data.checkedKeys
-        this.ruleForm.checkedKeys = checkedKeys
-        this.ruleForm.menuIds = checkedKeys
-        this.merchantId = response.data.roleInfo.type
-        if (response.data.roleInfo.roleCode==2 || response.data.roleInfo.roleCode==3){
-          this.isCashier = true
-        }else {
-          this.isCashier = false
-        }
-        if (this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){
-          this.checked = true
-        }else {
-          this.checked = false
-        }
-        this.getMenuTreeselect()
-        // this.tableData = response.data.treeselect;
-      });
-    },
-    // 选择机构信息
-    chooseRegion(deptId) {
-      this.deptListSelect.forEach(item => {
-        if (item.deptId == deptId) {
-          this.merchantId = item.deptType
-          this.ruleForm.deptType = item.deptType
-          this.getMenuTreeselect()
-        }
-      })
-    },
-    openTable(str) {
-      // if (str == 'open') {
-      //   this.isOpen = true;
-      // } else {
-      //   this.isOpen = false;
-      // }
-      this.$nextTick(() => {
-        this.handleArr(this.tableData, this.isOpen);
-      });
-    },
-    handleArr(arr, flag) {
-      arr.forEach(i => {
-        this.$refs.table.toggleRowExpansion(i, flag);
-        if (i.children) {
-          this.handleArr(i.children);
-        }
-      });
-    },
-    // 全选
-    chooseAllOrNo(val){
-      let show = val
-      if (val){
-        let ids = []
-        this.tableData.forEach(item => {
-          if (item.id == 0){
-            item.show = show
-            item.list.forEach(item1 => {
-              item1.show = show
-            })
-            return;
-          }
-          ids.push(item.id)
-          item.show = show
-          item.list.forEach(item1 => {
-            ids.push(item1.id)
-            item1.show = show
-          })
-          item.childrens.forEach(item1 => {
-            ids.push(item1.id)
-            item1.show = show
-            item1.list.forEach(item2 => {
-              ids.push(item2.id)
-              item2.show = show
-            })
-          })
-        })
-        this.ruleForm.roleCode = '3'
-        this.ruleForm.checkedKeys = ids.filter((item, index) => ids.indexOf(item) === index);
-      }else {
-        this.tableData.forEach(item => {
-          item.show = show
-          item.list.forEach(item1 => {
-            item1.show = show
-          })
-          item.childrens.forEach(item1 => {
-            item1.show = show
-            item1.list.forEach(item2 => {
-              item2.show = show
-            })
-          })
-        })
-        this.ruleForm.roleCode = '0'
-        this.ruleForm.checkedKeys = []
-      }
-      this.ruleForm.menuIds = this.ruleForm.checkedKeys;
-    },
-    getLengthCheck(){
-      let ids = []
-      this.tableData.forEach(item => {
-        if (item.id == 0){
-          return;
-        }
-        ids.push(item.id)
-        item.list.forEach(item1 => {
-          ids.push(item1.id)
-        })
-        item.childrens.forEach(item1 => {
-          ids.push(item1.id)
-          item1.list.forEach(item2 => {
-            ids.push(item2.id)
-          })
-        })
-      })
-      this.checkedKeys = ids.filter((item, index) => ids.indexOf(item) === index);
-    },
-    chooseImg(row, data) {
-      if (row.id==0){
-        row.show = !row.show
-        if (row.show) {
-          if (this.ruleForm.checkedKeys.length>0){
-            this.ruleForm.roleCode = '3'
-          }else {
-            this.ruleForm.roleCode = '2'
-          }
-        }else {
-          if (this.ruleForm.checkedKeys.length>0){
-            this.ruleForm.roleCode = '1'
-          }else {
-            this.ruleForm.roleCode = '0'
-          }
-        }
-        this.isCashier = row.show
-        this.getLengthCheck();
-        if (this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){
-          this.checked = true
-        }else {
-          this.checked = false
-        }
-        console.log(this.ruleForm.checkedKeys,22,this.ruleForm.roleCode)
-        return;
-      }
-      let ids = []
-      let show = false;
-      if (!row.show) show = true
-      this.tableData.forEach(item => {
-        item.list.forEach(item1 => {
-          if (item1.id == row.id) {
-            ids.push(item1.id)
-            item1.show = show;
-            return;
-          }
-        });
-        // 尝试直接在顶级项目中找到匹配的 ID
-        if (item.id == row.id) {
-          item.show = show;
-          ids.push(item.id)
-          return; // 如果找到，则直接返回，不再继续处理子项
-        }
-
-        // 如果上面的条件都不满足，再检查子项
-        item.childrens.forEach(item1 => {
-          item1.list.forEach(item2 => {
-            if (item2.id == row.id) {
-              ids.push(item2.id)
-              item2.show = show;
-            }
-
-          });
-          // 直接检查子项是否匹配
-          if (item1.id == row.id) {
-            ids.push(item1.id)
-            item1.show = show;
-            return; // 如果在子项中找到，也直接返回
-          }
-
-        });
-      });
-      let uniqueArr = ids.filter((item, index) => ids.indexOf(item) === index);
-      if (show) {
-        this.ruleForm.checkedKeys = [...uniqueArr, ...this.ruleForm.checkedKeys];
-        this.ruleForm.checkedKeys = this.ruleForm.checkedKeys.filter((item, index) => this.ruleForm.checkedKeys.indexOf(item) === index);
-      } else {
-        this.ruleForm.checkedKeys = this.ruleForm.checkedKeys.filter(item => !uniqueArr.includes(item));
-      }
-      this.ruleForm.menuIds = this.ruleForm.checkedKeys;
-      this.getLengthCheck();
-      if (this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){
-        this.checked = true
-      }else {
-        this.checked = false
-      }
-      console.log(this.ruleForm.checkedKeys,11,uniqueArr,show)
-    }
-  }
-}
-</script>
-
-<template>
-  <div class="container">
-    <div class="top-box">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-        <div>
-          <el-form-item label="角色名称" prop="roleName">
-            <el-input v-model="ruleForm.roleName"></el-input>
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="所属机构" prop="storeId">
-            <el-select v-model="ruleForm.storeId" placeholder="请选择所属机构"
-                       :disabled="dutyId!=''"
-                       @change="chooseRegion(ruleForm.storeId)">
-              <el-option
-                v-for="item in deptListSelect"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="角色状态" prop="status">
-            <el-switch v-model="ruleForm.status"
-                       active-value="A"
-                       inactive-value="N"></el-switch>
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="角色描述" prop="description">
-            <el-input v-model="ruleForm.description"></el-input>
-          </el-form-item>
-        </div>
-
-      </el-form>
-    </div>
-    <div class="center-box">
-      <div>
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
-<!--          <el-form-item label="角色登录权限" prop="roleCode">-->
-<!--            <el-radio-group v-model="ruleForm.roleCode">-->
-<!--              <el-radio :label="0">都无</el-radio>-->
-<!--              <el-radio :label="1">后台</el-radio>-->
-<!--              <el-radio :label="2">收银台</el-radio>-->
-<!--              <el-radio :label="3">全部</el-radio>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
-          <el-form-item label="菜单功能权限" prop="checkedKeys">
-            <el-checkbox v-model="checked" @change="chooseAllOrNo">全选</el-checkbox>
-            <el-checkbox v-model="isOpen" @change="openTable">展开</el-checkbox>
-          </el-form-item>
-        </el-form>
-<!--        <el-button size="mini" @click.native="openTable('open')">一键展开</el-button>-->
-<!--        <el-button size="mini" @click.native="openTable('fold')">折叠</el-button>-->
-      </div>
-      <el-table
-        ref="table"
-        :data="tableData"
-        style="width: 100%;margin-bottom: 20px;"
-        row-key="id"
-        border
-        default-expand-all
-        stripe
-        :tree-props="{children: 'childrens', hasChildren: 'hasChildren'}">
-
-        <el-table-column
-          prop="label"
-          label="菜单"
-
-          width="180">
-
-        </el-table-column>
-
-        <el-table-column
-          prop="address"
-          label="功能">
-          <template slot-scope="scope">
-            <div style="display: flex;align-items: center">
-              <div class="f-box" v-for="(item,index) in scope.row.list" :key="index" @click="chooseImg(item,scope.row)">
-                <img v-if="item.show == true" style="width: 15px;height: 15px;margin-right: 5px"
-                     src="../../assets/images/xz.png">
-                <div v-else class="k_"></div>
-                {{ item.name }}
-              </div>
-            </div>
-
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="display: flex">
-        <el-button @click="resetForm('ruleForm')">取消</el-button>
-        <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.container {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 20px;
-  background: #f4f5f9;
-}
-
-.top-box {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 20px;
-  display: flex;
-  align-items: center;
-  background: #FFFFFF;
-  box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
-  border-radius: 10px 10px 10px 10px;
-}
-
-.demo-ruleForm {
-  display: flex;
-
-  align-items: center;
-}
-
-.center-box {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 20px;
-
-  background: #FFFFFF;
-  box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
-  border-radius: 10px 10px 10px 10px;
-  margin-top: 20px;
-}
-
-.f-box {
-  display: flex;
-  align-items: center;
-  margin-right: 10px;
-}
-
-.k_ {
-  width: 15px;
-  border-radius: 4px;
-  height: 15px;
-  margin-right: 5px;
-  border: 1px solid #ccc;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/Site/components/afterff.vue b/fuintAdmin_zt/src/views/Site/components/afterff.vue
deleted file mode 100644
index ec92b0fdf..000000000
--- a/fuintAdmin_zt/src/views/Site/components/afterff.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<script>
-import {
-  addAfterApi,
-  addYearApi,
-  getAfterListApi, getALlInfoBydeptIdApi,
-  getYearListApi,
-  updateAfterApi,
-  updateYearApi
-} from "@/api/system/Site/compant";
-
-export default {
-  name: "afterff",
-  data() {
-    return {
-      dialogVisible:false,
-      dialogVisible2:false,
-      tableData: [ ],
-      form: {
-        deductionRate: '', // 扣点费率
-        likelyTransactionVolume: '0', // 已发生交易流量
-        serviceFeeStatistics: 0, // 系统服务费统计（这里假设为0，实际可能需要计算）
-        serviceFeeLimit: '', // 系统服务费限制
-        paymentAmount: '', // 收款金额
-        deptId:this.deptId,
-        status: 0,
-
-      },
-      sum:''
-    }
-  },
-  props: {
-    deptId: Number
-  },
-  created() {
-    this.getList();
-    this.getData();
-  },
-  methods: {
-    getList() {
-      getAfterListApi({deptId : this.deptId}).then(res => {
-        this.tableData = res.data.records
-      })
-    },
-    getData() {
-      getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => {
-        // this.form.serviceFeeStatistics = res.data.payMoney;
-        this.form.likelyTransactionVolume = res.data.payMoney;
-      })
-    },
-    getjisuan() {
-      let a = this.form.deductionRate/10000
-      this.form.serviceFeeStatistics = this.form.likelyTransactionVolume*a
-
-    },
-    onSubmit() {
-      console.log('表单提交', this.form);
-      // 在这里添加提交表单的逻辑
-      if (this.form.id) {
-        updateAfterApi(this.form).then(res => {
-          this.getList();
-          this.dialogVisible = false;
-          this.dialogVisible2 = false;
-        })
-      }else {
-        addAfterApi(this.form).then(res => {
-          this.getList();
-          this.dialogVisible = false;
-          this.dialogVisible2 = false;
-        })
-      }
-    },
-    onCancel() {
-      console.log('取消操作');
-      // 在这里添加取消操作的逻辑
-      this.dialogVisible = false
-      this.dialogVisible2 = false
-
-
-    },
-
-
-    handleUpdate1(data){
-      this.dialogVisible = true
-
-    },
-    handleEdit(data){
-      this.form = data
-
-      this.dialogVisible = true
-    },
-    handleEditshoukuan(data){
-      this.form = data
-      this.dialogVisible2 = true
-
-    },
-    cl() {
-      this.form = {
-        deductionRate: '', // 扣点费率
-        likelyTransactionVolume: '', // 已发生交易流量
-        serviceFeeStatistics: 0, // 系统服务费统计（这里假设为0，实际可能需要计算）
-        serviceFeeLimit: '', // 系统服务费限制
-        paymentAmount: '', // 收款金额
-        deptId:this.deptId,
-        status: 0,
-
-      }
-    }
-  }
-}
-</script>
-
-<template>
-  <div>
-    <el-table
-      :data="tableData"
-      border
-      style="width: 95%;margin-left: 55px ">
-      <el-table-column
-        prop="deductionRate"
-        align="center"
-        label="扣点税率（元）">
-      </el-table-column>
-      <el-table-column
-        prop="likelyTransactionVolume"
-        align="center"
-        label="易发生交易流量（元）">
-      </el-table-column>
-      <el-table-column
-        prop="serviceFeeStatistics"
-        align="center"
-        label="系统服务费统计">
-      </el-table-column>
-      <el-table-column
-        prop="serviceFeeLimit"
-        align="center"
-        label="系统服务费限制（元）">
-      </el-table-column>
-      <el-table-column
-        prop="paymentAmount"
-        align="center"
-        label="收款金额">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        align="center"
-        label="状态">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未开始</span>
-          <span v-if="scope.row.status == 1">进行中</span>
-          <span v-if="scope.row.status == 2">已完成</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        align="center"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        prop="createName"
-        align="center"
-        label="创建人">
-      </el-table-column>
-      <el-table-column
-      width="200"
-        align="center"
-      label="操作"
-      >
-<!--        <template slot="header" slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            @click="handleUpdate1(scope.row)"-->
-<!--          >新增</el-button>-->
-<!--          操作-->
-<!--        </template>-->
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleEdit(scope.row)">修改</el-button>
-          <el-button
-            size="mini"
-            @click="handleEditshoukuan(scope.row)">收款</el-button>
-        </template>
-
-      </el-table-column>
-    </el-table>
-    <el-dialog
-      title="新增"
-      :visible.sync="dialogVisible"
-      width="30%">
-      <!-- 表头插入按钮 -->
-      <el-form :model="form" label-width="120px">
-        <el-form-item label="扣点费率">
-          <el-input v-model="form.deductionRate" placeholder="请输入扣点费率" @input="getjisuan()">
-            <template slot="append">‱</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="已发生交易流量">
-          <el-input v-model="form.likelyTransactionVolume" placeholder="请输入已发生交易流量"  readonly disabled="true">
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="系统服务费">
-          <el-input v-model="form.serviceFeeStatistics" placeholder="请输入系统服务费" suffix="万元" readonly disabled="true">
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="系统服务费限制">
-          <el-input v-model="form.serviceFeeLimit" placeholder="请输入系统服务费限制" suffix="万元">
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-      </el-form>
-      <div class="button-group">
-        <el-button type="danger" @click="onCancel">取消</el-button>
-        <el-button type="primary" @click="onSubmit">保存</el-button>
-      </div>
-    </el-dialog
-    >
-
-    <el-dialog
-      title="新增"
-      :visible.sync="dialogVisible2"
-      width="30%">
-      <el-form :model="form" label-width="120px">
-        <el-form-item label="扣点费率">
-          <!-- 假设扣点费率是固定的，这里仅显示 -->
-          <el-input v-model="form.deductionRate" placeholder="" readonly>
-            <template slot="append">‱</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="已发生交易流量">
-          <el-input v-model="form.likelyTransactionVolume" placeholder="" readonly>
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="系统服务费统计">
-          <el-input v-model="form.serviceFeeStatistics" placeholder="" readonly>
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="系统服务费限制">
-          <!-- 假设这是固定的，这里仅显示 -->
-          <el-input v-model="form.serviceFeeLimit" placeholder="" readonly>
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="收款金额">
-          <el-input v-model="form.paymentAmount" placeholder="请输入收款金额">
-            <template slot="append">元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit('form')">保存</el-button>
-          <el-button @click="onCancel('form')">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/fuintAdmin_zt/src/views/Site/components/before.vue b/fuintAdmin_zt/src/views/Site/components/before.vue
deleted file mode 100644
index a099dd3e0..000000000
--- a/fuintAdmin_zt/src/views/Site/components/before.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<script>
-import {
-  addBeforeApi,
-  addBeforerApi, getALlInfoBydeptIdApi,
-  getBeforeListApi,
-  getBeforerListApi, updateBeforeApi,
-  updateBeforerApi
-} from "@/api/system/Site/compant";
-
-export default {
-  name: "beforeff",
-  data() {
-    return {
-      dialogVisible:false,
-      tableData: [ ],
-      form: {
-        prepaidAmount:null,
-        deductionRate:null,
-        estimatedTransactionVolume:null,
-        remainingTransactionVolume:null,
-        deptId:this.deptId,
-        status: 0,
-
-      },
-      // form2: {
-      //   form: {
-      //     deductionRate: 1, // 扣点费率
-      //     transactionVolume: '', // 已发生交易流量
-      //     systemServiceFee: 0, // 系统服务费统计（这里假设为0，实际可能需要计算）
-      //     serviceFeeLimit: 5000, // 系统服务费限制
-      //     receiptAmount: '', // 收款金额
-      //   },
-      // },
-      payMoney:'0'
-    }
-  },
-  props: {
-    deptId: Number
-  },
-  created() {
-    this.getList()
-    this.getData()
-  },
-  methods: {
-    getList() {
-      getBeforeListApi({deptId : this.deptId}).then(res => {
-        this.tableData = res.data.records
-      })
-    },
-    getData() {
-      getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => {
-        this.payMoney = res.data.payMoney
-      })
-    },
-    onCancel() {
-      // 取消操作逻辑
-      console.log('取消操作');
-      this.dialogVisible= false;
-
-    },
-    inputval() {
-      // if (
-      // )
-      if (!this.form.prepaidAmount || !this.form.deductionRate) {
-        return
-      }
-      let prepaidAmount = this.form.prepaidAmount;
-      let deductionRate = this.form.deductionRate /  10000;
-
-      if (!isNaN(prepaidAmount) && !isNaN(deductionRate)) {
-        let estimatedTransactionVolume = prepaidAmount /  deductionRate;
-        // let remainingTransactionVolume = estimatedTransactionVolume - prepaidAmount;
-        let remainingTransactionVolume = estimatedTransactionVolume -  this.payMoney;
-
-        this.form.estimatedTransactionVolume = estimatedTransactionVolume;
-        this.form.remainingTransactionVolume = remainingTransactionVolume;
-      }
-
-    },
-    onSubmit() {
-      // 保存操作逻辑
-      console.log('保存操作', this.form);
-      if (this.form.id) {
-        updateBeforeApi(this.form).then(res => {
-          this.getList();
-          this.dialogVisible = false;
-        })
-      }else {
-        addBeforeApi(this.form).then(res => {
-          this.getList();
-          this.dialogVisible= false;
-        })
-      }
-    },
-    handleUpdate1(data){
-      this.clean()
-
-      this.dialogVisible=true
-      // this.form = data
-
-    },
-    handleEdit(data){
-      this.clean()
-
-      this.form = data
-      console.log("123",data)
-      this.dialogVisible=true
-
-    },
-    clean() {
-      this.form= {
-        prepaidAmount:null,
-        deductionRate:null,
-        estimatedTransactionVolume:null,
-        remainingTransactionVolume:null,
-        deptId:this.deptId,
-        status: 0,
-
-      }
-    }
-  }
-}
-</script>
-
-<template>
-  <div>
-
-
-    <el-table
-      :data="tableData"
-      border
-      style="width: 95%;margin-left: 55px ">
-      <el-table-column
-        prop="prepaidAmount"
-        align="center"
-        label="预付金额（元）">
-      </el-table-column>
-      <el-table-column
-        prop="deductionRate"
-        align="center"
-        label="扣点费率（‱）">
-      </el-table-column>
-      <el-table-column
-        prop="estimatedTransactionVolume"
-        align="center"
-        label="预估交易流量（万）">
-      </el-table-column>
-      <el-table-column
-        prop="remainingTransactionVolume"
-        align="center"
-        label="剩余交易流量（万）">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        align="center"
-        label="状态">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未开始</span>
-          <span v-if="scope.row.status == 1">进行中</span>
-          <span v-if="scope.row.status == 2">已完成</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        align="center"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        prop="createName"
-        align="center"
-        label="创建人">
-      </el-table-column>
-      <el-table-column
-        align="center">
-        <template slot="header" slot-scope="scope">
-          <el-button
-            size="mini"
-            type="success" plain
-            @click="handleUpdate1(scope.row)"
-          >新增</el-button>
-        </template>
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleEdit( scope.row)">修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog
-      title="新增"
-      :visible.sync="dialogVisible"
-      width="25%">
-      <el-form :model="form" label-width="150px">
-        <el-form-item label="预付金额">
-          <el-input @change="inputval" v-model="form.prepaidAmount" placeholder="请输入预付金额"style="width: 240px;">
-            <template slot="append">元</template>
-
-          </el-input>
-        </el-form-item>
-        <el-form-item label="扣点费率">
-          <el-input @change="inputval" v-model="form.deductionRate" placeholder="请输入扣点费率‱" suffix-icon="el-icon-percent" style="width: 240px;">
-            <template slot="append">‱</template>
-
-          </el-input>
-        </el-form-item>
-        <el-form-item label="预估交易流量">
-          <el-input v-model="form.estimatedTransactionVolume" placeholder="预估交易流量" suffix-icon="el-icon-percent" readonly style="width: 240px;" disabled="true">
-            <template slot="append">万元</template>
-
-          </el-input>
-        </el-form-item>
-        <el-form-item label="剩余交易流量">
-          <el-input v-model="form.remainingTransactionVolume" placeholder="剩余交易流量" suffix-icon="el-icon-percent" style="width: 240px;" readonly disabled="true">
-            <template slot="append">万元</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">保存</el-button>
-          <el-button @click="onCancel">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-  </div>
-
-</template>
-
-<style scoped lang="scss">
-.fee-form {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  height: 100%;
-  padding: 20px;
-}
-
-.button-group {
-  margin-top: 20px;
-}
-
-.el-button {
-  margin-right: 10px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/Site/components/yearff.vue b/fuintAdmin_zt/src/views/Site/components/yearff.vue
deleted file mode 100644
index 280e1d0a2..000000000
--- a/fuintAdmin_zt/src/views/Site/components/yearff.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<script>
-import {addYearApi, getYearListApi, updateYearApi} from "@/api/system/Site/compant";
-import {parseTime} from "@/utils/fuint";
-
-export default {
-  name: "yearff",
-
-  data() {
-
-    return {
-      dialogVisible:false,
-      tableData: [ ],
-      form: {
-        id: '',
-        price: '',
-        prepaidAmount: '',
-        validDate: [],
-        systemValidityPeriodStart:'',
-        systemValidityPeriodEnd:'',
-        status: 0,
-        deptId:this.deptId,
-      },
-    }
-  },
-  props: {
-    deptId: Number
-  },
-  created() {
-    console.log("deptId",this.deptId)
-    this.getList()
-  },
-  methods: {
-    getList() {
-      getYearListApi({deptId : this.deptId}).then(res => {
-        this.tableData = res.data.records
-      })
-    },
-    onSubmit() {
-      console.log('表单提交', this.form);
-      if (this.form.validDate) {
-        this.form.systemValidityPeriodStart = parseTime(this.form.validDate[0])
-        this.form.systemValidityPeriodEnd = parseTime(this.form.validDate[1])
-      }
-      // parseTime(this.form.systemValidityPeriodStart)
-      // parseTime(this.form.systemValidityPeriodEnd)
-      console.log("123123")
-      if (this.form.id) {
-        updateYearApi(this.form).then(res => {
-          this.getList();
-          this.dialogVisible = false;
-        })
-      }else {
-        addYearApi(this.form).then(res => {
-          this.getList();
-          this.dialogVisible = false;
-        })
-      }
-      // 这里可以添加提交表单的逻辑
-    },
-    onCancel() {
-      console.log('取消操作');
-      this.dialogVisible=false
-
-      // 这里可以添加取消操作的逻辑
-    },
-    handleEdit(data) {
-      this.form = data
-      this.form.validDate = []
-      this.form.validDate.push(this.form.systemValidityPeriodStart)
-      this.form.validDate.push(this.form.systemValidityPeriodEnd)
-      this.dialogVisible=true
-    },
-    cal() {
-      this.form= {
-        id: '',
-          price: '',
-          prepaidAmount: '',
-          validDate: [],
-          status: 0,
-          systemValidityPeriodStart:'',
-          systemValidityPeriodEnd:'',
-          deptId:this.deptId,
-      }
-    }
-  }
-
-}
-</script>
-
-<template>
-<div>
-  <el-table
-    :data="tableData"
-    border
-    style="width: 95%;margin-left: 55px ">
-    <el-table-column
-      prop="price"
-      align="center"
-      label="价格（元）">
-    </el-table-column>
-    <el-table-column
-      prop="prepaidAmount"
-      align="center"
-      label="付款金额（元）">
-    </el-table-column>
-    <el-table-column
-      prop="address"
-      align="center"
-      label="系统生效时间">
-      <template slot-scope="scope">
-        <span>{{parseTime(scope.row.systemValidityPeriodStart)}}-{{parseTime(scope.row.systemValidityPeriodEnd)}}</span>
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="status"
-      align="center"
-      label="状态">
-      <template slot-scope="scope">
-        <span v-if="scope.row.status == 0">未开始</span>
-        <span v-if="scope.row.status == 1">进行中</span>
-        <span v-if="scope.row.status == 2">已完成</span>
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="createTime"
-      align="center"
-      label="创建时间">
-    </el-table-column>
-    <el-table-column
-      prop="createName"
-      align="center"
-      label="创建人">
-    </el-table-column>
-    <el-table-column
-      align="center">
-      <template slot="header" slot-scope="scope">
-        <el-button
-          size="mini"
-          @click="dialogVisible=true"
-          type="success" plain
-        >新增</el-button>
-      </template>
-      <template slot-scope="scope">
-        <el-button
-          v-if="scope.row.status == 0"
-          size="mini"
-          @click="handleEdit(scope.row)">修改</el-button>
-
-      </template>
-    </el-table-column>
-
-  </el-table>
-  <el-dialog
-    title="新增"
-    :visible.sync="dialogVisible"
-    width="25%">
-    <el-form :model="form" label-width="120px">
-      <el-form-item label="价格">
-          <el-input v-model="form.price" placeholder="请输入价格" style="width: 240px;">
-          <template slot="append">元</template>
-
-        </el-input>
-      </el-form-item>
-      <el-form-item label="付款金额">
-        <el-input v-model="form.prepaidAmount" placeholder="请输入付款金额" style="width: 240px;">
-          <template slot="append">元</template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="系统有效日期" >
-        <el-date-picker
-          style="width: 240px;"
-          v-model="form.validDate"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit">保存</el-button>
-        <el-button @click="onCancel">取消</el-button>
-      </el-form-item>
-    </el-form>
-  </el-dialog>
-
-</div>
-</template>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
deleted file mode 100644
index f4323ab2c..000000000
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ /dev/null
@@ -1,2178 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row>
-      <el-col :span="6">
-        <el-card  style="margin-right: 20px">
-          <div class="left-box">
-            <div class="title-h">组织架构</div>
-
-            <el-input
-              placeholder="请输入机构名称查询"
-              v-model="filterText"
-              @input="inputDeptName()">
-            </el-input>
-            <div style="width: 100%; height: 20px"></div>
-
-            <el-tree
-              :data="Thetree"
-              show-checkbox
-              indent="15"
-              :props="defaultProps"
-              @change="handleChange"
-              node-key="id"
-              @node-click="activecilck"
-              highlight-current
-              default-expand-all
-              :expand-on-click-node="false"
-              :render-content="renderContent">
-            </el-tree>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="18">
-        <el-card style="margin-bottom: 20px;">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-<!--        用户信息    -->
-            <el-tab-pane label="用户信息" name="list">
-
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                     label-width="68px">
-              <el-form-item label="" prop="accountName">
-                <el-input
-                  v-model="queryParams.accountName"
-                  placeholder="用户名"
-                  clearable
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="" prop="accountName">
-                <el-input
-                  v-model="queryParams.realName"
-                  placeholder="真实姓名"
-                  clearable
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="" prop="accountStatus">
-                <el-select
-                  v-model="queryParams.deptId"
-                  placeholder="所属机构"
-                  clearable
-                  style="width: 240px"
-                >
-                  <el-option
-                    v-for="item in deptListSelect"
-                    :key="item.deptId"
-                    :label="item.deptName"
-                    :value="item.deptId"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="" prop="accountStatus">
-                <el-select
-                  v-model="queryParams.accountStatus"
-                  placeholder="用户状态"
-                  clearable
-                  style="width: 240px"
-                >
-                  <el-option key="1" label="启用" value="1"/>
-                  <el-option key="0" label="禁用" value="0"/>
-                </el-select>
-              </el-form-item>
-
-<!--              <el-form-item style="float: right">-->
-<!--                <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>-->
-<!--                <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
-<!--              </el-form-item>-->
-<!--            </el-form>-->
-
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                <el-button
-                  type="warning"
-                  size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['user:add']"
-                >新增用户
-                </el-button>
-              </el-form-item>
-              </el-col>
-            </el-row>
-            </el-form>
-
-<!--            <el-row :gutter="10" class="mb8">-->
-<!--              <el-col :span="1.5">-->
-<!--                <el-button-->
-<!--                  type="warning"-->
-<!--                  plain-->
-<!--                  size="mini"-->
-<!--                  @click="handleAdd"-->
-
-<!--                >新增用户-->
-<!--                </el-button>-->
-<!--              </el-col>-->
-<!--            </el-row>-->
-  <!--        </el-card>-->
-  <!--        <el-card >-->
-                <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-                  <el-table-column type="selection" width="50" align="center" />
-
-                  <el-table-column label="用户名" align="center" key="accountName" prop="accountName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-                  <el-table-column label="真实姓名" align="center" key="realName" prop="realName" />
-                  <el-table-column label="用户角色" align="center" key="roleName" prop="roleName" />
-
-                  <el-table-column label="所属机构" align="center" prop="storeName" width="160">
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.deptName ? scope.row.deptName : '-' }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="状态" align="center" key="accountStatus" v-if="columns[2].visible">
-                    <template slot-scope="scope">
-                      <el-switch
-                        v-model="scope.row.accountStatus"
-                        :active-value="1"
-                        :inactive-value="0"
-                        @change="handleStatusChange(scope.row)"
-                      ></el-switch>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="创建时间" align="center" prop="createDate" v-if="columns[3].visible" width="160">
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.createTime }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="操作"
-                    align="center"
-                    width="200px"
-                    class-name="small-padding fixed-width"
-                  >
-                  <!-- v-hasPermi="['system:account:edit']" -->
-                  <!-- v-hasPermi="['system:account:delete']" -->
-
-                    <template slot-scope="scope">
-                      <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['user:edit']"
-                      >修改</el-button>
-                      <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['user:delete']"
-                      >删除</el-button>
-                      <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-refresh"
-                        @click="handleResetPwd(scope.row)"
-                        v-hasPermi="['user:delete']"
-                      >重置密码</el-button>
-<!--                      <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >-->
-<!--                      <span class="el-dropdown-link" v-hasPermi="['user:password']">-->
-<!--                        <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
-<!--                      </span>-->
-<!--                        <el-dropdown-menu slot="dropdown">-->
-<!--                          <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['user:password']"-->
-<!--                                            >重置密码</el-dropdown-item>-->
-<!--                        </el-dropdown-menu>-->
-<!--                      </el-dropdown>-->
-                    </template>
-                  </el-table-column>
-                </el-table>
-
-            <pagination
-              v-show="total>0"
-              :total="total"
-              :page.sync="queryParams.pageNum"
-              :limit.sync="queryParams.pageSize"
-              @pagination="getList"
-            />
-  <!--          tab第一张-->
-              </el-tab-pane>
-<!--       机构信息     -->
-            <el-tab-pane  label="机构信息" name="info">
-
-                <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
-                  <el-form-item label="父级节点" prop="name" v-if="ruleForm.parentId != 0">
-                    <el-cascader :disabled="isTopDept" :options="Thetree" disabled style="width: 300px"
-                                 v-model="cascader" :props="defaultProps" @change="handleChanges"  :placeholder="parentName"  ></el-cascader>
-                  </el-form-item>
-
-  <!--                <el-form-item label="上级部门" prop="parentId">-->
-  <!--                  <treeselect v-model="cascader" :options="Thetree" :normalizer="normalizer" @change="handleChanges"  placeholder="啊" />-->
-  <!--                </el-form-item>-->
-                  <el-form-item v-if="deptType == 2" label="油站名称" prop="deptName">
-                    <el-input :disabled="isTopDept" v-model="ruleForm.deptName"></el-input>
-                  </el-form-item>
-                  <el-form-item  v-else label="连锁店/油站名称" prop="deptName">
-                    <el-input :disabled="isTopDept" v-model="ruleForm.deptName"></el-input>
-                  </el-form-item>
-                  <el-form-item label="负责人名称" prop="leaderName">
-                    <el-input :disabled="isTopDept" v-model="ruleForm.leaderName"></el-input>
-                  </el-form-item>
-                  <el-form-item label="负责人电话" prop="leaderPhone">
-                    <el-input :disabled="isTopDept" v-model="ruleForm.leaderPhone"></el-input>
-                  </el-form-item>
-                  <el-form-item label="机构类型" prop="deptType">
-                    <span v-if="isTopDept">
-                      <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                        <el-radio
-                          v-for="dict in judgementNodeType(dict.type.node_type)"
-                          :key="dict.value"
-                          :label="dict.value"
-                          v-if="dict.value==ruleForm.deptType"
-                        >{{dict.label}}</el-radio>
-                      </el-radio-group>
-                    </span>
-                    <span v-else>
-                      <span v-if="isAdd">
-                        <span v-if="!parentDeptType">
-                          <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                            <el-radio
-                              v-for="dict in judgementNodeType(dict.type.node_type)"
-                              :key="dict.value"
-                              :label="dict.value"
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                        </span>
-                        <span v-else-if="parentDeptType==='1'">
-                          <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                            <el-radio
-                              v-for="dict in judgementNodeType(dict.type.node_type)"
-                              :key="dict.value"
-                              :label="dict.value"
-                              v-if="dict.value!='4'"
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                        </span>
-                        <span v-else-if="parentDeptType==='4'">
-                          <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                            <el-radio
-                              v-for="dict in judgementNodeType(dict.type.node_type)"
-                              :key="dict.value"
-                              :label="dict.value"
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                        </span>
-                        <span v-else-if="parentDeptType==='2'">
-                          <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                            <el-radio
-                              v-for="dict in judgementNodeType(dict.type.node_type)"
-                              :key="dict.value"
-                              :label="dict.value"
-                              v-if="dict.value=='3'"
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                        </span>
-                        <span v-else-if="parentDeptType==='3'">
-                          <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                            <el-radio
-                              v-for="dict in judgementNodeType(dict.type.node_type)"
-                              :key="dict.value"
-                              :label="dict.value"
-                              v-if="dict.value==ruleForm.deptType"
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                        </span>
-                      </span>
-                      <span v-else>
-                        <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                            <el-radio
-                              v-for="dict in judgementNodeType(dict.type.node_type)"
-                              :key="dict.value"
-                              :label="dict.value"
-                              v-if="dict.value==ruleForm.deptType"
-                            >{{dict.label}}</el-radio>
-                          </el-radio-group>
-                      </span>
-                    </span>
-                  </el-form-item>
-<!--                  <template v-if="ruleForm.deptType !== '3'">-->
-                  <template v-if="is2Store">
-                    <el-row >
-                      <el-col :span="20">
-                        <el-form-item label="计费方式" prop="turnoverType">
-                          <span v-if="isTopDept">
-                            <el-radio-group  :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
-                              <el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
-                              <el-radio v-if="ruleForm.turnoverType=='5'" label=5>年付费</el-radio>
-<!--                              <el-radio v-if="ruleForm.turnoverType=='2'" label=2>时间限制</el-radio>-->
-                              <el-radio v-if="ruleForm.turnoverType=='3'" label=3>预付费</el-radio>
-                              <el-radio v-if="ruleForm.turnoverType=='4'" label=4>后付费</el-radio>
-                            </el-radio-group>
-                          </span>
-                          <span v-else>
-                            <el-radio-group  :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
-                              <el-radio label=5>年付费</el-radio>
-                              <el-radio label=3>预付费</el-radio>
-                              <el-radio label=4>后付费</el-radio>
-                              <el-radio label=1>无限制</el-radio>
-
-                            </el-radio-group>
-                          </span>
-                        </el-form-item>
-                        <div>
-
-                        </div>
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <template v-if="ruleForm.turnoverType === '3'">
-                        <beforeff :deptId="queryParams.deptId"></beforeff>
-
-                      </template>
-                      <template v-if="ruleForm.turnoverType === '4'">
-                        <afterff :deptId="queryParams.deptId"></afterff>
-                      </template>
-                      <template v-if="ruleForm.turnoverType === '5'">
-                        <yearff :deptId="queryParams.deptId"></yearff>
-                      </template>
-                      <template v-if="ruleForm.turnoverType === '6'">
-                        <el-col :span="10">
-
-                          <el-form-item label="可创建油站数量" label-width="110px">
-<!--                            <el-input-number :disabled="isTopDept" v-model="ruleForm.storeNum" @change="handleChangeInputNumber" :min="1"-->
-<!--                                             :max="1000" label="可创建油站数量"></el-input-number>-->
-                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px" @blur="getMax"
-                                      :max="maxNumber">
-                              <template slot="append">个</template>
-                            </el-input>
-                          </el-form-item>
-                          <el-form-item label="已建油站数量" label-width="110px">
-                            <span>{{ruleForm.storeNums || 0}}</span>
-                          </el-form-item>
-                        </el-col>
-                      </template>
-                    </el-row>
-                  </template>
-                  <template v-if="ruleForm.deptType == '3'">
-                    <el-row >
-                      <el-col :span="20">
-                        <el-form-item label="计费方式" prop="turnoverType">
-                          <span v-if="isTopDept">
-                            <el-radio-group  :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
-                              <el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
-                              <el-radio v-if="ruleForm.turnoverType=='2'" label=2>时间限制</el-radio>
-                            </el-radio-group>
-                          </span>
-                          <span v-else>
-                            <el-radio-group  :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
-                              <el-radio label=1>无限制</el-radio>
-                              <el-radio label=2>时间限制</el-radio>
-                            </el-radio-group>
-                          </span>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <template v-if="ruleForm.turnoverType === '2'">
-                        <el-col :span="12">
-                          <el-row>
-                            <el-form-item  label="时间限制" prop="turnoverType" >
-                              <el-date-picker
-                                v-model="beginTime"
-                                :disabled="isTopDept"
-                                style="width: 140px"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="开始日期">
-                              </el-date-picker>
-                              至
-                              <el-date-picker
-                                v-model="endTime"
-                                :disabled="isTopDept"
-                                style="width: 140px"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="结束日期">
-                              </el-date-picker>
-                            </el-form-item>
-                          </el-row>
-                        </el-col>
-                      </template>
-                      <template v-if="ruleForm.turnoverType === '5'">
-                        <el-col :span="10">
-                          <el-row>
-                            <el-form-item label="时间范围">
-                              <el-date-picker
-                                :disabled="isTopDept"
-                                v-model="beginTime"
-                                style="width: 140px"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="开始日期">
-                              </el-date-picker>
-                              至
-                              <el-date-picker
-                                :disabled="isTopDept"
-                                v-model="endTime"
-                                style="width: 140px"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="结束日期">
-                              </el-date-picker>
-                            </el-form-item>
-                          </el-row>
-                        </el-col>
-                        <el-col :span="8">
-                          <el-form-item label="价格">
-                            <el-input :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
-                              <template slot="append">万元</template>
-                            </el-input>
-                          </el-form-item>
-                        </el-col>
-                      </template>
-                      <template v-if="ruleForm.turnoverType === '6'">
-                        <el-col :span="10">
-
-                          <el-form-item label="可创建油站数量" label-width="110px">
-                            <!--                            <el-input-number :disabled="isTopDept" v-model="ruleForm.storeNum" @change="handleChangeInputNumber" :min="1"-->
-                            <!--                                             :max="1000" label="可创建油站数量"></el-input-number>-->
-                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px" @blur="getMax"
-                                      :max="maxNumber">
-                              <template slot="append">个</template>
-                            </el-input>
-                          </el-form-item>
-                          <el-form-item label="已建油站数量" label-width="110px">
-                            <span>{{ruleForm.storeNums || 0}}</span>
-                          </el-form-item>
-                        </el-col>
-                      </template>
-                    </el-row>
-                  </template>
-
-
-                  <el-row v-if="ruleForm.deptType !== '3'">
-                    <el-col :span="3">
-                      <el-form-item label="设置油站数量">
-                        <el-switch
-                          :disabled="isTopDept"
-                          v-model="storeNum"
-                          active-color="#13ce66"
-                          inactive-color="#ff4949">
-                        </el-switch>
-                      </el-form-item>
-
-                    </el-col>
-<!--                    可创建油站站点数量-->
-                    <el-col>
-                      <template v-if="storeNum">
-                        <el-col :span="10">
-
-                          <el-form-item label="可创建油站数量" label-width="110px">
-<!--                            <el-input-number :disabled="isTopDept" v-model="ruleForm.storeNum" @change="handleChangeInputNumber" :min="1"-->
-<!--                                             :max="1000" label="可创建油站数量"></el-input-number>-->
-                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px" @blur="getMax"
-                                      :max="maxNumber">
-                              <template slot="append">个</template>
-                            </el-input>
-                          </el-form-item>
-
-                          <el-form-item label="已建油站数量" label-width="110px">
-                            <span>{{ruleForm.storeNums || 0}}</span>
-                          </el-form-item>
-                        </el-col>
-                      </template>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="12"><div class="grid-content bg-purple"></div></el-col>
-                    <el-col :span="12"><div class="grid-content bg-purple-light"></div></el-col>
-                  </el-row>
-
-                  <el-form-item label="状态" prop="name">
-                    <el-switch :disabled="isTopDept" v-model="value10" @change="getswitch" ></el-switch>
-                  </el-form-item>
-
-                  <template v-if="!isTopDept">
-                    <el-form-item v-if="pdinfo == 1">
-                      <el-button type="primary" @click="submitForms('ruleForm')">新增</el-button>
-                      <!--<el-button @click="resetForm('ruleForm')">重置</el-button> -->
-                    </el-form-item>
-                    <el-form-item v-if="pdinfo == 2">
-                      <el-button type="primary" @click="submitFormseide('ruleForm')" v-hasPermi="['agency:update']">保存</el-button>
-                      <!--<el-button @click="resetForm('ruleForm')">重置</el-button> -->
-                    </el-form-item>
-                  </template>
-
-                </el-form>
-
-
-              </el-tab-pane>
-<!--       角色信息     -->
-            <el-tab-pane label="角色信息" name="duty">
-              <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="100px">
-                <el-form-item label="" prop="dutyName">
-                  <el-input
-                    v-model="queryParams1.dutyName"
-                    placeholder="角色名称"
-                    clearable
-                    @keyup.enter.native="handleQuery1"
-                  />
-                </el-form-item>
-                <el-form-item label="" prop="status">
-                  <el-select
-                    v-model="queryParams1.status"
-                    placeholder="角色状态"
-                    clearable
-                  >
-                    <el-option label="启用" value="A"></el-option>
-                    <el-option label="禁用" value="D"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="" prop="accountStatus">
-                  <el-select
-                    v-model="queryParams1.deptId"
-                    placeholder="所属机构"
-                    clearable
-                    style="width: 240px"
-                  >
-                    <el-option
-                      v-for="item in deptListSelect"
-                      :key="item.deptId"
-                      :label="item.deptName"
-                      :value="item.deptId"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item style="float: right">
-                  <el-button type="primary" icon="el-icon-search" @click="handleQuery1">查询</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset2">重置</el-button>
-                </el-form-item>
-              </el-form>
-
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button
-                    type="warning"
-                    plain
-                    size="mini"
-                    v-hasPermi="['role:add']"
-                    @click="handleAdd1"
-
-                  >新增角色
-                  </el-button>
-                </el-col>
-              </el-row>
-
-              <el-table ref="tables"
-                        v-loading="loading"
-                        :data="dutyList">
-                <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
-                <el-table-column label="角色名称" align="center" prop="dutyName" />
-<!--                <el-table-column label="角色类型" align="center" prop="dutyType" >-->
-<!--                  <template slot-scope="scope">-->
-<!--                    <span v-if="scope.row.dutyType=='1'">超级管理员</span>-->
-<!--                    <span v-if="scope.row.dutyType=='2'">普通管理员</span>-->
-<!--                    <span v-if="scope.row.dutyType=='3'">油站角色</span>-->
-<!--                    <span v-if="scope.row.dutyType=='4'">公司角色</span>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-                <el-table-column label="所属机构" align="center" prop="deptName" />
-                <el-table-column label="角色状态" align="center" prop="status" >
-                  <template slot-scope="scope">
-                    <el-switch
-                      v-model="scope.row.status"
-                      active-value="A"
-                      inactive-value="N"
-                      @change="handleStatusChangeDuty(scope.row)"
-                      :disabled="scope.row.dutyId==2"
-                    ></el-switch>
-                  </template>
-                </el-table-column>
-                <el-table-column label="角色描述" align="center" prop="description" >
-                  <template slot-scope="scope">
-                    {{scope.row.description || "--"}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-edit"
-                      v-hasPermi="['role:edit']"
-                      @click="handleUpdate1(scope.row)"
-                      :disabled="scope.row.dutyId==2"
-                    >修改</el-button>
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      v-hasPermi="['role:delete']"
-                      @click="handleDelete1(scope.row)"
-                      :disabled="scope.row.dutyId==2"
-                    >删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-
-              <pagination
-                v-show="total1>0"
-                :total="total1"
-                :page.sync="queryParams1.page"
-                :limit.sync="queryParams1.pageSize"
-                @pagination="getDutyList"
-              />
-
-            </el-tab-pane>
-
-          </el-tabs>
-        </el-card>
-      </el-col>
-    </el-row>
-
-    <!-- 添加或修改用户配置对话框 class="common-dialog" -->
-    <el-dialog :title="title" :visible.sync="open"  width="600px" append-to-body :close-on-click-modal="false" >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="用户名" prop="accountName">
-              <el-input v-model="form.accountName" placeholder="请输入用户名" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="50" autocomplete="off" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-
-        <template v-if="title == '新增用户'">
-
-          <el-row>
-          <el-col :span="24">
-            <el-form-item v-if="form.id == undefined" label="登录密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入登录密码" maxlength="30" show-password autocomplete="off"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item v-if="form.id == undefined" label="确认密码" prop="password1">
-              <el-input v-model="form.password1" placeholder="请输入确认密码" type="password" maxlength="30" show-password autocomplete="off"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        </template>
-
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="真实姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入真实姓名" maxlength="30" autocomplete="off"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.accountStatus" @change="$forceUpdate()">
-                <el-radio :key=1 :label=1 :value=1>启用</el-radio>
-                <el-radio :key=0 :label=0 :value=0>禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="分配角色" prop="roleIds">
-              <el-select v-model="form.roleIds"  @change="$forceUpdate(),getCodeByRole($event)" placeholder="请选择角色">
-                <el-option
-                  v-for="item in rolelist"
-                  :key="item.dutyId"
-                  :label="item.dutyName"
-                  :value="item.dutyId"
-                ></el-option>
-              </el-select>
-              <div v-if="!rolelist || rolelist.length==0" style="color: red;font-size: 12px">请先为当前机构添加角色信息</div>
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="openDuty" width="700px" append-to-body>
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form1.roleName" @input="$forceUpdate()" style="width: 300px" placeholder="请输入角色名称" />
-        </el-form-item>
-<!--        <el-form-item label="角色类型" prop="roleType">-->
-<!--          <el-select-->
-<!--            v-model="form1.roleType"-->
-<!--            placeholder="角色类型"-->
-<!--            @change="changeMenu"-->
-<!--            style="width: 300px"-->
-<!--          >-->
-<!--&lt;!&ndash;            <el-option key="1" label="超级管理员" value="1"/>&ndash;&gt;-->
-<!--&lt;!&ndash;            <el-option key="2" label="普通管理员" value="2"/>&ndash;&gt;-->
-<!--            <el-option key="3" label="油站角色" value="3"/>-->
-<!--            <el-option key="4" label="公司角色" value="4"/>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-        <el-form-item label="状态">
-          <el-radio-group v-model="form1.status">
-            <el-radio key="A" label="A" value="A">启用</el-radio>
-            <el-radio key="N" label="N" value="N">禁用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form1.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form1.menuCheckStrictly"
-            :default-checked-keys="form1.checkedKeys"
-            empty-text="加载中，请稍候"
-            :props="defaultProps1"
-          ></el-tree>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form1.description" type="textarea" placeholder="请输入备注信息"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel1">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false">
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport"/>
-            是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-                   @click="importTemplate">下载模板
-          </el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  listUser,
-  delUser,
-  addUser,
-  updateUser,
-  resetUserPwd,
-  changeUserStatus,
-  deptTreeSelect,
-  deptadd,
-  deptedit,
-  deptDelete,
-  Userlist,
-  jklist, getDutyList, isTopLevelNodesApi, getMaxNumber, selectChildByDeptId
-} from "@/api/system/Site/site";
-  // import { getStoreStaffList } from "@/api/staff";
-  import { getAccountList, getAccount, delAccount, addAccount, updateAccount, resetAccountPwd, changeAccountStatus } from "@/api/system/account";
-  import {getToken} from "@/utils/auth";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import BigNumber from 'bignumber.js';
-/*import node from "../../../../gasStation-uni/uni_modules/uview-ui/components/u-parse/node/node.vue";*/
-import {dutyDelete, dutyEdit, dutyList, dutyLists} from "@/api/duty/duty";
-import {addRole, delRole, getRole, updateRole} from "@/api/system/role";
-import {getButtonPermi, treeselect as menuTreeselect} from "@/api/system/menu";
-import Yearff from "@/views/Site/components/yearff.vue";
-import Beforeff from "@/views/Site/components/before.vue";
-import Afterff from "@/views/Site/components/afterff.vue";
-
-
-
-
-export default {
-    name: "User",
-  computed: {
-    node() {
-      return node
-    }
-  },
-    dicts: ['node_type'],
-    data() {
-      const equalToPassword = (rule, value, callback) => {
-        console.log("151515151:",this.form.password1,value)
-        if (this.form.password !== value) {
-          callback(new Error("两次输入的密码不一致"));
-        } else {
-          callback();
-        }
-      };
-      return {
-
-        // 判断是否是二级门店
-        is2Store:false,
-        maxNumber:1,
-        storeNum: false,
-        isEditDept:true,
-        isTopDept:true,
-        parentDeptType:"",
-        isAdd:false,
-
-
-        timeFrame:[],
-        value10:true,
-        parentName:'请选择',
-        cascader:[],
-        storeOptions:[],
-        merchantOptions:[],
-        beginTime:"",
-        endTime:"",
-        deleteid:0,
-        pdinfo: 1 ,
-        isAgencyAdd: false,
-        isAgencyEdit: false,
-        isAgencyDelete: false,
-        activeName: 'list',
-        ruleForm: {
-          parentId:'',
-          deptType:'3',
-          status:'qy',
-          leaderName:'',
-          leaderPhone:'',
-          // parentName:'请先选择父级节点',
-          deptName: '',
-          turnoverLimit: 0,
-          turnoverType: "1",
-          turnoverTime: '',
-          turnoverStartTime:null,
-          turnoverEndTime:null,
-          rates:0,
-          storeNum:0,
-          prepaidAmount:0,
-
-
-
-        },
-        filterText:'',
-        xtitle:'',
-        // 遮罩层
-        loading: true,
-        staffOptions: [],
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        openDuty:false,
-        merchantId:"",
-        form1: { id: '', status: 'A', roleType: '4', description: '' },
-        // 角色表格数据
-        roleList: [],
-        menuExpand: false,
-        menuNodeAll: false,
-        // 菜单列表
-        menuOptions: [],
-        defaultProps1: {
-          children: "childrens",
-          label: "label"
-        },
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        userList: null,
-        // 弹出层标题
-        xid:'',
-        title: "",
-        Thetree:[],
-        // 节点树选项
-        deptOptions: undefined,
-        queryParams1:{
-          page:1,
-          pageSize:10,
-          // 当做机构id使用
-          storeId:"",
-          deptId:''
-        },
-        total1:0,
-        dutyList:[],
-        // 是否显示弹出层
-
-        open: false,
-        // 节点名称
-        deptName: undefined,
-        // 默认密码
-        initPassword: undefined,
-        // 日期范围
-        dateRange: [],
-        // 岗位选项
-        postOptions: [],
-        // 角色选项
-        roleOptions: [],
-        // 表单参数
-        form: {
-          accountName:'',
-          password:'',
-          accountStatus:'1',
-          roleIds:[],
-          deptId:'',
-          code:'',
-        },
-        deptType:'',
-
-        defaultProps: {
-          checkStrictly : 'true',
-          children: "childrens",
-          label: "label",
-          value:"id"
-        },
-        // 用户导入参数
-        upload: {
-          // 是否显示弹出层（用户导入）
-          open: false,
-          // 弹出层标题（用户导入）
-          title: "",
-          // 是否禁用上传
-          isUploading: false,
-          // 是否更新已经存在的用户数据
-          updateSupport: 0,
-          // 设置上传的请求头部
-          headers: {Authorization: "Bearer " + getToken()},
-          // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-        },
-        deptListSelect:[],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          userName: '',
-          phonenumber: '',
-          status: '',
-          deptId: ''
-        },
-        isClick: false,
-        // 列信息
-        columns: [
-          {key: 0, label: `用户编号`, visible: true},
-          {key: 1, label: `用户名称`, visible: true},
-          {key: 2, label: `用户昵称`, visible: true},
-          {key: 3, label: `节点`, visible: true},
-          {key: 4, label: `手机号码`, visible: true},
-          {key: 5, label: `状态`, visible: true},
-          {key: 6, label: `创建时间`, visible: true}
-        ],
-        rolelist:'',
-        // 表单校验
-        // 表单校验
-        rules1: {
-          roleName: [
-            { required: true, message: "角色名称不能为空", trigger: "blur" }
-          ],
-          roleType: [
-            { required: true, message: "角色类型不能为空", trigger: "blur" }
-          ]
-        },
-        rules: {
-          leaderName: [
-            { required: true, message: '姓名不能为空', trigger: 'blur' },
-          ],
-          accountName: [
-            { required: true, message: '用户名不能为空', trigger: 'blur' },
-          ],
-          leaderPhone: [
-            { required: true, message: '电话不能为空', trigger: 'blur' },
-            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
-          ],
-          mobile: [
-            { required: true, message: '手机号不能为空', trigger: 'blur' },
-            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
-          ],
-          deptType: [
-            { required: true, message: '机构类型不能为空', trigger: 'blur' },
-          ],
-          turnoverType: [
-            { required: true, message: '计费方式不能为空', trigger: 'blur' },
-          ],
-
-          deptName: [
-            { required: true, message: '请输入机构名称', trigger: 'blur' },
-
-          ],
-          roleIds: [
-            { required: true, message: '请选择角色信息', trigger: 'blur' },
-
-          ],
-          region: [
-            { required: true, message: '请选择活动区域', trigger: 'change' }
-          ],
-          date1: [
-            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          date2: [
-            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
-          ],
-          type: [
-            { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-          ],
-          resource: [
-            { required: true, message: '请选择活动资源', trigger: 'change' }
-          ],
-          desc: [
-            { required: true, message: '请填写活动形式', trigger: 'blur' }
-          ],
-          userName: [
-            {required: true, message: "用户名称不能为空", trigger: "blur"},
-            {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
-          ],
-          nickName: [
-            {required: true, message: "用户昵称不能为空", trigger: "blur"}
-          ],
-          password: [
-            {required: true, message: "用户密码不能为空", trigger: "blur"},
-            {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
-          ],
-          password1: [
-            {required: true, message: "用户密码不能为空", trigger: "blur"},
-            { required: true, validator: equalToPassword, trigger: "blur" },
-            {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
-          ],
-          email: [
-            {
-              type: "email",
-              message: "请输入正确的邮箱地址",
-              trigger: ["blur", "change"]
-            }
-          ],
-          phonenumber: [
-            {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              message: "请输入正确的手机号码",
-              trigger: "blur"
-            }
-          ],
-          oldValue:''
-        }
-      };
-    },
-    watch: {
-      // 根据名称筛选节点树
-      deptName(val) {
-        this.$refs.tree.filter(val);
-      },
-      'ruleForm.turnoverType': function(newValue,oldValue) {
-        console.log("oldValue",oldValue)
-        this.oldValue = oldValue
-      },
-    },
-    filters:{
-      /* 翻译角色 */
-      getRolelName:function(roles){
-        if (typeof roles !== 'undefined' && roles !== null && Array.isArray(roles)) {
-          let roleNames = roles.map(function(role) {
-            return role.roleName;
-          });
-          return roleNames.join(",")
-        }else{
-          return '未分配角色'
-        }
-      }
-    },
-    created() {
-      this.getList();
-      this.selectChildByDeptIdApi();
-
-      if (this.$route.query.activeName){
-        this.activeName = this.$route.query.activeName
-        this.handleClick()
-      }
-
-      if (this.$route.fullPath) {
-        this.getPermi(this.$route.fullPath)
-      }
-
-    },
-    components: {Afterff, Beforeff, Yearff, Treeselect },
-    methods: {
-      // 获取权限信息
-      getPermi(path){
-        let _this = this;
-        getButtonPermi({path:path}).then(res => {
-          res.data.forEach(item => {
-            if (item.sourceCode == "agency:add"){
-              _this.isAgencyAdd = true;
-            }
-            if (item.sourceCode == "agency:update"){
-              _this.isAgencyEdit = true;
-            }
-            if (item.sourceCode == "agency:delete"){
-              _this.isAgencyDelete = true;
-            }
-          })
-          console.log(_this.isAgencyAdd,_this.isAgencyDelete,12223)
-        })
-      },
-      // 修改角色类型
-      async changeMenu() {
-        console.log(this.form1.roleType)
-        if (this.form1.roleType == '4') {
-          this.merchantId = 2
-          this.getMenuTreeselect(2);
-        }
-        if (this.form1.roleType == '3') {
-          this.merchantId = 1
-          await this.getMenuTreeselect(1);
-          await this.handleCheckedTreeNodeAll(true, 'menu')
-        }
-      },
-      // 表单重置
-      reset1() {
-        if (this.$refs.menu != undefined) {
-          this.$refs.menu.setCheckedKeys([]);
-        }
-        this.menuExpand = false,
-          this.menuNodeAll = false,
-          this.form1 = {
-            id: undefined,
-            roleName: '',
-            roleType: '4',
-            status: "A",
-            menuIds: [],
-            menuCheckStrictly: true,
-            description: ''
-          };
-        this.resetForm("form1");
-      },
-      // 取消按钮
-      cancel1() {
-        this.openDuty = false;
-        this.reset1();
-      },
-      submitForm1: function() {
-        this.$refs["form1"].validate(valid => {
-          if (valid) {
-            this.form1.deptType = this.deptType
-            if (this.form1.dutyId) {
-              this.form1.menuIds = this.getMenuAllCheckedKeys();
-              console.log(this.form1.menuIds)
-              updateRole(this.form1).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.openDuty = false;
-                this.getDutyList();
-              });
-            } else {
-              this.form1.storeId = this.queryParams1.storeId
-              this.form1.menuIds = this.getMenuAllCheckedKeys();
-              addRole(this.form1).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.openDuty = false;
-                this.getDutyList();
-              });
-            }
-          }
-        });
-      },
-      // 所有菜单节点数据
-      getMenuAllCheckedKeys() {
-        // 目前被选中的菜单节点
-        let checkedKeys = this.$refs.menu.getCheckedKeys();
-        // 半选中的菜单节点
-        let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-        checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-        return checkedKeys;
-      },
-      // 树权限（展开/折叠）
-      handleCheckedTreeExpand(value, type) {
-        if (type == 'menu') {
-          let treeList = this.menuOptions;
-          for (let i = 0; i < treeList.length; i++) {
-            this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-          }
-        }
-      },
-      // 树权限（全选/全不选）
-      handleCheckedTreeNodeAll(value, type) {
-        console.log(this.menuOptions)
-        if (type == 'menu') {
-          this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-        }
-      },
-      // 树权限（父子联动）
-      handleCheckedTreeConnect(value, type) {
-        if (type == 'menu') {
-          this.form1.menuCheckStrictly = value ? true: false;
-        }
-      },
-      handleAdd1(){
-        // this.reset1();
-        // this.form1.storeId = this.Thetree[0].id
-        // this.openDuty = true;
-        // this.title = "添加角色";
-        // console.log(this.form1)
-        this.$router.push({path:"/Site/add",query: { merchantId: this.merchantId }})
-      },
-      // 查询菜单树结构
-      getMenuTreeselect(merchantId) {
-        console.log("response")
-
-        // merchantId 代表deptType
-        return menuTreeselect({merchantId:merchantId}).then(response => {
-          this.menuOptions = response.data;
-          return response
-        });
-      },
-      handleDelete1(row){
-        const roleIds = row.dutyName;
-        this.$modal.confirm('是否确认删除角色名为"' + roleIds + '"的信息？').then(function() {
-          return dutyDelete(row.dutyId);
-        }).then(() => {
-          this.getDutyList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      },
-      handleUpdate1(data){
-        this.reset1();
-        const roleId = data.dutyId
-        // this.form1.menuCheckStrictly = false
-        // getRole(roleId).then(response => {
-        //   this.form1.roleName = response.data.roleInfo.name;
-        //   this.form1.roleType = response.data.roleInfo.type;
-        //   this.form1.status = response.data.roleInfo.status;
-        //   this.form1.dutyId = response.data.roleInfo.id;
-        //   this.form1.description = response.data.roleInfo.description;
-        //   this.openDuty = true;
-        //   this.title = "修改角色";
-        //   let checkedKeys = response.data.checkedKeys
-        //   this.form1.checkedKeys = checkedKeys
-        //   this.merchantId = response.data.roleInfo.type
-        //   this.getMenuTreeselect(response.data.roleInfo.type)
-        // });
-
-        this.$router.push({path:"/Site/add",query: { dutyId: roleId }})
-      },
-      handleStatusChangeDuty(data){
-        console.log(data)
-        dutyEdit(data).then(res => {
-          this.$message.success("修改成功")
-          this.getDutyList();
-        })
-      },
-      // 搜索角色信息
-      handleQuery1(){
-        this.queryParams1.page = 1;
-        this.getDutyList();
-      },
-      //重置校色信息
-      reset2(){
-        this.queryParams1 = {
-          page:1,
-          pageSize:10,
-          // 当做机构id使用
-          storeId:"",
-          deptId:''
-        }
-
-        this.getDutyList();
-      },
-      getDutyList(){
-        this.loading = true;
-        dutyList(this.queryParams1).then(res => {
-          this.dutyList = res.data.records;
-          this.total1 = res.data.total;
-          this.loading = false;
-        })
-      },
-      // 更改计费规则
-      async changeTheBillingRule(event) {
-        // 如果为修改时则进行提示
-        if (this.pdinfo == 2) {
-          await this.$confirm('此操作将更改计费规则, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            if (this.ruleForm.turnoverType=='1'||this.ruleForm.turnoverType=='3'||this.ruleForm.turnoverType=='4'){
-              this.beginTime = ""
-              this.endTime = ""
-            }
-            // this.rateClearing()
-          }).catch(() => {
-            console.log("event",event)
-            this.ruleForm.turnoverType = this.oldValue
-          });
-        }
-
-
-      },
-      // 清空数据
-      rateClearing () {
-        this.timeFrame =[]
-        this.beginTime = ""
-        this.endTime = ""
-        this.ruleForm.turnoverLimit =  0
-        this.ruleForm.turnoverTime =  ''
-        this.ruleForm.turnoverStartTime = null
-        this.ruleForm.turnoverEndTime = null
-        this.ruleForm.rates = 0
-        this.ruleForm.storeNum = 0
-        this.ruleForm.prepaidAmount = 0
-      },
-      // 费率计算
-      rateCalculation () {
-        if (this.ruleForm.turnoverType === '3') {
-          // 预付金额
-          const turnoverLimit = new BigNumber(this.ruleForm.prepaidAmount?this.ruleForm.prepaidAmount:0);
-          // 费率
-          const feeRate = new BigNumber(this.ruleForm.rates?this.ruleForm.rates:0);
-          if (feeRate == 0) return
-          const fee = turnoverLimit.dividedBy(feeRate.dividedBy(0.01));
-          this.ruleForm.turnoverLimit = fee.toFixed(2)
-        }else if (this.ruleForm.turnoverType === '4'){
-          // 实际交易量
-          const turnoverLimit = new BigNumber(this.ruleForm.turnoverLimit?this.ruleForm.turnoverLimit:0);
-          const feeRate = new BigNumber(this.ruleForm.rates?this.ruleForm.rates:0);
-          if (feeRate == 0) return
-          const fee = turnoverLimit.times(feeRate.dividedBy(0.01));
-          this.ruleForm.prepaidAmount = fee.toFixed(2)
-        }
-      },
-      // 页面初始化
-      initPage() {
-        this.activeName= 'list',
-        this.userList= 'list',
-        // this.cleanUp()
-        this.getList()
-      },
-
-      // 创建节点类型判断
-      judgementNodeType(typeList) {
-        let evenNumbers = typeList
-        // isClick
-        if (this.deptType == 3  || (this.deptType == 2 && !this.isClick)) {
-          evenNumbers = typeList.filter(number => number.label === "单油站");
-          this.ruleForm.deptType = "3"
-        }
-        return evenNumbers
-      },
-      // 状态修改
-      getswitch(e){
-        console.log(e)
-        if(e == true){
-          this.ruleForm.status = 'qy'
-        }else {
-          this.ruleForm.status = 'jy'
-        }
-      },
-
-      async activecilck(data){
-
-        // 判断是点击还是修改该
-        this.isClick = true
-
-        console.log('点树',data)
-
-        this.isAdd = false
-        this.cleanUp()
-
-        let flag = true
-        await this.getIsTopLevelNodesApi(data.id).then(res=>{
-          flag = res
-          console.log('点树2222',res)
-
-        })
-        this.$forceUpdate();
-        this.isTopDept = flag
-
-
-        // 点击树之后
-        this.queryParams.deptId = data.id
-        this.queryParams1.storeId = data.id
-        this.deptType = data.deptType
-        this.deptId = data.id
-        this.parentDeptType = data.deptType
-        // 新增节点
-        this.appedit(data.id,data.label)
-        // 用户请求
-        // this.getList();
-        this.onlyGetUser()
-        this.getDutyList()
-        this.merchantId = data.deptType
-        this.getMenuTreeselect(data.deptType);
-      },
-
-      // 清除信息
-      cleanUp(){
-        this.ruleForm = {
-          parentId:'',
-          deptType:'1',
-          status:'qy',
-          leaderName:'',
-          leaderPhone:'',
-          // parentName:'请先选择父级节点',
-          deptName: '',
-          turnoverLimit: '',
-          turnoverType: "1",
-          turnoverTime: '',
-        }
-      },
-
-      // 修改树
-      handleChange(value) {
-        console.log(value);
-      },
-
-      handleChangeInputNumber(value) {
-        console.log(value);
-      },
-      handleChanges(value) {
-        let arr = value
-        this.ruleForm.parentId = arr[arr.length - 1]
-      },
-
-      getMax(val){
-        getMaxNumber(this.ruleForm).then(res=>{
-          console.log("8888888888",this.ruleForm.storeNum)
-          console.log("7777777777",res.data)
-          if(res.code ==200){
-              this.ruleForm.storeNum=res.data
-          }
-        });
-      },
-      //新增节点
-      submitForms(formName) {
-
-
-        console.log("timeFrame ",this.timeFrame)
-        console.log("this.ruleForm ",this.ruleForm,this.ruleForm.parentId)
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-              console.log("timeFrame",this.timeFrame)
-            if (this.timeFrame){
-              // this.ruleForm.turnoverStartTime = this.timeFrame[0]
-              // this.ruleForm.turnoverEndTime = this.timeFrame[1]
-            }
-            this.ruleForm.turnoverStartTime = this.beginTime
-            this.ruleForm.turnoverEndTime = this.endTime
-            if (!this.storeNum) {
-              this.ruleForm.storeNum = null
-            }
-            deptadd(this.ruleForm).then(res=>{
-              if(res.code == 200){
-                this.$message({
-                  message: '操作成功',
-                  type: 'success'
-                });
-                this.initPage()
-              }
-            })
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
-
-      },
-      //修改
-      submitFormseide(ruleForm){
-        this.$refs[ruleForm].validate((valid) => {
-
-          if (valid) {
-            if (!this.storeNum) {
-              this.ruleForm.storeNum = null
-            }
-            // if (this.timeFrame){
-            //   this.ruleForm.turnoverStartTime = this.timeFrame[0]
-            //   this.ruleForm.turnoverEndTime = this.timeFrame[1]
-            // }
-            this.ruleForm.turnoverStartTime = this.beginTime
-            this.ruleForm.turnoverEndTime = this.endTime
-
-            deptedit(this.ruleForm).then(res=>{
-              // console.log(res)
-              if(res.code == 200){
-                this.$message({
-                  message: '操作成功',
-                  type: 'success'
-                });
-                this.getList()
-                this.cleanUp
-              }
-            })
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
-
-      },
-      // resetForm(formName) {
-      //
-      //   // this.$refs[formName].resetFields();
-      // },
-      handleClick(tab, event) {
-        console.log(this.activeName)
-        if (this.activeName==="list"){
-          this.onlyGetUser()
-        }
-        if (this.activeName==="duty"){
-          this.getDutyList()
-        }
-      },
-      //树形页操作
-      //新增树
-      append(data) {
-        console.log('新增树',data)
-        // 清除表单
-        this.cleanRuleForm()
-        this.activeName = 'info'
-        this.pdinfo = 1
-        this.timeFrame = []
-        this.beginTime = ""
-        this.endTime = ""
-        this.parentDeptType = data.deptType
-        this.addNode(data.id,data.label,data.deptType)
-        // console.log(this.pdinfo)
-        event.stopPropagation();
-        this.isAdd = true
-        // 新增树
-        if (data.id == 100) {
-          this.is2Store = true
-        }else {
-          this.is2Store = true
-        }
-      },
-      cleanRuleForm() {
-        this.ruleForm= {
-          parentId:'',
-          deptType:'1',
-          status:'qy',
-          leader_name:'',
-          leader_phone:'',
-          // parentName:'请先选择父级节点',
-          deptName: '',
-          turnoverLimit: '',
-          turnoverType: "1",
-          turnoverTime: '',
-        }
-      },
-      // 新增数据
-       addNode(id,label,deptType) {
-        let _this = this
-        // 默认类型
-        this.isClick = false
-        this.ruleForm.deptType = deptType
-        this.$nextTick(() => {
-          console.log("新增树的返回222", this.ruleForm,id,label);
-        });
-
-        // _this.ruleForm.deptType = '1'
-        // 点击树获取部门信息
-         this.cascader = []
-         let fanCascader = []
-
-         Userlist(id).then(async res=>{
-           console.log(res ,263)
-             this.deptType = res.data.deptType
-             this.parentName = res.data.parentName
-           // if (res.data.parentId==0){
-             this.ruleForm.parentId = res.data.deptId
-           // }else {
-           //   this.ruleForm.parentId = res.data.parentId
-           // }
-
-             let pid = res.data.parentId
-             fanCascader.push(res.data.deptId)
-             while (pid!=0){
-              await Userlist(pid).then(re=> {
-                  pid = re.data.parentId
-                 fanCascader.push(re.data.deptId)
-               })
-             }
-             this.cascader = fanCascader.reverse()
-             this.isTopDept = false
-           console.log( this.ruleForm.parentId ,111)
-           })
-
-
-
-      },
-      //修改树
-      appedit(id,label) {
-        this.pdinfo = 2
-
-        console.log("点击树获取部门信息",id)
-        // 点击树获取部门信息
-        Userlist(id).then(res=>{
-          let ancestors = res.data.ancestors.slice(2).toString();
-          this.parentName = res.data.parentName
-
-          this.ruleForm = res.data
-
-          if (this.ruleForm.parentId == 100) {
-            this.is2Store = true
-          }else {
-            this.is2Store = false
-
-          }
-
-          // this.ruleForm.parentId = res.data.parentId
-          // this.ruleForm.status = res.data.status
-          // this.ruleForm.leaderName = res.data.leaderName
-          // this.ruleForm.leaderPhone = res.data.leaderPhone
-          // this.ruleForm.turnoverType = res.data.turnoverType
-          // this.ruleForm.turnoverType = res.data.turnoverType
-
-
-          if (this.ruleForm.turnoverStartTime) {
-            const date = new Date(this.ruleForm.turnoverStartTime);
-            // this.timeFrame[0] = date.toString();
-            // this.beginTime = date.toString();
-            this.timeFrame[0] = date;
-            this.beginTime = date;
-          }
-          if (this.ruleForm.turnoverEndTime) {
-            const date = new Date(this.ruleForm.turnoverEndTime);
-            // this.timeFrame[1] = date.toString();
-            // this.endTime = date.toString();
-            this.timeFrame[1] = date;
-            this.endTime = date;
-          }
-          if (this.ruleForm.storeNum) {
-            this.storeNum = true
-          }
-          if(res.data.status === 'qy'){
-            this.value10 = true
-          }else {
-            this.value10 = false
-          }
-
-          let temp = ancestors.split(',')
-          this.cascader = []
-          temp.forEach(it=>{
-            this.cascader.push(parseInt(it))
-          })
-          this.$forceUpdate()
-          // console.log(this.cascader)
-        })
-        this.ruleForm.deptId = id
-        // this.ruleForm.parentId = data.id,
-        this.ruleForm.deptName = label
-      },
-      //删除树
-      remove(node, data) {
-        this.deleteid = data.id
-        this.opendelete()
-
-      },
-      opendelete() {
-        this.$confirm('此操作将永久删除该机构, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deptDelete(this.deleteid).then(res=>{
-            // console.log(res)
-            if(res.code == 200){
-              this.initPage();
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              });
-              this.cleanUp
-            }
-          })
-
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
-      },
-      // <el-button size="mini" type="text" on-click={ () => this.appedit(data) }>修改</el-button>
-      renderContent(h, { node, data, store }) {
-        console.log("node",node)
-        console.log("data",data)
-        console.log("store",store)
-        let isAdd =  data.deptType == '3'
-
-        return (
-
-          <div class="custom-tree-node" style="display: flex;align-items: center;">
-          <span class="custom-tree-box">{node.label}</span>
-          <span style="display: flex;align-items: center;">
-            {!isAdd && this.isAgencyAdd ?
-
-
-              < img alt="" src="https://www.youkerr.com/add" style=" width: 20px;height: 20px;  " on-click={() => this.append(data)}/>
-              : null
-            }
-            {node.level !== 1 && this.isAgencyDelete ?
-              < img alt="" src="https://www.youkerr.com/del" style=" width: 20px;height: 20px;  " on-click={() => this.remove(node, data)}/>
-
-              : null
-            }
-          </span>
-        </div>);
-      },
-
-
-      async getIsTopLevelNodesApi(deptId) {
-        let flag = false
-        await isTopLevelNodesApi({deptId:deptId}).then(res =>{
-          if (res.code === 200) {
-            flag = res.data
-          }
-        })
-        return flag
-      },
-
-      /** 查询用户列表 */
-      async getList() {
-        console.log("123123123",this.form)
-        await deptTreeSelect({deptName :this.filterText}).then(response => {
-          this.Thetree = response.data
-          if(this.Thetree.length>0 && !this.queryParams.deptId) {
-            this.queryParams.deptId = this.Thetree[0].id
-            this.deptId = this.Thetree[0].id
-            this.appedit(this.deptId)
-            console.log("fdfdnfdfdfddf",this.Thetree)
-            this.form.deptType = this.Thetree[0].deptType
-            this.queryParams1.storeId = this.Thetree[0].id
-            console.log("this.Thetree",this.Thetree[0])
-          }
-
-        });
-        this.loading = true;
-        // this.addDateRange(this.queryParams, this.dateRange)
-        console.log(this.queryParams,111)
-        listUser(this.queryParams).then(response => {
-          this.userList = response.data.records;
-          this.total = response.data.total;
-          this.total = response.data.total;
-            this.loading = false;
-          }
-        );
-      },
-      selectChildByDeptIdApi() {
-        selectChildByDeptId().then(res=>{
-          this.deptListSelect = res.data
-        })
-      },
-
-
-
-      onlyGetUser(){
-        this.loading = true;
-        console.log(this.queryParams,222)
-        // this.addDateRange(this.queryParams, this.dateRange)
-        listUser(this.queryParams).then(response => {
-            this.userList = response.data.records;
-            this.total = response.data.total;
-            this.total = response.data.total;
-            this.loading = false;
-          }
-        );
-      },
-      // getStaffList() {
-      //   const storeId = this.form.storeId ? this.form.storeId : 0;
-      //   getStoreStaffList(storeId).then(response => {
-      //     this.staffOptions = response.data.staffList;
-      //   });
-      // },
-
-      /** 查询节点下拉树结构 */
-      getDeptTree() {
-        deptTreeSelect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
-      // 筛选节点
-      filterNode(value, data) {
-        if (!value) return true;
-        return data.label.indexOf(value) !== -1;
-      },
-      // 节点单击事件
-      handleNodeClick(data) {
-        // console.log(data)
-        this.xid  = data.id
-        this.queryParams.deptId = data.id
-        this.xtitle = data.label
-        this.getList()
-
-
-
-
-      },
-      // 用户状态修改
-      handleStatusChange(row) {
-        let text = row.status === "0" ? "启用" : "停用";
-        this.$modal.confirm('确认要"' + text + '""' + row.realName + '"用户吗？').then(function () {
-          return updateUser(row);
-        }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-        }).catch(function () {
-          row.status = row.status === "0" ? "1" : "0";
-        });
-
-        // scope.row.accountStatus
-
-        // this.$confirm('确认要"' + text + '""' + row.realName + '"用户吗？', '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // }).then(() => {
-        //   changeUserStatus(row.userId, row.status).then(res=>{
-        //     this.$message({
-        //       type: 'success',
-        //       message: text+'成功!'
-        //     });
-        //   })
-        // }).catch(() => {
-
-        // });
-
-
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      /** 转换部门数据结构 */
-      normalizer(node) {
-        // console.log('转换部门数据结构',node)
-        if (node.childrens && !node.childrens.length) {
-          delete node.childrens;
-        }
-        return {
-          id: node.id,
-          label: node.label,
-          children: node.childrens
-        };
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          userId: undefined,
-          deptId: undefined,
-          userName: undefined,
-          nickName: undefined,
-          password: undefined,
-          phonenumber: undefined,
-          email: undefined,
-          sex: undefined,
-          status: "0",
-          remark: undefined,
-          postIds: [],
-          // roleIds: []
-          roleIds: ''
-        };
-        this.resetForm("form");
-      },
-
-
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.queryParams.deptId = undefined;
-        this.$refs.tree.setCurrentKey(null);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        // this.ids = selection.map(item => item.userId);
-        this.ids = selection.map(item => item.acctId);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      // 更多操作触发
-      handleCommand(command, row) {
-        switch (command) {
-          case "handleResetPwd":
-            this.handleResetPwd(row);
-            break;
-          case "handleAuthRole":
-            this.handleAuthRole(row);
-            break;
-          default:
-            break;
-        }
-      },
-
-      // 获取角色信息
-      getRoleList(permissionType) {
-        let par={
-          permissionType:permissionType
-        }
-        getDutyList(par).then(res=>{
-          this.rolelist = res.data
-        })
-      },
-      // 获取角色信息
-      getRoleList1(storeId) {
-        dutyLists({storeId:storeId}).then(res => {
-          this.rolelist = res.data
-        })
-      },
-
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.open = true
-        this.title = "新增用户"
-        this.resetForm()
-        let permissionType
-        if (this.deptType === "3") {
-          permissionType = 'staff'
-        }else {
-          permissionType = 'system'
-        }
-        // this.getRoleList(permissionType);
-        this.getRoleList1(this.queryParams1.storeId);
-
-
-      },
-      resetForm () {
-        this.form= {
-          accountName:'',
-          password:'',
-          accountStatus:1
-        }
-        this.queryParams= {
-          pageNum: 1,
-          pageSize: 10,
-          userName: '',
-          phonenumber: '',
-          status: '',
-          deptId: ''
-        }
-      },
-
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        console.log('修改用户信息',row)
-        this.title = '修改用户信息'
-        const app = this;
-        app.reset();
-        app.open = true;
-        app.form = row
-
-        app.form.roleIds = Number(app.form.roleIds);
-
-        app.form.password1 = row.password
-
-        //获取角色
-        let permissionType
-
-        if (row.deptType === "3") {
-          permissionType = 'staff'
-        }else {
-          permissionType = 'system'
-        }
-        // this.getRoleList(permissionType);
-        this.getRoleList1(row.deptId);
-
-      },
-
-      // 角色过滤
-      /** 重置密码按钮操作 */
-      handleResetPwd(row) {
-
-        console.log("row",row)
-        this.$prompt('请输入"' + row.realName + '"的新密码', "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          closeOnClickModal: false,
-          inputPattern: /^.{5,20}$/,
-          inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
-        }).then(({value}) => {
-          resetUserPwd(row.acctId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {
-        });
-      },
-      /** 分配角色操作 */
-      handleAuthRole: function (row) {
-        const userId = row.userId;
-        this.$router.push("/system/user-auth/role/" + userId);
-      },
-      /** 提交按钮 */
-      submitForm: function () {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            // this.form.merchantId =
-            // this.form.roleIds = [this.form.roleIds]
-            // if (this.form.userId !== undefined) {
-            if (this.form.acctId) {
-              updateUser(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.initPage()
-
-              });
-            } else {
-              this.form.deptId = this.queryParams.deptId
-              this.form.deptType = this.deptType
-              addUser(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.initPage()
-              });
-            }
-          }
-        });
-      },
-
-      getCodeByRole(value) {
-        console.log("value",value)
-        this.rolelist.forEach(res => {
-          if (res.id == value) {
-            this.form.code = res.code
-          }
-        })
-        console.log("value22",this.form.code)
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        // const userIds = row.userId || this.ids;
-        const userIds = row.acctId || this.ids;
-        // this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
-        this.$modal.confirm('是否确认删除"' + row.realName + '"的数据项？').then(function () {
-          return delUser(userIds);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {
-        });
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('system/user/export', {
-          ...this.queryParams
-        }, `user_${new Date().getTime()}.xlsx`)
-      },
-      /** 导入按钮操作 */
-      handleImport() {
-        this.upload.title = "用户导入";
-        this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-        this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-        this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-        this.upload.open = false;
-        this.upload.isUploading = false;
-        this.$refs.upload.clearFiles();
-        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
-        this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-        this.$refs.upload.submit();
-      },
-      inputDeptName() {
-        this.getList()
-      }
-    }
-  };
-</script>
-<style>
-
-
-  .el-tree-node.is-current > .el-tree-node__content {
-    background-color: rgb(201, 227, 255) !important;
-  }
-
-.app-container{
-    width: 100%;
-    height: 100vh;
-    background: #f6f8f9;
-  }
-  .left-box{
-    box-sizing: border-box;
-    height: 85vh;
-    padding: 15px;
-    overflow-y: auto; /* 只显示垂直滚动条 */
-  }
-  .title-h{
-    font-size: 18px;
-    font-weight: 600;
-    margin-bottom: 20px;
-  }
-  .xzbox{
-    width: 100%;
-    margin: 5px auto;
-    border-radius: 8px;
-    height: 40px;
-    box-sizing: border-box;
-    padding: 0px 10px;
-    display: flex;
-    align-items: center;
-    color: #409EFF;
-
-    /*background: #99a9bf;*/
-  }
-  .custom-tree-box{
-    margin-right: 10px;
-
-  }
-</style>
-
diff --git a/fuintAdmin_zt/src/views/balance/list.vue b/fuintAdmin_zt/src/views/balance/list.vue
deleted file mode 100644
index e5f3a6344..000000000
--- a/fuintAdmin_zt/src/views/balance/list.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="有效" value="A"/>
-          <el-option key="N" label="无效" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="80"/>
-      <el-table-column label="会员ID" align="center" prop="userId" />
-      <el-table-column label="手机号" align="center" prop="userInfo.mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.mobile">{{ scope.row.userInfo.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="userInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.name">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="变动数量" align="center" prop="amount">
-         <template slot-scope="scope">
-             <span v-if="scope.row.amount > 0" style="color:forestgreen">+{{ scope.row.amount }}</span>
-             <span v-else style="color:red">{{ scope.row.amount }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-        <template slot-scope="scope">
-          <span v-if="scope.row.description">{{ scope.row.description }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.operator">{{ scope.row.operator }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getBalanceList } from "@/api/balance";
-export default {
-  name: "BalanceList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        orderSn: '',
-        status: ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getBalanceList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.catchTypeList = response.data.catchTypeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/balance/setting.vue b/fuintAdmin_zt/src/views/balance/setting.vue
deleted file mode 100644
index a81de8ac8..000000000
--- a/fuintAdmin_zt/src/views/balance/setting.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-      <el-form ref="form" class="content" :model="form" :rules="rules" label-width="120px">
-        <div class="title">充值规则设置</div>
-        <el-row v-for="(item, index) in form.rechargeItem" :key="index">
-          <el-col :span="24">
-            <el-form-item class="recharge-item">
-              <el-input v-model="item.rechargeAmount" class="recharge-input" placeholder="充值金额，单位：元" maxlength="10" />
-              <span class="recharge-tips">赠送</span>
-              <el-input v-model="item.giveAmount" class="give-input" placeholder="赠送金额，单位：元" maxlength="10" />
-              <span class="remove el-icon-delete" @click="removeRechargeItem(index)"></span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="operate"><span class="el-icon-plus" @click="addRechargeItem()"></span></div>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item">
-              <el-input v-model="form.remark" rows="4" type="textarea" placeholder="请输入充值说明" maxlength="1000" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item class="recharge-status" label="开启状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">开启</el-radio>
-                <el-radio key="D" label="D" value="D">关闭</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getSettingInfo, saveSetting } from "@/api/balance";
-
-export default {
-  name: "BalanceSetting",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 表单参数
-      form: { rechargeItem: [], remark: '', status: "A" },
-      // 表单校验
-      rules: {
-        rechargeItem: [
-          { required: true, message: "充值项不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getSettingInfo();
-  },
-  activated() {
-    this.getSettingInfo();
-  },
-  methods: {
-    // 添加充值项
-    addRechargeItem() {
-       this.form.rechargeItem.push({ rechargeAmount: '', giveAmount: '' })
-    },
-    //  删除充值项
-    removeRechargeItem(i) {
-      console.log(i)
-      const rechargeItem = []
-      this.form.rechargeItem.forEach(function(item, index){
-         if (i !== index) {
-           rechargeItem.push(item)
-         }
-      })
-      this.form.rechargeItem = rechargeItem
-    },
-    // 查询账户列表
-    getSettingInfo() {
-      this.loading = true;
-      getSettingInfo(this.queryParams).then(response => {
-          this.form.rechargeItem = response.data.rechargeRuleList;
-          this.form.remark = response.data.remark;
-          this.form.status = response.data.status;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push( { path: '/balance/list' } );
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveSetting(this.form).then(response => {
-              this.$modal.msgSuccess("保存成功");
-              this.getSettingInfo();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-.main-panel {
-  .content {
-    margin-left: 30px;
-    .title {
-       padding-left: 120px;
-       font-size: 18px;
-       height: 50px;
-    }
-    .operate {
-      padding-left: 120px;
-      height: 50px;
-      .el-icon-plus {
-         border: #FFFFFF solid 1px;
-         padding: 5px;
-         border-radius: 20px;
-         background: #00acac;
-         color: #FFFFFF;
-         cursor: pointer;
-      }
-    }
-    .recharge-status {
-       margin-left: 68px;
-    }
-    .recharge-item {
-        min-width: 600px;
-       .recharge-input {
-          width: 200px;
-          float:left;
-          margin-right: 2px;
-       }
-       .give-input {
-          width: 200px;
-          float:left;
-          margin-left: 2px;
-       }
-      .recharge-tips {
-          float:left;
-          background: #00acac;
-          display: block;
-          width: 50px;
-          color: #ffffff;
-          text-align: center;
-          border-radius: 2px;
-      }
-      .remove {
-          color: red;
-          cursor: pointer;
-          margin-left: 10px;
-      }
-    }
-  }
-  .footer {
-    margin-top: 10px;
-    margin-left: 150px;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/components/hangUpDialog.vue b/fuintAdmin_zt/src/views/cashier/components/hangUpDialog.vue
deleted file mode 100644
index a2655b773..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/hangUpDialog.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-    <el-dialog class="common-dialog" title="挂单列表" :visible="showDialog" @close="close" width="1000px" destroy-on-close>
-        <el-alert title="提示：请选择一个空白位置挂单" type="warning" :closable="false"></el-alert>
-        <div class="order-list">
-          <div class="order-item" v-for="orderInfo in orderList">
-            <div class="info" v-if="!orderInfo.isEmpty">
-              <div class="sn">{{ orderInfo.hangNo }} <span @click="remove(orderInfo.hangNo)" class="remove el-icon-delete"></span></div>
-              <div class="order" v-if="!orderInfo.isEmpty" @click="getHangUp(orderInfo.hangNo, orderInfo.memberInfo)">
-                <div class="item">会员：{{ orderInfo.memberInfo ? orderInfo.memberInfo.name : '游客' }}</div>
-                <div class="item">件数：{{ orderInfo.num }}</div>
-                <div class="item">金额：￥{{ orderInfo.amount }}</div>
-                <div class="item time">{{ orderInfo.dateTime }}</div>
-              </div>
-            </div>
-            <div v-if="orderInfo.isEmpty" class="none" @click="doHangUp(orderInfo.hangNo)">
-              <div class="sn">{{ orderInfo.hangNo }} <span @click="remove(orderInfo.hangNo)" class="remove el-icon-delete"></span></div>
-              <div class="tips">空白位置</div>
-            </div>
-          </div>
-        </div>
-        <div class="clearfix"></div>
-        <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="close()">关闭</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script>
-import { doHangUp, getHangUpList, removeHangUp } from "@/api/cashier";
-export default {
-    props: {
-      showDialog: {
-        type:[Boolean],
-        default:()=>false
-      },
-      memberInfo: {
-         type:[Object],
-         default:()=>{}
-      },
-      cartList: {
-        type:[Array],
-        default:()=>[]
-      },
-    },
-    watch: {
-      showDialog(value) {
-        if (value) {
-            console.log('memberInfo = ', this.memberInfo)
-            this.getHangUpList();
-        }
-      }
-    },
-    data(){
-        return {
-          loading: false,
-          orderList: []
-        }
-    },
-    methods: {
-        // 删除挂单
-        remove(hangNo) {
-          const app = this;
-          const param = { hangNo: hangNo };
-          removeHangUp(param).then( response => {
-            if (response) {
-                app.$modal.msgSuccess("删除挂单成功！");
-                app.getHangUpList();
-            }
-          })
-        },
-        // 执行挂单
-        doHangUp(hangNo) {
-           const app = this;
-           if (!app.cartList || app.cartList.length < 1) {
-               app.$modal.alert("请先添加结算商品！");
-               return false;
-           }
-           let cartIds = [];
-           app.cartList.forEach(function(cart) {
-              cartIds.push(cart.cartId);
-           })
-           const param = { hangNo: hangNo, userId: app.memberInfo ? app.memberInfo : '', cartIds: cartIds.join(',') };
-           doHangUp(param).then( response => {
-               if (response) {
-                   app.$modal.msgSuccess("挂单成功！");
-                   app.getHangUpList();
-                   app.$emit('doHangUp');
-               }
-           })
-        },
-        // 获取挂单列表
-        getHangUpList() {
-          const app = this;
-          getHangUpList().then( response => {
-            if (response.data) {
-                app.orderList = response.data;
-            }
-          })
-        },
-        // 取单
-        getHangUp(hangNo, memberInfo) {
-           this.$emit('getHangNo', { 'hangNo': hangNo, 'memberInfo': memberInfo });
-        },
-        close() {
-           this.$emit('closeDialog','hangUpDialog');
-        }
-    }
-}
-</script>
-<style lang="scss" scoped>
-  .order-list {
-     margin-top: 6px;
-     .order-item {
-         width: 20%;
-         float: left;
-         height: 200px;
-         cursor: pointer;
-         padding: 5px;
-         .info {
-           border: solid 1px #cccccc;
-           padding: 5px;
-           height: 100%;
-           border-radius: 4px;
-           background: #e6f7f7;
-           border: #00acac solid 1px;
-           .sn {
-             font-weight: bold;
-             font-size: 20px;
-             color: #ff5b57;
-             .remove {
-               float: right;
-               font-size: 12px;
-               color: #666666;
-               font-weight: bold;
-             }
-           }
-           .order {
-              margin: 10px;
-              .item {
-                 margin-bottom: 3px;
-              }
-              .time {
-                 position: relative;
-                 bottom : -50px;
-                 color: #909399;
-              }
-           }
-         }
-         .none {
-            height: 100%;
-            color: #666666;
-            border: solid 1px #cccccc;
-            border-radius: 4px;
-            padding: 10px;
-            .tips {
-               line-height: 150px;
-               text-align: center;
-            }
-           .sn {
-             font-weight: bold;
-             font-size: 20px;
-             color: #ff5b57;
-             .remove {
-               float: right;
-               font-size: 12px;
-               color: #666666;
-               font-weight: bold;
-             }
-           }
-         }
-     }
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/components/noGoodsCashier.vue b/fuintAdmin_zt/src/views/cashier/components/noGoodsCashier.vue
deleted file mode 100644
index 951941784..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/noGoodsCashier.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <!-- 积分变更对话框 -->
-  <el-dialog title="无商品收款" :visible.sync="showDialog" class="common-dialog" width="700px" @close="close" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="收款金额：" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入收款金额" style="width: 200px" maxlength="150" />
-            <div class="form-tips">( 单位：元 )</div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item class="recharge-item" prop="remark" label="备注信息：">
-            <el-input v-model="form.remark" type="textarea" rows="3" placeholder="请输入备注信息" maxlength="255" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" class="main-button" @click="submitForm">确定收款</el-button>
-      <el-button @click="close">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  name: "noGoodsCashier",
-  props: {
-    showDialog:{
-      type:[Boolean],
-      default:()=>false
-    }
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 表单参数
-      form: {  amount: '', remark: '' },
-      // 表单校验
-      rules: {
-        amount: [
-          { required: true, message: "金额不能为空", trigger: "blur" },
-          { pattern: /^[0-9]{1,10}$/, message: `请输入1-10位数字`, trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  watch: {
-    showDialog(value) {
-      if (value) {
-          this.form.amount = '';
-          this.form.remark = '';
-      }
-    }
-  },
-  methods: {
-    // 取消按钮
-    close() {
-      this.$emit('closeDialog', 'openNoGoodsCashierDialog');
-    },
-    // 重置表单
-    reset() {
-      this.form.amount = '';
-      this.form.remark = '';
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            this.$emit('submit', this.form);
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/cashier/components/orderPrintDialog.vue b/fuintAdmin_zt/src/views/cashier/components/orderPrintDialog.vue
deleted file mode 100644
index b71110352..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/orderPrintDialog.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog class="common-dialog" title="订单打印预览" :visible="showDialog" width="380px" @close="cancel" append-to-body destroy-on-close>
-    <div v-if="orderInfo.id" class="print-area" id="printArea">
-      <div class="base-info">
-        <div class="name">{{ storeInfo.name }}</div>
-        <div class="no">NO：{{ orderInfo.orderSn }}</div>
-      </div>
-      <div>****************************************</div>
-      <div class="goods-list" v-if="orderInfo.goods.length > 0">
-        <div class="goods-item" v-for="(goodsInfo, index) in orderInfo.goods">
-          <span class="item">{{ index+1 }}.{{ goodsInfo.name }}</span>
-          <span class="item">x{{ goodsInfo.num }}</span>
-          <span class="item">￥{{ goodsInfo.price }}</span>
-        </div>
-      </div>
-      <div v-if="orderInfo.goods.length > 0">****************************************</div>
-      <div class="member-info">
-        <div class="item" v-if="orderInfo.isVisitor == 'N'"><span class="t">会员名称：</span>{{ orderInfo.userInfo.name }}</div>
-        <div class="item" v-if="orderInfo.isVisitor == 'N'"><span class="t">会员号码：</span>{{ orderInfo.userInfo.userNo ? orderInfo.userInfo.userNo : '-' }}</div>
-        <div class="item" v-if="orderInfo.isVisitor == 'Y'"><span class="t">会员信息：</span>无</div>
-      </div>
-      <div>****************************************</div>
-      <div class="total-info">
-        <div class="item">订单类型：{{ orderInfo.typeName }}</div>
-        <div class="item">订单时间：{{ orderInfo.createTime }}</div>
-        <div class="item">优惠金额：<span class="discount">￥{{ orderInfo.discount.toFixed(2) }}</span></div>
-        <div class="item">应收金额：<span class="amount">￥{{ orderInfo.payAmount.toFixed(2) }}</span></div>
-      </div>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" class="main-button" @click="handlePrint(printObj)" v-print="printObj">打印</el-button>
-      <el-button @click="cancel()">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-export default {
-  props: {
-    showDialog: {
-      type:[Boolean],
-      default:()=>false
-    },
-    orderInfo: {
-      type:[Object],
-      default:()=>{}
-    },
-    storeInfo: {
-      type:[Object],
-      default:()=>{}
-    }
-  },
-  data(){
-    return {
-      printObj: {
-        id: "printArea",
-        popTitle: '订单明细',
-        extraCss: '',
-        preview: false,
-        previewTitle: '预览的标题',
-        previewPrintBtnLabel: '预览结束，开始打印',
-        extraHead: '',
-        standard: 'loose'
-      }
-    }
-  },
-  methods: {
-    handlePrint() {
-      this.$emit('closeDialog','printOrder');
-    },
-    cancel() {
-      this.$emit('closeDialog','printOrder');
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-.print-area {
-  font-size: 14px;
-  border: solid 1px #ccc;
-  padding: 30px 10px 30px 10px;
-  overflow: hidden;
-  width: 100%;
-  .base-info {
-    margin-bottom: 10px;
-    .name {
-      font-weight: bold;
-      margin-bottom: 5px;
-    }
-  }
-  .goods-list {
-    margin-top: 10px;
-    margin-bottom: 15px;
-    .goods-item {
-      margin-bottom: 10px;
-    }
-  }
-  .member-info {
-    margin-top: 10px;
-    margin-bottom: 20px;
-    .item {
-      clear: both;
-    }
-  }
-  .total-info {
-    .item {
-      margin-bottom: 2px;
-      .amount {
-        font-weight: bold;
-        font-size: 28px;
-      }
-    }
-  }
-}
-</style>
-<style media="print" lang="scss">
-@page {
-  size: auto;
-  margin: 0mm;
-}
-@media print {
-  html {
-    height: auto;
-    width: auto;
-    margin: 0px;
-  }
-  body {
-    border: solid 1px #ffffff;
-  }
-  #printArea {
-    font-size: 14px;
-    display: block;
-    min-width: 320px;
-    min-height: 420px;
-    margin-top: 60px;
-    margin-bottom: 50px;
-    .base-info {
-      margin-bottom: 10px;
-      .name {
-        font-weight: bold;
-        margin-bottom: 5px;
-      }
-    }
-    .goods-list {
-      margin-bottom: 20px;
-      .goods-item {
-        margin-bottom: 50px;
-        .item {
-          margin-right: 10px;
-          margin-bottom: 10px;
-        }
-      }
-    }
-    .member-info {
-      margin-top: 20px;
-      margin-bottom: 20px;
-      margin-top: 10px;
-      margin-bottom: 20px;
-      .item {
-        clear: both;
-      }
-    }
-    .total-info {
-      margin-top: 20px;
-      margin-bottom: 60px;
-      .item {
-        margin-bottom: 2px;
-        .amount {
-          font-weight: bold;
-          font-size: 28px;
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/components/payResultDialog.vue b/fuintAdmin_zt/src/views/cashier/components/payResultDialog.vue
deleted file mode 100644
index 4afc98048..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/payResultDialog.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-    <el-dialog class="common-dialog" title="支付结果" :visible="showDialog" @close="submit" width="580px" destroy-on-close>
-          <el-row>
-            <el-col :span="24">
-              <div class="main">
-                <div class="success" v-if="payResult.isSuccess">
-                  <svg t="1666918162017" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1190" width="48" height="48"><path d="M511.2879 0C229.296245 0 0 229.296245 0 511.2879s229.296245 511.2879 511.2879 511.2879 511.2879-229.296245 511.2879-511.2879S793.279555 0 511.2879 0z m0 995.515994C244.962448 995.515994 28.484006 777.613352 28.484006 511.2879S244.962448 28.484006 511.2879 28.484006s482.803894 216.478442 482.803894 482.803894c1.4242 266.325452-216.478442 484.228095-482.803894 484.228094z m215.054242-655.132128l37.029207 37.029208-283.415855 327.566064-42.726009 49.847009-38.453407-49.847009-138.147427-182.297636 37.029207-37.029207 139.571627 105.39082L726.342142 340.383866z" p-id="1191" fill="#ff5b57"></path></svg>
-                  <div class="txt">支付成功</div>
-                </div>
-                <div class="fail" v-if="!payResult.isSuccess">
-                  <svg t="1666919015577" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2800" width="48" height="48"><path d="M1018.146525 511.98465c0.005117 278.510808-226.653315 503.751921-506.765642 503.603538-279.697876-0.148384-505.875341-226.023964-505.522291-504.84689C6.206526 232.639824 233.417559 7.992245 513.903403 8.416929 792.09186 8.836496 1018.141408 234.579044 1018.146525 511.98465zM512.890301 69.525369c-244.188158-0.281417-445.600919 199.555409-445.703253 442.223914-0.102333 241.634937 200.281977 442.055064 442.648598 442.730465 244.592375 0.680518 446.414471-198.414391 446.982421-440.939629C957.380902 270.56973 756.658892 69.806786 512.890301 69.525369z" p-id="2801" fill="#ff5b57"></path><path d="M769.491511 698.518123c-27.241173 24.841453-50.972308 46.484985-71.561805 65.258062-60.315355-81.416519-120.30836-162.398121-183.079718-247.135362-75.39931 80.541568-136.139349 161.528287-187.423775 251.719902-24.774936-20.44623-48.291171-39.853775-72.92284-60.182321 37.730355-42.309779 74.089442-83.759956 111.221146-124.498916 28.689192-31.477779 57.710968-62.709959 87.878879-92.760186 13.262419-13.211253 11.190166-21.633298-1.361035-33.109999C388.258352 399.295018 324.745076 340.269065 260.812232 281.186829c24.099535-30.817728 28.653375-33.544916 62.300625-9.30723 60.622355 43.675931 119.858092 89.362714 178.213761 136.031899 16.035657 12.822385 25.148454 13.681987 40.344976-0.271184 60.873073-55.899665 126.704202-105.101604 202.456563-143.640394 5.275291 9.12303 9.772848 16.895258 13.380103 23.137601-65.288762 58.033318-129.344406 114.976785-194.346635 172.759386C633.689862 541.46181 701.357877 619.716224 769.491511 698.518123z" p-id="2802" fill="#ff5b57"></path></svg>
-                  <div class="txt">支付失败</div>
-                </div>
-                <div class="amount-info">
-                  <span>￥<span class="amount">{{ payResult.payAmount.toFixed(2) }}</span></span>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-        <div slot="footer" class="dialog-footer">
-            <el-button type="danger" @click="printOrder(payResult.orderId)">打印小票</el-button>
-            <el-button type="primary" @click="submit()">确 认</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script>
-export default {
-    props: {
-      showDialog: {
-        type:[Boolean],
-        default:()=>false
-      },
-      payResult: {
-        type:[Object],
-        default:()=>{}
-      }
-    },
-    data(){
-      return {
-        loading: false,
-      }
-    },
-    methods: {
-       submit() {
-         this.$emit('closeDialog','payResultDialog');
-       },
-       printOrder(orderId) {
-         this.$emit('closeDialog','payResultDialog');
-         this.$emit('showOrderPrint', orderId);
-       }
-    }
-}
-</script>
-<style lang="scss" scoped>
-    .main {
-       height: 140px;
-       padding-top: 10px;
-       text-align: center;
-       font-size: 14px;
-       .txt {
-         margin-top: 8px;
-       }
-       .amount-info {
-          margin-top: 6px;
-          font-size: 28px;
-       }
-    }
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/components/scanPayCodeDialog.vue b/fuintAdmin_zt/src/views/cashier/components/scanPayCodeDialog.vue
deleted file mode 100644
index e0ac8f487..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/scanPayCodeDialog.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-    <el-dialog class="common-dialog" title="扫码收款中..." :visible="showDialog" @close="submit" width="580px" destroy-on-close>
-          <el-row>
-            <el-col :span="24">
-              <div class="main">
-                <svg t="1666919356080" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3143" width="60" height="60" data-spm-anchor-id="a313x.7781069.0.i25"><path d="M212.924 434.56h-60.881V71.908h60.881V434.56z m149.56-362.652h-86.03V434.56h86.03V71.908z m111.842 0H431.31V434.56h43.015l0.001-362.652z m151.544 0H525.28V434.56h100.59V71.908z m88.676 0h-25.148V434.56h25.148V71.908z m70.148 0h-33.089V434.56h33.089V71.908z m91.326 0h-64.854V434.56h64.854V71.908z m-6.285 394.083h-58.569V638.8h58.569V465.991z m121.27-31.431h-86.91v31.433h86.91V434.56zM211.77 461.949h-58.572v172.808h58.57V461.949h0.002z m-89.866-27.389H34.995v31.433h86.909V434.56z m600.584 126.252v34.613a270.753 270.753 0 0 1-48.906 155.214L600.72 854.782v93.31H419.4v-93.31l-72.862-104.143a270.76 270.76 0 0 1-48.906-155.214v-34.613c0-37.384 30.305-67.69 67.691-67.69h289.474c37.385 0.002 67.691 30.309 67.691 67.69z m-106.356 20.384H395.72c21.622 38.569 62.84 64.677 110.205 64.677s88.584-26.104 110.207-64.677z" p-id="3144" fill="#707070" data-spm-anchor-id="a313x.7781069.0.i28" class="selected"></path></svg>
-                <div class="amount-info">
-                  <span class="amount">￥{{ payAmount.toFixed(2) }}</span>
-                </div>
-                <div class="tips">请使用扫码枪，扫描会员付款码！</div>
-              </div>
-            </el-col>
-          </el-row>
-        <div slot="footer" class="dialog-footer">
-           <el-button type="primary" @click="submit()">扫码完成</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script>
-import { doPay } from "@/api/cashier";
-export default {
-    props: {
-      showDialog: {
-        type:[Boolean],
-        default:()=>false
-      },
-      payAmount: {
-        type:[Number],
-        default:()=>0
-      },
-      orderId: {
-        type:[Number],
-        default:()=>0
-      },
-      payType: {
-        type:[String],
-        default:()=>'MICROPAY'
-      }
-    },
-    data(){
-        return {
-          loading: false
-        }
-    },
-    methods: {
-       submit(code) {
-         const app = this;
-         if (code == undefined) {
-             this.$emit('closeDialog','scanPayCodeDialog');
-         } else {
-             doPay({ orderId: app.orderId, authCode: code, payType: app.payType }).then( response => {
-                if (response.data.payment) {
-                    app.$emit('closeDialog', 'scanPayCodeDialog');
-                    app.$emit('showPayResult', { isSuccess: true, payAmount: app.payAmount, orderId: app.orderId });
-                } else {
-                    app.$emit('closeDialog', 'scanPayCodeDialog');
-                    app.$emit('showPayResult', { isSuccess: false, payAmount: app.payAmount, orderId: app.orderId });
-                }
-             })
-         }
-       }
-    }
-}
-</script>
-<style lang="scss" scoped>
-    .main {
-       height: 140px;
-       padding-top: 2px;
-       text-align: center;
-       font-size: 16px;
-       .amount-info {
-          margin-bottom: 20px;
-         .amount {
-           font-size: 28px;
-         }
-       }
-       .tips {
-          font-size: 14px;
-          color: #888888;
-       }
-    }
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/components/settlementDialog.vue b/fuintAdmin_zt/src/views/cashier/components/settlementDialog.vue
deleted file mode 100644
index 68eeaaa80..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/settlementDialog.vue
+++ /dev/null
@@ -1,447 +0,0 @@
-<template>
-    <el-dialog class="common-dialog" title="支付结算" :visible="showDialog" width="1100px" @close="cancel" destroy-on-close>
-        <el-dialog class="common-dialog" width="800px" title="选择卡券" :visible.sync="showCouponDialog" append-to-body destroy-on-close>
-          <div class="coupon-list">
-            <div class="none" v-if="!memberInfo || !myCouponList || myCouponList.length < 1">暂无可用卡券</div>
-            <div class="row" v-for="couponList in myCouponList">
-                <div class="item active" v-for="coupon in couponList">
-                  <div @click="useThisCoupon(coupon)">
-                    <div class="left">
-                       <div class="amount">￥{{ coupon.amount }}</div>
-                       <div class="tips">{{ coupon.description }}</div>
-                    </div>
-                    <div class="right">
-                        <div class="name">{{ coupon.name }}</div>
-                        <div class="time">{{ coupon.effectiveDate }}</div>
-                    </div>
-                  </div>
-                </div>
-            </div>
-          </div>
-        </el-dialog>
-        <el-form ref="form" label-width="0px">
-          <div class="settlement">
-            <div class="left">
-                <div class="title">请选择支付方式</div>
-                <div class="content">
-                   <div :class="'pay-item' + (payType == 'CASH' ? ' active' : '')" @click="selectPayType('CASH')">
-                      <svg t="1656296356619" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10192" width="32" height="32"><path d="M2.323 512C2.323 230.513 230.513 2.323 512 2.323S1021.677 230.513 1021.677 512 793.487 1021.677 512 1021.677 2.323 793.487 2.323 512L2.323 512zM664.053 441.296c-102.278-0.011-185.336 83.036-185.402 185.369-0.055 102.377 83.201 185.567 185.677 185.523 101.981-0.044 185.072-83.135 185.226-185.237C849.697 524.552 766.518 441.306 664.053 441.296zM689.881 615.395c9.786 0 19.572 0.11 29.357-0.055 3.112-0.055 4.002 0.99 3.892 3.991-0.209 5.619-0.055 11.237-0.055 17.296l-49.237 0 0 27.488 48.918 0 0 21.155L673.74 685.27c-0.088 1.792-0.209 3.211-0.209 4.629-0.011 10.896-0.099 21.804 0.044 32.7 0.044 3.068-0.913 4.035-3.958 3.936-6.234-0.209-12.48-0.209-18.714 0-3.013 0.099-4.002-0.792-3.947-3.892 0.176-10.896 0.066-21.804 0.066-32.7l0-4.431-51.315 0 0-21.188 51.084 0L646.791 636.78l-51.37 0c0-6.784-0.11-13.117 0.154-19.44 0.033-0.693 2.232-1.836 3.442-1.847 11.743-0.143 23.486-0.088 35.229-0.088 1.33 0 2.65 0 4.772 0-17.933-30.831-35.526-61.09-53.492-91.975 1.924-0.121 3.178-0.275 4.442-0.275 6.85-0.022 13.7 0.176 20.55-0.088 3.365-0.132 5.212 0.957 6.784 3.991 14.228 27.323 28.61 54.559 42.958 81.827 0.11 0.209 0.286 0.385 0.253 0.341 14.822-27.554 29.665-55.053 44.377-82.651 1.418-2.661 3.035-3.573 5.959-3.486 6.597 0.209 13.205 0.055 19.813 0.077 1.177 0 2.353 0.11 4.211 0.209-18.098 30.809-35.889 61.101-54.053 92.03C684.35 615.395 687.121 615.395 689.881 615.395zM300.198 231.253c4.937 3.573 9.984 7.642 15.118 12.205 5.146 4.563 9.775 9.819 13.887 15.778 2.056 3.178 4.53 6.751 7.411 10.72 2.881 3.969 5.553 7.939 8.027 11.908 2.881 4.365 5.762 8.928 8.642 13.689L481.07 295.553c2.881-3.969 5.553-8.136 8.027-12.502 2.056-3.573 4.321-7.147 6.795-10.72 2.463-3.573 4.728-6.751 6.795-9.522 4.112-5.553 8.235-10.819 12.348-15.778 4.112-4.959 10.083-9.819 17.9-14.58 3.299-1.99 6.069-4.563 8.334-7.741 2.265-3.178 3.705-6.344 4.321-9.522 0.616-3.178 0.209-6.256-1.231-9.225-1.44-2.98-4.211-5.256-8.334-6.839-3.705-1.188-6.894-1.583-9.566-1.188-2.672 0.396-5.355 1.089-8.027 2.089-2.672 0.99-5.454 2.089-8.334 3.277-2.881 1.188-6.377 1.781-10.5 1.781-4.112 0-7.51-0.693-10.182-2.089-2.672-1.385-5.146-3.079-7.411-5.058-2.265-1.979-4.629-4.068-7.103-6.256-2.463-2.188-5.762-3.87-9.874-5.058-8.224-3.178-14.811-3.771-19.747-1.781-4.937 1.99-9.874 5.157-14.822 9.522-4.112 3.969-7.411 6.751-9.874 8.334-1.231 0.792-2.265 1.187-3.09 1.187-2.474-1.187-4.728-2.573-6.795-4.167-2.056-1.198-4.013-2.485-5.861-3.87-1.847-1.385-3.595-3.068-5.245-5.058-3.288-3.178-8.224-5.256-14.811-6.256-6.586-0.99-12.546 0.099-17.9 3.277-6.993 4.365-11.93 8.038-14.811 11.017-2.881 2.98-7.202 5.058-12.963 6.245-3.288 0.792-6.894 0.594-10.797-0.594-3.903-1.187-7.917-2.375-12.04-3.573-4.112-1.188-8.027-1.979-11.732-2.386-3.727-0.418-7.015 0.385-9.896 2.364-5.762 4.365-7.609 9.621-5.553 15.778C291.148 222.809 294.854 227.679 300.198 231.253zM591.682 424.451c-0.352-0.385-0.682-0.814-1.034-1.198-10.489-11.314-20.682-21.133-30.556-29.467-11.93-9.522-22.43-18.56-31.479-27.092-9.06-8.532-16.669-16.174-22.837-22.925-7.411-7.543-13.579-14.481-18.516-20.836l-138.914 0c-5.355 6.751-11.523 13.887-18.516 21.43-5.762 6.751-12.963 14.195-21.606 22.331-8.642 8.136-18.318 16.768-29.017 25.894-12.348 10.325-23.761 22.024-34.261 35.13-10.5 13.106-19.242 27.488-26.235 43.167s-11.831 32.447-14.503 50.314c-2.672 17.856-2.166 36.515 1.539 55.966 3.299 17.461 10.083 35.031 20.374 52.689s24.179 33.635 41.672 47.928c17.493 14.283 38.791 25.905 63.893 34.833 25.102 8.928 53.91 13.392 86.423 13.392 19.033 0 36.691-1.572 53.272-4.365-14.184-28.687-22.353-60.848-22.342-94.977C449.106 533.414 508.679 454.215 591.682 424.451z" p-id="10193" fill="#ff5b57"></path></svg>
-                      <div class="name">现金支付</div>
-                   </div>
-                   <div :class="'pay-item' + (payType == 'BALANCE' ? ' active' : '')" @click="selectPayType('BALANCE')">
-                      <svg t="1656295559018" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6471" width="32" height="32"><path d="M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z m286.4896 668.16a78.2336 78.2336 0 0 1-78.208 78.208H303.1808A78.2336 78.2336 0 0 1 224.9728 668.16V355.3536a78.1312 78.1312 0 0 1 78.1568-78.2336h417.1008a78.2336 78.2336 0 0 1 78.208 78.2336v91.1616h-208.5632a65.2032 65.2032 0 1 0 0 130.4064h208.6144z m-143.36-156.3904a39.1168 39.1168 0 1 1-39.1168-39.0912 39.1168 39.1168 0 0 1 39.0656 39.1936z" fill="#00acac" p-id="6472"></path></svg>
-                      <div class="name">余额支付</div>
-                   </div>
-                  <div :class="'pay-item' + (payType == 'MICROPAY' ? ' active' : '')" @click="selectPayType('MICROPAY')">
-                    <svg t="1649925318920" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2605" width="32" height="32"><path d="M337.387283 341.82659c-17.757225 0-35.514451 11.83815-35.514451 29.595375s17.757225 29.595376 35.514451 29.595376 29.595376-11.83815 29.595376-29.595376c0-18.49711-11.83815-29.595376-29.595376-29.595375zM577.849711 513.479769c-11.83815 0-22.936416 12.578035-22.936416 23.6763 0 12.578035 11.83815 23.676301 22.936416 23.676301 17.757225 0 29.595376-11.83815 29.595376-23.676301s-11.83815-23.676301-29.595376-23.6763zM501.641618 401.017341c17.757225 0 29.595376-12.578035 29.595376-29.595376 0-17.757225-11.83815-29.595376-29.595376-29.595375s-35.514451 11.83815-35.51445 29.595375 17.757225 29.595376 35.51445 29.595376zM706.589595 513.479769c-11.83815 0-22.936416 12.578035-22.936416 23.6763 0 12.578035 11.83815 23.676301 22.936416 23.676301 17.757225 0 29.595376-11.83815 29.595376-23.676301s-11.83815-23.676301-29.595376-23.6763z" fill="#28C445" p-id="2606"></path><path d="M510.520231 2.959538C228.624277 2.959538 0 231.583815 0 513.479769s228.624277 510.520231 510.520231 510.520231 510.520231-228.624277 510.520231-510.520231-228.624277-510.520231-510.520231-510.520231zM413.595376 644.439306c-29.595376 0-53.271676-5.919075-81.387284-12.578034l-81.387283 41.433526 22.936416-71.768786c-58.450867-41.433526-93.965318-95.445087-93.965317-159.815029 0-113.202312 105.803468-201.988439 233.803468-201.98844 114.682081 0 216.046243 71.028902 236.023121 166.473989-7.398844-0.739884-14.797688-1.479769-22.196532-1.479769-110.982659 1.479769-198.289017 85.086705-198.289017 188.67052 0 17.017341 2.959538 33.294798 7.398844 49.572255-7.398844 0.739884-15.537572 1.479769-22.936416 1.479768z m346.265896 82.867052l17.757225 59.190752-63.630058-35.514451c-22.936416 5.919075-46.612717 11.83815-70.289017 11.83815-111.722543 0-199.768786-76.947977-199.768786-172.393063-0.739884-94.705202 87.306358-171.653179 198.289017-171.65318 105.803468 0 199.028902 77.687861 199.028902 172.393064 0 53.271676-34.774566 100.624277-81.387283 136.138728z" fill="#28C445" p-id="2607"></path></svg>
-                    <div class="name">微信支付</div>
-                  </div>
-                  <div :class="'pay-item' + (payType == 'ALISCAN' ? ' active' : '')" @click="selectPayType('ALISCAN')">
-                    <svg t="1681287790288" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2581" width="32" height="32"><path d="M230.404 576.536c-12.087 9.728-25.043 23.93-28.805 41.984-5.12 24.666-1.069 55.541 22.728 79.761 28.828 29.362 72.637 37.398 91.56 38.779 51.4 3.717 106.184-21.772 147.477-50.844 16.184-11.42 43.899-34.349 70.39-69.721-59.37-30.653-133.477-64.557-212.703-61.24-40.47 1.692-69.454 10.084-90.647 21.281z m752.859 135.545C1009.463 650.574 1024 582.968 1024 512 1024 229.688 794.335 0 512 0 229.665 0 0 229.688 0 512c0 282.335 229.665 512 512 512 170.385 0 321.491-83.723 414.631-212.124-87.997-43.742-233.027-115.734-322.36-159.299-42.63 48.596-105.65 97.303-176.84 118.495-44.722 13.29-85.037 18.365-127.199 9.75-41.739-8.548-72.481-28.093-90.401-47.683-9.127-9.995-19.612-22.706-27.203-37.82a71.25 71.25 0 0 0 1.202 3.049s-4.363-7.524-7.702-19.5a85.994 85.994 0 0 1-3.34-18.143 93.517 93.517 0 0 1-0.2-13.045c-0.378-7.702-0.066-15.783 1.67-24.064 4.185-20.235 12.822-43.81 35.172-65.692 49.063-48.039 114.777-50.621 148.814-50.42 50.421 0.289 138.04 22.35 211.812 48.439 20.436-43.52 33.547-90.068 42.007-121.1H305.308v-33.168h157.518v-66.337H272.139v-33.169h190.687v-66.315c0-9.105 1.803-16.584 16.584-16.584h74.619v82.899h207.293v33.169H554.029v66.337h165.82s-16.65 92.828-68.719 184.32c115.557 41.272 278.128 104.849 332.133 126.086z" fill="#1296DB" p-id="2582"></path></svg>
-                    <div class="name">支付宝支付</div>
-                  </div>
-                </div>
-            </div>
-            <div class="main">
-                <div class="title">结算信息</div>
-                <div class="content">
-                    <div class="coupon-info">
-                      <div>可用卡券：<span class="num">({{ memberInfo ? couponList.length : 0 }})</span></div>
-                      <el-form-item class="form-item" prop="couponName">
-                        <el-input class="input-item" style="width: 450px" @focus="selectCoupon()" v-model="couponName" placeholder="请选择卡券" clearable/>
-                      </el-form-item>
-                    </div>
-                    <div class="remark-info">
-                      <div>备注信息：</div>
-                      <el-form-item class="form-item" prop="remark">
-                        <el-input type="textarea" v-model="remark" ref="remark" placeholder="请输入备注信息" clearable/>
-                      </el-form-item>
-                    </div>
-                    <div class="discount-info">
-                      <el-row>
-                        <el-col :span="12">
-                          <div>折扣:（折）</div>
-                          <el-form-item class="form-item" prop="discount">
-                            <el-input type="text" v-model="discountAmount" style="width: 200px" placeholder="请输入折扣" clearable/>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <div>立减:（元）</div>
-                          <el-form-item class="form-item" prop="reduce">
-                            <el-input type="text" v-model="reduceAmount" style="width: 200px" placeholder="请输入立减金额" clearable/>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-                    </div>
-                    <div class="amount-info">
-                       <span class="discount-amount">优惠金额：￥<span class="value">{{ discountPrice.toFixed(2) }}</span></span>
-                       <span class="pay-amount">应付金额：￥<span class="value">{{ newTotalPrice.toFixed(2) }}</span></span>
-                    </div>
-                </div>
-            </div>
-            <div class="right">
-                <div class="title">会员信息</div>
-                <div class="content">
-                  <div class="member-info" v-if="memberInfo">
-                      <img class="avatar" v-if="memberInfo.avatar" :src="memberInfo.avatar"/>
-                      <img class="avatar" v-if="!memberInfo.avatar" src="@/assets/images/avatar.png"/>
-                      <div class="item"><div class="head">名称：</div><div class="value">{{ memberInfo.name }}</div></div>
-                      <div class="item"><div class="head">手机号：</div><div class="value">{{ memberInfo.mobile ? memberInfo.mobile : '暂无' }}</div></div>
-                      <div class="item"><div class="head">会员号：</div><div class="value">{{ memberInfo.userNo ? memberInfo.userNo : '暂无' }}</div></div>
-                      <div class="item"><div class="head">可用余额：</div><div class="value">{{ memberInfo.balance ? memberInfo.balance.toFixed(2) : 0.00 }}（元）</div></div>
-                      <div class="item"><div class="head">可用积分：</div><div class="value">{{ memberInfo.point ? memberInfo.point : '0' }}</div></div>
-                  </div>
-                  <div class="guest" v-if="!memberInfo">
-                       <el-empty description="当前为游客" :image-size="30"></el-empty>
-                       <el-button size="mini" type="danger" icon="el-icon-plus" @click="bindToMember()">关联会员</el-button>
-                  </div>
-                </div>
-            </div>
-          </div>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submit()">确定收款</el-button>
-            <el-button @click="cancel()">取 消</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script>
-export default {
-    props: {
-      showDialog: {
-        type:[Boolean],
-        default:()=>false
-      },
-      memberInfo: {
-        type:[Object],
-        default:()=>{}
-      },
-      orderInfo: {
-        type:[Object],
-        default:()=>{}
-      },
-      couponList: {
-        type:[Array],
-        default:()=> []
-      },
-      totalPrice: {
-        type:[Number],
-        default:()=>'0'
-      },
-      remarks: {
-        type:[String],
-        default:()=>''
-      }
-    },
-    watch: {
-      showDialog(value) {
-         const app = this;
-         if (value) {
-            if (app.orderInfo.id) {
-                app.totalPrice = app.orderInfo.payAmount;
-            }
-            app.discountAmount = '';
-            app.reduceAmount = '';
-            app.myCouponList = [];
-            app.couponName = '';
-            app.userCouponId = 0;
-            app.remark = app.remarks;
-            app.computerPrice(app.discountAmount, app.reduceAmount);
-            if (app.memberInfo) {
-                for (let i = 0, len = app.couponList.length; i < len; i += 2) {
-                     app.myCouponList.push(app.couponList.slice(i, i + 2));
-                }
-            }
-         }
-      },
-      discountAmount(value) {
-        const reg = /^[0-9](.)*$/;
-        if (value < 0 || value > 10 || !reg.test(value)) {
-            this.discountAmount = '';
-            value = '';
-        }
-        this.computerPrice(value, this.reduceAmount);
-      },
-      reduceAmount(value) {
-         const reg = /^[0-9](.)*$/;
-         if (value > this.totalPrice || value < 0 || !reg.test(value)) {
-             this.reduceAmount = '';
-             value = '';
-         }
-         this.computerPrice(this.discountAmount, value);
-      }
-    },
-    data(){
-      return {
-          loading: false,
-          discountPrice: 0,
-          payType: '',
-          userCouponId: 0,
-          couponName: '',
-          remark: '',
-          discountAmount: '',
-          reduceAmount: '',
-          newTotalPrice: 0,
-          showCouponDialog: false,
-          myCouponList: []
-      }
-    },
-    methods: {
-        // 选择支付方式
-        selectPayType(type) {
-          const app = this;
-          if (type == 'BALANCE' && !app.memberInfo) {
-              app.$modal.alert("余额支付需关联会员信息！");
-              return false;
-          }
-          this.payType = type;
-        },
-        // 选择卡券
-        selectCoupon() {
-          const app = this;
-          if (!app.memberInfo) {
-              app.$modal.alert("请先关联会员信息！");
-              app.$refs.remark.focus();
-              return false;
-          } else {
-              app.myCouponList = [];
-              app.couponName = '';
-              app.userCouponId = 0;
-              app.computerPrice(app.discountAmount, app.reduceAmount);
-              if (app.memberInfo) {
-                  for (let i = 0, len = app.couponList.length; i < len; i += 2) {
-                       app.myCouponList.push(app.couponList.slice(i, i + 2));
-                  }
-              }
-              app.showCouponDialog = true;
-          }
-        },
-        // 使用该卡券
-        useThisCoupon(coupon) {
-          const app = this;
-          app.$modal.confirm('确定使用该卡券吗？').then(function() {
-              app.$emit('useThisCoupon', coupon);
-              app.couponName = coupon.name;
-              app.userCouponId = coupon.userCouponId;
-              app.showCouponDialog = false;
-          }).then(() => {
-              // empty
-          }).catch(function() {
-              // empty
-          });
-        },
-        // 提交结算
-        submit() {
-          const app = this;
-          if (app.payType == '') {
-              app.$modal.alert("请先选择支付方式！");
-              return false;
-          }
-          app.$emit('submit', { payType: this.payType, totalPrice: this.newTotalPrice, remark: this.remark, discountPrice: this.discountPrice, userCouponId: app.userCouponId });
-          app.payType = '';
-        },
-        cancel() {
-           this.$emit('closeDialog','settlementDialog');
-           this.payType = '';
-        },
-        computerPrice(discountAmount, reduceAmount) {
-            if (this.orderInfo.id) {
-                this.totalPrice = this.orderInfo.amount;
-            }
-            let discountPrice = 0.0;
-            if (discountAmount.length > 0) {
-                discountPrice = this.totalPrice - (this.totalPrice * (discountAmount / 10));
-            }
-            if (reduceAmount.length > 0) {
-                discountPrice = discountPrice + parseFloat(reduceAmount);
-            }
-            if (isNaN(discountPrice)) {
-                this.discountAmount = '';
-                this.reduceAmount = '';
-                discountPrice = 0;
-            }
-            this.discountPrice = discountPrice;
-            this.newTotalPrice = this.totalPrice - this.discountPrice;
-            if (this.newTotalPrice < 0) {
-                this.newTotalPrice = 0;
-            }
-        },
-        // 关联会员
-        bindToMember() {
-           this.$emit('switchMember');
-        }
-    }
-}
-</script>
-<style lang="scss" scoped>
-   .coupon-list {
-     text-align: center;
-     .none {
-        color: #666666;
-     }
-     .row {
-        height: 80px;
-        margin-bottom: 15px;
-        .item {
-            float: left;
-            width: 45%;
-            margin-left: 10px;
-            height: 83px;
-            border: solid 2px #00acac;
-            cursor: pointer;
-            border-radius: 2px;
-            .left {
-                width: 30%;
-                height: 80px;
-                float: left;
-                background: #00acac;
-                color: #FFFFFF;
-                .amount {
-                   font-size: 24px;
-                   margin-top: 10px;
-                   font-weight: bold;
-                }
-              .tips {
-                 font-size: 12px;
-                 margin-top: 3px;
-              }
-            }
-            .right {
-                width: 70%;
-                float: left;
-                margin-top: 10px;
-                text-align: left;
-                padding-left: 10px;
-                height: 80px;
-                .time {
-                  margin-top: 3px;
-                  font-size: 12px;
-                }
-            }
-        }
-     }
-   }
-   .settlement {
-     border: solid 1px #ccc;
-     border-radius: 2px;
-     min-height: 350px;
-     margin: 0 auto;
-     .left {
-        width: 200px;
-        float: left;
-        height: 350px;
-        padding: 10px;
-        border-right: solid 1px #ccc;
-        .title {
-          margin-bottom: 10px;
-          font-weight: bold;
-        }
-        .pay-item {
-           height: 65px;
-           line-height: 65px;
-           border-radius: 2px;
-           text-align: center;
-           margin-bottom: 10px;
-           border: solid 2px #cccccc;
-           text-align: center;
-           padding-left: 35px;
-           cursor: pointer;
-           .icon {
-             margin-top: 15px;
-             float: left;
-           }
-           .name {
-              margin-left: 2px;
-              font-size: 14px;
-              color: #888888;
-              float: left;
-           }
-        }
-        .active {
-           border: 3px solid #00acac;
-           background: #FDF5E6;
-           color: #FFFFFF;
-        }
-     }
-     .main {
-        float: left;
-        padding: 10px;
-        width: 598px;
-        height: 348px;
-        position: relative;
-        .title {
-          margin-bottom: 10px;
-          font-weight: bold;
-        }
-        .content {
-          width: 100%;
-          .coupon-info {
-             margin-top: 20px;
-             .num {
-                color: #ff5b57;
-                font-weight: bold;
-             }
-          }
-          .discount-info {
-             height: 40px;
-          }
-          .amount-info {
-             text-align: right;
-             position: absolute;
-             width: 580px;
-             bottom: 10px;
-             font-size: 16px;
-             .discount-amount {
-                margin-right: 50px;
-                 .value {
-                   font-size: 20px;
-                 }
-             }
-            .pay-amount {
-                .value {
-                  font-weight: bold;
-                  color: #ff5b57;
-                  font-size: 20px;
-                }
-            }
-          }
-        }
-     }
-     .right {
-       float: right;
-       padding: 10px;
-       width: 200px;
-       height: 350px;
-       border-left: solid 1px #ccc;
-       .title {
-          margin-bottom: 10px;
-          font-weight: bold;
-       }
-       .content {
-          .member-info {
-             .avatar {
-                width: 50px;
-                height: 50px;
-                border-radius: 25px;
-                border: solid 2px #cccccc;
-             }
-             .item {
-                margin-top: 10px;
-                border: dashed 1px #CCCCCC;
-                padding: 5px;
-                .head {
-                   float: left;
-                }
-                .value {
-                   margin-top: 1px;
-                   text-align: left;
-                }
-             }
-          }
-          .guest {
-             text-align: center;
-          }
-       }
-     }
-   }
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/components/switchMemberDialog.vue b/fuintAdmin_zt/src/views/cashier/components/switchMemberDialog.vue
deleted file mode 100644
index 4db799955..000000000
--- a/fuintAdmin_zt/src/views/cashier/components/switchMemberDialog.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-    <el-dialog class="common-dialog" title="关联会员" :visible="showDialog" @close="close" width="750px" destroy-on-close>
-        <el-form ref="form" v-if="!memberInfo.id" class="form" :model="form" label-width="100px">
-            <el-form-item label="会员关键字" class="form-item" prop="keyword">
-              <el-input class="input-item" v-model="form.keyword" v-focus placeholder="请输入会员手机号码、会员名称或扫码会员二维码" clearable maxlength="200" />
-            </el-form-item>
-        </el-form>
-        <div class="member-info" v-if="memberInfo.id">
-            <div class="item">
-              <img class="avatar" v-if="memberInfo.avatar" :src="memberInfo.avatar"/>
-              <img class="avatar" v-if="!memberInfo.avatar" src="@/assets/images/avatar.png"/>
-              <div class="value">会员名称：{{ memberInfo.name }}</div>
-              <div class="value">会员性别：{{ memberInfo.sex == '1' ? '男' : '女' }}</div>
-            </div>
-            <div class="item">
-              <div class="value">手机号码：{{ memberInfo.mobile ? memberInfo.mobile : '暂无' }}</div>
-              <div class="value">会员号码：{{ memberInfo.userNo ? memberInfo.userNo : '暂无' }}</div>
-            </div>
-            <div class="item">
-              <div class="value">可用余额：{{ memberInfo.balance ? memberInfo.balance.toFixed(2) : '0.00' }}（元）</div>
-              <div class="value">可用积分：{{ memberInfo.point ? memberInfo.point : '0' }}</div>
-            </div>
-        </div>
-        <div slot="footer" class="dialog-footer">
-            <el-button v-if="!memberInfo.id" @click="doSubmit()">切换游客</el-button>
-            <el-button type="primary" v-if="!memberInfo.id" @click="doQuery()">查询会员</el-button>
-            <el-button v-if="memberInfo.id" @click="cancel()">重新查询</el-button>
-            <el-button type="danger" v-if="memberInfo.id" @click="doSubmit()">确认会员</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script>
-import { getMemberInfo } from "@/api/cashier";
-export default {
-    props: {
-      showDialog: {
-        type:[Boolean],
-        default:()=>false
-      }
-    },
-    // 自动获取焦点
-    directives: {
-      focus: {
-        inserted: function (el) {
-           el.querySelector('input').focus();
-        }
-      }
-    },
-    watch: {
-      showDialog(value) {
-        if (value) {
-            this.memberInfo = {};
-            this.form.keyword = '';
-        }
-      },
-    },
-    data(){
-        return {
-          loading: false,
-          form: { keyword: '' },
-          memberInfo: {}
-        }
-    },
-    methods: {
-        doQuery() {
-          const app = this;
-          const keyword = this.form.keyword.trim();
-          if (keyword.length > 0) {
-              getMemberInfo( { keyword: this.form.keyword.trim() }).then(response => {
-                if (response.data.memberInfo) {
-                    app.memberInfo = response.data.memberInfo;
-                } else {
-                    app.$modal.alert("未查询到该会员信息，请确认！");
-                    return false;
-                }
-              })
-          } else {
-             app.$modal.alert("请先输入会员关键字！");
-          }
-        },
-        doSubmit() {
-           const app = this;
-           if (app.memberInfo.id) {
-               app.$emit('doSwitchMember', app.memberInfo);
-           } else {
-               app.$emit('doSwitchMember', null);
-           }
-        },
-        cancel() {
-           this.memberInfo = {};
-        },
-        close() {
-           this.$emit('doSwitchMember',0);
-        }
-    }
-}
-</script>
-<style scoped>
-  .form {
-     margin-top: 30px;
-  }
-  .input-item >>> .el-input__inner {
-    border: #00acac solid 2px;
-    line-height: 50px;
-    height: 50px;
-  }
-  .form-item >>> .el-form-item__label {
-    line-height: 50px;
-    height: 50px;
-  }
-  .member-info {
-     border: solid 1px #cccccc;
-     padding: 20px;
-     border-radius: 4px;
-     cursor: pointer;
-  }
-  .member-info .item {
-      height: 20px;
-  }
-  .member-info .item .avatar {
-     height: 60px;
-     width: 60px;
-     border-radius: 30px;
-     border: solid 1px #cccccc;
-     float: left;
-  }
-  .member-info .item .value {
-     float: left;
-     margin-left: 10px;
-     width: 200px;
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/cashier/index.vue b/fuintAdmin_zt/src/views/cashier/index.vue
deleted file mode 100644
index 0fae46088..000000000
--- a/fuintAdmin_zt/src/views/cashier/index.vue
+++ /dev/null
@@ -1,1247 +0,0 @@
-<template>
-   <div id="app" class="app-container">
-     <el-drawer
-       :withHeader="false"
-       :visible.sync="isClose"
-       direction="ttb"
-       size="100%"
-       :show-close="false">
-       <div class="main">
-         <div class="left-side">
-           <div class="logo">
-             <div class="title">收银台</div>
-             <div class="store" v-if="storeInfo">({{ storeInfo.name }})</div>
-             <div class="account">您好，{{ accountInfo.realName }}！</div>
-           </div>
-           <div class="cate">
-             <ul class="nav">
-               <li class="nav-item" v-for="menu in menuList">
-                 <a :class="'nav-link' + (activeMenu == menu.key ? ' active' : '')" href="javascript:;" @click="switchMenu(menu.key)">
-                    <img class="cate-logo" :src="menu.logo">
-                    <span>{{ menu.name }}</span>
-                 </a>
-               </li>
-             </ul>
-             <div class="client">
-                <a target="_blank" href="https://www.fuint.cn/download?v=202307024">下载客户端</a>
-             </div>
-           </div>
-         </div>
-         <div class="main-side">
-            <div class="title">
-              <el-form class="search-form" ref="searchForm" :inline="true" :model="searchForm">
-                <el-form-item class="form-item" label="" prop="keyword">
-                  <el-input v-model="searchForm.keyword" prefix-icon="el-icon-full-screen" class="input-item" placeholder="请输入商品关键字：商品名称、条码、商品ID..." clearable maxlength="100" />
-                </el-form-item>
-                <el-button type="primary" style="height: 50px;" @click="doQueryGoods()" icon="el-icon-search">查询商品</el-button>
-              </el-form>
-              <el-tabs class="tab-box" type="card" v-model="navTab" @tab-click="switchTab">
-                <el-tab-pane label="全部" name="0"></el-tab-pane>
-                <el-tab-pane v-for="tab in tabList" :label="tab.name" :key="tab.id+''" :name="tab.id+''"></el-tab-pane>
-              </el-tabs>
-            </div>
-            <div class="goods-list">
-              <div class="goods-item" v-for="goodsInfo in activeGoodsList">
-                  <div class="item" @click="clickGoods(goodsInfo)">
-                    <img class="image" :src="imagePath + goodsInfo.logo">
-                    <div class="goods-name">{{ goodsInfo.name }}</div>
-                    <div class="goods-price">￥{{ goodsInfo.price }}</div>
-                  </div>
-              </div>
-              <el-empty v-if="activeGoodsList.length == 0" description="暂无商品..."></el-empty>
-            </div>
-         </div>
-         <div class="right-side">
-           <div class="title">
-             <div class="logo">
-               <img class="avatar" v-if="!memberInfo || !memberInfo.avatar" src="@/assets/images/avatar.png" />
-               <img class="avatar" v-else :src="memberInfo.avatar"/>
-             </div>
-              <div class="member-info">
-                  <span class="name" v-if="memberInfo">{{ memberInfo.mobile ? memberInfo.mobile : memberInfo.name }}</span>
-                  <span class="none" v-if="!memberInfo">当前为游客</span>
-                  <el-button size="mini" class="switch" type="danger" icon="el-icon-refresh" @click="switchMember()">关联会员</el-button>
-              </div>
-              <div class="full-screen">
-                  <screenfull id="screenfull" class="icon" />
-              </div>
-           </div>
-           <div class="carts">
-             <el-tabs type="border-card" v-model="activeTab">
-               <el-tab-pane class="tab" label="cart" name="cart">
-                 <div slot="label" class="cart-tab-label"><i class="el-icon-goods"></i>结算商品</div>
-                 <div class="cart-list" v-if="cartList.length > 0">
-                     <div class="cart-item" v-for="cartInfo in cartList">
-                       <img class="image" :src="cartInfo.logo"/>
-                       <div class="info">
-                           <div class="name">{{ cartInfo.name }}</div>
-                           <div class="spec" v-if="cartInfo.specList && cartInfo.specList.length > 0">
-                              <span class="item" v-for="spec in cartInfo.specList" :title="spec.value">{{ spec.value }}</span>
-                           </div>
-                           <div class="num"><el-input-number class="input" @change="changeBuyNum(cartInfo)" v-model="cartInfo.buyNum" :min="1" :max="1000"/></div>
-                       </div>
-                       <div class="option">
-                           <div class="remove el-icon-delete" @click="removeFromCart(cartInfo.cartId)"></div>
-                           <div class="total">￥{{ (cartInfo.price * cartInfo.buyNum).toFixed(2) }}</div>
-                       </div>
-                     </div>
-                 </div>
-                 <div class="empty" v-if="cartList.length < 1">
-                   <el-empty description="暂无结算商品" :image-size="40"></el-empty>
-                 </div>
-               </el-tab-pane>
-               <el-tab-pane class="tab" label="order" name="order">
-                 <div slot="label" class="cart-tab-label" @click="getOrderList()"><i class="el-icon-notebook-2"></i>订单列表</div>
-                 <div class="order-list" v-if="orderList.length > 0">
-                   <div class="order-item" v-for="orderItem in orderList">
-                       <div class="left">
-                         <div class="info">单号：<span class="order-sn">{{ orderItem.orderSn }}</span></div>
-                         <div class="info">金额：<span class="order-price">￥{{ orderItem.amount }}</span></div>
-                         <div class="info" v-if="orderItem.isVisitor == 'N'">会员：<span class="member-info">{{ orderItem.userInfo.name }} {{ orderItem.userInfo.mobile }}</span></div>
-                         <div class="info" v-if="orderItem.isVisitor == 'Y'">会员：<span class="member-info">游客</span></div>
-                         <div class="info">时间：<span class="order-time">{{ orderItem.createTime }}</span></div>
-                       </div>
-                       <div class="right">
-                          <div class="info">
-                            <el-button v-if="orderItem.payStatus== 'B'" type="primary" style="padding:5px;" size="mini">已支付</el-button>
-                            <el-button v-if="orderItem.payStatus== 'A'" @click="doPayOrder(orderItem)" type="danger" style="padding:5px;" size="mini">未支付</el-button>
-                          </div>
-                       </div>
-                   </div>
-                 </div>
-                 <div class="empty" v-if="orderList.length < 1">
-                   <el-empty description="暂无订单" :image-size="40"></el-empty>
-                 </div>
-               </el-tab-pane>
-             </el-tabs>
-           </div>
-           <div class="footer">
-             <div class="number">
-               <div class="total-num">总件数：<b class="num">{{ cartTotalNum }}</b></div>
-               <div class="total-price">总金额：<b class="num">￥{{ cartTotalPrice.toFixed(2) }}</b></div>
-             </div>
-             <div class="options">
-               <div class="cash" @click="hangUp()">挂单 / 取单</div>
-               <div class="submit" v-if="cartTotalNum > 0" @click="doSettlement()">提交结算</div>
-               <div class="submit" v-if="cartTotalNum == 0" @click="doCashier()">无商品收款</div>
-             </div>
-           </div>
-         </div>
-       </div>
-     </el-drawer>
-
-     <!-- 规格详情 start-->
-     <el-dialog title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>
-       <div class="goods-info">
-         <div class="name">{{ goodsInfo.name }}</div>
-         <div class="price">￥{{ goodsInfo.price }}</div>
-         <div class="num"><el-input-number class="input" v-model="goodsNum" :min="1" :max="1000"/></div>
-         <div class="spec-list" v-if="goodsInfo.isSingleSpec == 'N'">
-             <div class="spec-item" v-for="specInfo in goodsInfo.specList">
-                <div class="spec-name">{{ specInfo.name }}</div>
-                <div class="values">
-                  <span v-for="value in specInfo.child" :class="goodsSpecIds.includes(value.id) ? 'value active' : 'value'" @click="selectGoodsSpec(value.id)">{{ value.name }}</span>
-                </div>
-             </div>
-         </div>
-       </div>
-       <div slot="footer" class="dialog-footer">
-         <el-button type="primary" @click="addToCart()">加入结算</el-button>
-         <el-button @click="closeGoodsDialog()">取 消</el-button>
-       </div>
-     </el-dialog>
-     <!-- 规格详情 end-->
-
-     <!--关联会员对话框 start-->
-     <switchMemberDialog :show-dialog="openSwitchMemberDialog" @doSwitchMember="doSwitchMember"/>
-     <!--关联会员对话框 end-->
-
-     <!--结算对话框 start-->
-     <settlementDialog :show-dialog="openSettlementDialog" :memberInfo="memberInfo" :totalPrice="cartTotalPrice" :orderInfo="orderInfo" :couponList="couponList" @submit="submitSettlement" @switchMember="switchMember" @closeDialog="closeDialog"/>
-     <!--结算对话框 end-->
-
-     <!--扫码付款对话框 start-->
-     <scanPayCodeDialog ref="scanPayCodeDialog" :show-dialog="openScanPayCodeDialog" :memberInfo="memberInfo" :orderId="orderId" :payType="payType" :payAmount="payAmount" @closeDialog="closeDialog" @showPayResult="showPayResult"/>
-     <!--扫码付款对话框 end-->
-
-     <!--支付结果对话框 start-->
-     <payResultDialog :show-dialog="openPayResultDialog" :payResult="payResult" @showOrderPrint="showOrderPrint" @closeDialog="closeDialog"/>
-     <!--支付结果对话框 end-->
-
-     <!--打印订单对话框 start-->
-     <orderPrintDialog :show-dialog="openOrderPrintDialog" :storeInfo="storeInfo" :orderInfo="orderInfo" @closeDialog="closeDialog"/>
-     <!--打印订单对话框 end-->
-
-     <!--挂单对话框 start-->
-     <hangUpDialog :show-dialog="openHangUpDialog" :memberInfo="memberInfo" :cartList="cartList" @getHangNo="getHangNo" @doHangUp="doHangUp" @closeDialog="closeDialog"/>
-     <!--挂单对话框 end-->
-
-     <!-- 无商品收款组件 start-->
-     <noGoodsCashier :show-dialog="openNoGoodsCashierDialog" @submit="submitCashier" @closeDialog="closeDialog"></noGoodsCashier>
-     <!-- 无商品收款组件 end-->
-   </div>
-</template>
-
-<script>
-import { init, getGoodsInfo, searchGoods, getCartList, saveCart, removeFromCart, submitSettlement, getOrderList, doPay, getMemberInfoById } from "@/api/cashier";
-import { getOrderInfo } from "@/api/order";
-import { getUserId, setUserId, removeUserId } from '@/utils/auth';
-import switchMemberDialog from "./components/switchMemberDialog";
-import settlementDialog from "./components/settlementDialog";
-import scanPayCodeDialog from "./components/scanPayCodeDialog";
-import payResultDialog from "./components/payResultDialog";
-import orderPrintDialog from "./components/orderPrintDialog";
-import hangUpDialog from "./components/hangUpDialog";
-import Screenfull from '@/components/Screenfull';
-import noGoodsCashier from "./components/noGoodsCashier";
-export default {
-  name: "Cashier",
-  components: {
-    switchMemberDialog,
-    settlementDialog,
-    scanPayCodeDialog,
-    payResultDialog,
-    orderPrintDialog,
-    hangUpDialog,
-    Screenfull,
-    noGoodsCashier
-  },
-  data() {
-    return {
-      // 右侧tab
-      activeTab: 'cart',
-      // 导航tab
-      navTab: '0',
-      isClose: true,
-      openGoodsDialog: false,
-      openSwitchMemberDialog: false,
-      openSettlementDialog: false,
-      openScanPayCodeDialog: false,
-      openPayResultDialog: false,
-      openOrderPrintDialog: false,
-      openHangUpDialog: false,
-      openNoGoodsCashierDialog: false,
-      searchForm: { keyword: '' },
-      payResult: { isSuccess: false, payAmount: 0, orderId: 0 },
-      goodsForm: {},
-      // 左侧菜单
-      menuList: [{ name: '商品列表', key: 'goods', logo: require('../../assets/images/goods.png') },
-                 { name: '订单列表', key: 'order', logo: require('../../assets/images/order.png') },
-                 { name: '卡券核销', key: 'coupon', logo: require('../../assets/images/life.png') },
-                 { name: '会员列表', key: 'member', logo: require('../../assets/images/hot.png') }],
-      // 激活菜单
-      activeMenu: 'goods',
-      // 导航栏tab
-      tabList: [],
-      // 当前操作会员
-      memberInfo: null,
-      // 当前登录用户
-      accountInfo: {},
-      // 当前门店信息
-      storeInfo: {},
-      // 当前操作商品
-      goodsInfo: { num : 1, specList : [], skuList: [] },
-      // 当前选择属性
-      goodsSpecIds: [],
-      // 商品数量
-      goodsNum: 1,
-      // 当前分类
-      cateId: 0,
-      // 图片目录
-      imagePath: '',
-      // 商品分类列表
-      cateList: [],
-      // 商品列表
-      goodsList: [],
-      // 当前分类商品列表
-      activeGoodsList: [],
-      // 购物车列表
-      cartList: [],
-      // 订单列表
-      orderList: [],
-      // 总金额
-      cartTotalPrice: 0,
-      // 购物车备注
-      cartRemark: '',
-      // 总件数
-      cartTotalNum: 0,
-      // 支付金额
-      payAmount: 0,
-      // 当前订单号
-      orderId: 0,
-      // 支付方式
-      payType: '',
-      // 当前订单
-      orderInfo: {},
-      // 可用卡券列表
-      couponList: [],
-      // 挂单序号
-      hangNo: '',
-      isSearch: true
-    };
-  },
-  mounted() {
-    const app = this;
-    // 监听扫码枪按键
-    let code = '';
-    let lastTime, nextTime; // 上次时间、最新时间
-    let lastCode, nextCode; // 上次按键、最新按键
-    document.onkeypress = (e) => {
-      // 获取按键
-      if (window.event) { // IE
-          nextCode = e.keyCode;
-      } else if (e.which) { // Netscape/Firefox/Opera
-          nextCode = e.which;
-      }
-      // 如果触发了回车事件(扫码结束时间)
-      if (nextCode === 13) {
-          if (code.length < 3) {
-              return;
-          }
-          if (app.openScanPayCodeDialog == true) {
-              app.$refs.scanPayCodeDialog.submit(code);
-              return false;
-          }
-          if (app.openSwitchMemberDialog == true) {
-              return false;
-          }
-          if (app.openSettlementDialog == true) {
-              app.$alert("请点击确定收款！");
-              return false;
-          }
-          app.addToCart(code);
-          code = '';
-          lastCode = '';
-          lastTime = '';
-          return true;
-      }
-      nextTime = new Date().getTime(); // 记录最新时间
-      if (!lastTime && !lastCode) { // 如果上次时间和上次按键为空
-          code += e.key; // 执行叠加操作
-      }
-      // 如果有上次时间及上次按键
-      if (lastCode && lastTime && nextTime - lastTime > 30) {
-          code = e.key;
-      } else if (lastCode && lastTime) {
-          code += e.key;
-      }
-      lastCode = nextCode;
-      lastTime = nextTime;
-    }
-  },
-  created() {
-    // 隐藏各路菜单
-    this.$store.state.app.sidebar.hide = true
-    this.initCashier();
-    this.getCartList();
-  },
-  methods: {
-    // 初始化数据
-    initCashier() {
-      const app = this;
-      const userId = getUserId() > 0 ? getUserId() : 0;
-      init(userId).then( response => {
-          app.cateList = response.data.cateList;
-          app.tabList = response.data.cateList;
-          app.goodsList = response.data.goodsList;
-          app.activeGoodsList = this.goodsList;
-          app.imagePath = response.data.imagePath;
-          app.storeInfo = response.data.storeInfo;
-          app.accountInfo = response.data.accountInfo;
-          app.memberInfo = response.data.memberInfo;
-          app.loading = false;
-          app.hangNo = '';
-        }
-      ).catch(() => {
-        // empty
-      });
-    },
-    // 菜单切换
-    switchMenu(menuKey) {
-      this.activeMenu = menuKey;
-      let url = '';
-      if (menuKey == 'coupon') {
-          url = '/coupon/confirm/index';
-      }
-      if (menuKey == 'order') {
-          url = '/order/index';
-      }
-      if (menuKey == 'member') {
-          url = '/member/index';
-      }
-      if (url) {
-          const routeLink = this.$router.resolve({ path: url });
-          window.open(routeLink.href, '_blank');
-      }
-    },
-    // tab切换
-    switchTab(el) {
-      this.navTab = el.name;
-      this.filterCate(this.navTab);
-    },
-    // 过滤分类商品
-    filterCate(cateId) {
-       this.cateId = cateId;
-       const dataList = [];
-       this.goodsList.forEach(function(goods) {
-          if (cateId == goods.cateId && cateId > 0) {
-              dataList.push(goods);
-          } else if (cateId == 0) {
-              dataList.push(goods);
-          }
-       })
-       this.activeGoodsList = dataList;
-    },
-    // 购物车列表
-    getCartList() {
-      const app = this;
-      if (app.loading) {
-          return false;
-      }
-      app.loading = true;
-      app.cartList = [];
-      getCartList({ userId: getUserId(), hangNo: app.hangNo }).then( response => {
-           const cartList = response.data.list;
-           if (cartList && cartList.length > 0) {
-               cartList.forEach(function(item) {
-                  const specList = [];
-                  if (item.specList && item.specList.length > 0) {
-                      item.specList.forEach(function (spec) {
-                        specList.push({name: spec.specName, value: spec.specValue});
-                      })
-                  }
-                  const cartInfo = { cartId: item.id, skuId: item.skuId, goodsId: item.goodsInfo.id, name: item.goodsInfo.name, logo: item.goodsInfo.logo, price: item.goodsInfo.price, buyNum: item.num, specList: specList };
-                  app.cartList.push(cartInfo);
-               })
-           }
-           app.cartTotalPrice = response.data.totalPrice;
-           app.cartTotalNum = response.data.totalNum;
-           app.couponList = response.data.couponList;
-           app.loading = false;
-      }).catch(() => {
-          // empty
-      });
-    },
-    // 查询商品
-    doQueryGoods() {
-      const app = this;
-      if (!app.searchForm.keyword) {
-          app.activeGoodsList = app.goodsList;
-          return false;
-      }
-      app.loading = true;
-      searchGoods({ keyword: app.searchForm.keyword }).then( response => {
-         app.loading = false;
-         if (response.data && response.data.length > 0) {
-             app.activeGoodsList = response.data;
-         } else {
-             app.$modal.alert("抱歉，未查询到商品信息！");
-             return false;
-         }
-      }).catch(() => {
-         // empty
-      });
-    },
-    // 点击商品规格弹框
-    clickGoods(goodsInfo) {
-      const app = this;
-      if (app.loading) {
-          return false;
-      }
-      app.loading = true;
-      getGoodsInfo(goodsInfo.id).then( response => {
-          app.goodsInfo = response.data.goodsInfo;
-          app.goodsInfo.specList = response.data.specList;
-          app.goodsInfo.skuList = response.data.skuList;
-          app.goodsNum = 1;
-          app.loading = false;
-          if (app.goodsInfo.isSingleSpec == 'N') {
-              app.openGoodsDialog = true;
-          } else {
-              app.addToCart(false);
-          }
-      }).catch(() => {
-          // empty
-      });
-    },
-    // 关闭规格弹框
-    closeGoodsDialog() {
-       this.openGoodsDialog = false;
-    },
-    // 选择商品属性
-    selectGoodsSpec(specId) {
-       const app = this;
-       let specIds = [];
-       app.goodsInfo.specList.forEach(function() {
-          specIds.push(0);
-       })
-       app.goodsInfo.specList.forEach(function(specItem, index) {
-          const children = [];
-          specItem.child.forEach(function(child) {
-              children.push(child.id)
-          })
-          if (children.includes(specId)) {
-              specIds[index] = specId
-          } else {
-              specIds[index] = app.goodsSpecIds[index] == undefined ? 0 : app.goodsSpecIds[index];
-          }
-       })
-       app.goodsSpecIds = specIds;
-    },
-    // 加入购物车
-    addToCart(skuNo) {
-      const app = this;
-      app.isSearch = false;
-      // 扫码枪扫描商品条码，直接加入购物车
-      if (skuNo) {
-          searchGoods({ keyword: skuNo }).then( response => {
-            app.loading = false;
-            if (response.data && response.data.length == 1) {
-                app.clickGoods(response.data[0]);
-                app.isSearch = true;
-            } else {
-                app.$modal.alert("抱歉，未查询到商品信息！");
-                return false;
-            }
-          }).catch(() => {
-             //empty
-          });
-      }
-      if (app.loading || app.isSearch || !app.goodsInfo.id || app.goodsNum <= 0) {
-          return false;
-      }
-      const specIds = app.goodsSpecIds.join('-');
-      let skuId = 0;
-      app.goodsInfo.skuList.forEach(function(skuInfo) {
-         if (skuInfo.specIds == specIds) {
-             skuId = skuInfo.id;
-         }
-      })
-      if (app.goodsInfo.isSingleSpec == 'N' && skuId <= 0) {
-          app.$modal.alert("请先确认商品规格！");
-          return false;
-      }
-      // 添加到购物车
-      const cartInfo = { goodsId: app.goodsInfo.id,
-                         name: app.goodsInfo.name,
-                         logo: app.goodsInfo.logo,
-                         price: app.goodsInfo.price,
-                         skuId: skuId,
-                         userId: getUserId(),
-                         hangNo: app.hangNo,
-                         buyNum: app.goodsNum };
-      app.loading = true;
-      saveCart(cartInfo).then(response => {
-          if (response.data.cartId) {
-              app.loading = false;
-              app.activeTab = 'cart';
-              app.getCartList();
-              app.openGoodsDialog = false;
-              app.goodsSpecIds = [];
-              app.goodsNum = 0;
-          }
-      }).catch(() => {
-         // empty
-      });
-    },
-    // 删除购物车
-    removeFromCart(cartId) {
-      const app = this;
-      removeFromCart({ cartId: [cartId], userId: getUserId() }).then(response => {
-        if (response.data) {
-            app.getCartList();
-        }
-      }).catch(() => {
-         // empty
-      });
-    },
-    // 购物车数量变化
-    changeBuyNum(cartInfo) {
-      const app = this;
-      const param = { goodsId: cartInfo.goodsId,
-                      skuId: cartInfo.skuId,
-                      cartId: cartInfo.cartId,
-                      action: '=',
-                      userId: app.memberInfo ? app.memberInfo.id : null,
-                      hangNo: app.hangNo,
-                      buyNum: cartInfo.buyNum };
-      saveCart(param).then(response => {
-        if (response.data.cartId) {
-            app.getCartList();
-            app.openGoodsDialog = false;
-            app.goodsSpecIds = [];
-        }
-      }).catch(() => {
-         // empty
-      });
-    },
-    // 弹出关联会员
-    switchMember() {
-       this.openSwitchMemberDialog = true;
-    },
-    // 确认关联会员
-    doSwitchMember(memberInfo) {
-       this.openSwitchMemberDialog = false;
-       if (memberInfo != 0) {
-           this.memberInfo = memberInfo;
-           if (memberInfo) {
-               setUserId(memberInfo.id);
-           } else {
-               removeUserId();
-           }
-           this.getCartList();
-       }
-    },
-    // 无商品结算
-    doCashier() {
-      this.orderInfo = {};
-      this.openNoGoodsCashierDialog = true;
-    },
-    submitCashier(param) {
-      this.orderInfo = {};
-      this.openSettlementDialog = true;
-      this.cartTotalPrice = parseFloat(param.amount);
-      this.cartRemark = param.remark;
-      this.openNoGoodsCashierDialog = false;
-    },
-    // 发起结算
-    doSettlement() {
-       if (this.cartList.length < 1) {
-           this.$modal.alert("请先添加结算商品！");
-           return false;
-       }
-       this.getCartList();
-       this.orderInfo = {};
-       this.openSettlementDialog = true;
-    },
-    // 确认结算
-    submitSettlement(param) {
-      const app = this;
-      // 已生成的订单支付
-      if (app.orderInfo.id) {
-          // 微信、支付宝支付
-          if (param.payType == 'MICROPAY' || param.payType == 'ALISCAN') {
-              app.payAmount = app.orderInfo.payAmount;
-              app.orderId = app.orderInfo.id;
-              app.openScanPayCodeDialog = true;
-              app.openSettlementDialog = false;
-              app.payType = param.payType;
-          }
-          // 现金、余额支付
-          if (param.payType == 'CASH' || param.payType == 'BALANCE') {
-              doPay({ orderId: app.orderId, payType: param.payType, cashierPayAmount: param.totalPrice, cashierDiscountAmount: param.discountPrice, userId: getUserId() }).then( response => {
-                  app.openSettlementDialog = false;
-                  if (response.data.orderInfo.payStatus == 'B') {
-                      app.showPayResult({ isSuccess: true, payAmount: response.data.orderInfo.payAmount, orderId: response.data.orderInfo.id });
-                  } else {
-                      app.$modal.alert(response.data.message ? response.data.message : "抱歉，订单操作异常！");
-                  }
-              }).catch(() => {
-                // empty
-              });
-          }
-          return false;
-      }
-      // 购物车提交结算
-      let cartIds = [];
-      app.cartList.forEach(function(cart){
-          cartIds.push(cart.cartId);
-      })
-      const data = { cashierPayAmount: param.totalPrice,
-                     cashierDiscountAmount: param.discountPrice,
-                     cartIds: cartIds.join(','),
-                     orderMode: 'oneself',
-                     payType: param.payType,
-                     remark: param.remark,
-                     type: app.cartList.length > 0 ? 'goods' : 'payment',
-                     couponId: param.userCouponId ? param.userCouponId : 0,
-                     userId: getUserId() };
-      submitSettlement(data).then( response => {
-          app.initCashier();
-          app.getCartList();
-          // 微信支付，弹出扫码框
-          if (response.data.orderInfo.payType == 'MICROPAY' || param.payType == 'ALISCAN') {
-             app.payAmount = response.data.orderInfo.payAmount;
-             app.orderId = response.data.orderInfo.id;
-             app.openScanPayCodeDialog = true;
-             app.openSettlementDialog = false;
-             app.payType = param.payType;
-             return false;
-          }
-          // 现金、余额支付
-          if (response.data.orderInfo.payType == 'CASH' || response.data.orderInfo.payType == 'BALANCE') {
-              app.openSettlementDialog = false;
-              if (response.data.orderInfo.payStatus == 'B') {
-                  app.showPayResult({ isSuccess: true, payAmount: response.data.orderInfo.payAmount, orderId: response.data.orderInfo.id });
-              } else {
-                  app.$modal.alert(response.data.message);
-              }
-              return false;
-          }
-      }).catch(() => {
-         // empty
-      });
-    },
-    // 点击挂单/取单
-    hangUp() {
-       this.openHangUpDialog = true;
-    },
-    // 取单
-    getHangNo(data) {
-       this.openHangUpDialog = false;
-       this.hangNo = data.hangNo;
-       this.getCartList();
-       // 关联会员信息
-       if (data.hangNo && data.hangNo.length > 0 ) {
-           this.doSwitchMember(data.memberInfo);
-       }
-    },
-    // 执行挂单
-    doHangUp() {
-      this.hangNo = '';
-      this.getCartList();
-      removeUserId();
-      this.memberInfo = null;
-    },
-    // 关闭对话框
-    closeDialog(dialog) {
-       if (dialog == 'settlementDialog') {
-           this.openSettlementDialog = false;
-       } else if (dialog == 'switchMemberDialog') {
-           this.openSwitchMemberDialog = false;
-       } else if (dialog == 'scanPayCodeDialog') {
-           this.openScanPayCodeDialog = false;
-       } else if (dialog == 'payResultDialog') {
-           this.openPayResultDialog = false;
-           this.getOrderList();
-       } else if (dialog == 'printOrder') {
-           this.openOrderPrintDialog = false;
-           this.getOrderList();
-       } else if (dialog == 'hangUpDialog') {
-           this.openHangUpDialog = false;
-       } else if (dialog == 'openNoGoodsCashierDialog') {
-           this.openNoGoodsCashierDialog = false;
-       }
-    },
-    // 展示支付结果
-    showPayResult(payResult) {
-       this.payResult = payResult;
-       this.openPayResultDialog = true;
-    },
-    // 订单列表
-    getOrderList() {
-      const app = this;
-      if (app.loading) {
-          return false;
-      }
-      app.loading = true;
-      getOrderList({ page: 1, pageSize: 20 }).then(response => {
-          app.loading = false;
-          if (response.data) {
-              app.orderList = response.data.content;
-          }
-      })
-    },
-    // 订单支付
-    doPayOrder(orderInfo) {
-       const app = this;
-       app.payAmount = orderInfo.amount;
-       app.orderId = orderInfo.id;
-       app.orderInfo = orderInfo;
-       let userId = 0
-       if (orderInfo.isVisitor !== "Y") {
-           userId = app.orderInfo.userInfo.id;
-       }
-       getMemberInfoById(userId).then(response => {
-          if (response.data.memberInfo) {
-              app.memberInfo = response.data.memberInfo;
-          } else {
-              app.memberInfo = null;
-          }
-       }).catch(() => {
-          // empty
-       });
-       app.openSettlementDialog = true;
-    },
-    // 打印小票
-    showOrderPrint(orderId) {
-      const app = this;
-      getOrderInfo(orderId).then(response => {
-        if (response.data.orderInfo) {
-            app.orderInfo = response.data.orderInfo;
-            app.openOrderPrintDialog = true;
-        }
-      }).catch(() => {
-         // empty
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-   .main {
-     height: 100%;
-     width: 100%;
-     display: flex;
-     flex-direction: row;
-     .left-side {
-        width: 160px;
-        height: 100%;
-        background: #00acac;
-        border-right: #888888 solid 2px;
-        position: absolute;
-        left: 0;
-        top: 0;
-        padding: 0px;
-        color: #FFFFFF;
-        overflow-x: hidden;
-        overflow-y: auto;
-        display: block;
-        text-align: center;
-       .client {
-         margin-top: 20px;
-         text-align: center;
-         font-size: 12px;
-         color: #ffffff;
-         font-weight: bold;
-       }
-       .logo {
-         height: 70px;
-         padding: 20px 12px 20px 12px;
-         font-weight: bold;
-         .store {
-           font-size: 12px;
-         }
-         .account {
-           font-size: 12px;
-           border: solid 2px #FFFFFF;
-           background: #6c757d;
-           cursor: pointer;
-           margin-top: 6px;
-           padding: 2px;
-           border-radius: 2px;
-         }
-       }
-       .cate {
-         text-align: center;
-         margin-left: 14px;
-         margin-top: 40px;
-         .nav {
-            list-style: none;
-            display: block;
-            margin: 0px;
-            padding: 5px;
-            text-align: center;
-            .nav-item {
-                margin-top: 10px;
-                font-size: 14px;
-                width: 120px;
-                text-align: center;
-               .nav-link {
-                 position: relative;
-                 padding: .5356875rem .9375rem;
-                 white-space: nowrap;
-                 text-align: center;
-                 font-weight: 600;
-                 color: #666666;
-                 display: flex;
-                 align-items: center;
-                 flex-direction: column;
-                 justify-content: center;
-                 border-radius: 5px;
-                 transition: color .2s linear;
-                 background: #f5f5f5;
-                 border: 2px solid #FFFFFF;
-                 .cate-logo {
-                   display: block;
-                   width: 50px;
-                   height: 50px;
-                 }
-               }
-               .active {
-                 font-weight: bold;
-                 border: 4px #ff5b57 solid;
-               }
-            }
-         }
-       }
-     }
-     .right-side {
-        width: 310px;
-        height: 100%;
-        background: #FFFFFF;
-        display: block;
-        position: absolute;
-        right: 0;
-        top: 0;
-        overflow-x: hidden;
-        overflow-y: auto;
-        padding: 0px;
-        border-left: #cccccc solid 1px;
-        .title {
-          height: 70px;
-          width: 100%;
-          background: #6c757d;
-          border-bottom: #CCCCCC 2px solid;
-          color: #FFFFFF;
-          padding-top: 20px;
-          padding-left: 1px;
-          display: block;
-          position: fixed;
-          top: 0;
-          z-index: 999;
-          clear: both;
-          .logo {
-            float: left;
-            font-size: 24px;
-            .avatar {
-               width: 30px;
-               height: 30px;
-               border-radius: 40px;
-               margin: 5px 0px 5px 5px;
-            }
-          }
-          .member-info {
-            float: left;
-            margin-top: 5px;
-            .name {
-              margin-left: 2px;
-              margin-right: 3px;
-            }
-            .none {
-               margin-left: 2px;
-               margin-right: 5px;
-               font-size: 13px;
-            }
-            .switch {
-              padding: 8px 8px 8px 4px;
-            }
-          }
-          .full-screen {
-             background: #00acac;
-             border: solid 1px #ffffff;
-             width: 30px;
-             height: 30px;
-             line-height: 30px;
-             text-align: center;
-             margin-left: 270px;
-             overflow: hidden;
-             margin-top: 5px;
-             cursor: pointer;
-          }
-        }
-       .carts {
-          display: block;
-          width: 100%;
-          color: #666666;
-          margin-bottom: 120px;
-          margin-top: 70px;
-          padding: 0px;
-          .cart-tab-label {
-             width: 105px;
-             text-align: center;
-          }
-          .tab {
-            width: 50%;
-            .cart-list {
-              margin-bottom: 60px;
-              .cart-item {
-                border-bottom: 1px dashed #cccccc;
-                height: 110px;
-                width: 310px;
-                padding-top: 5px;
-                padding-right: 10px;
-                .image {
-                   width: 50px;
-                   height: 50px;
-                   margin-left: 5px;
-                   border-radius: 5px;
-                   border: solid 1px #ccc;
-                   float: left;
-                   margin-top: 20px;
-                }
-                .info {
-                   float: left;
-                   padding-left: 5px;
-                   margin-top: 8px;
-                   .name {
-                     font-weight: bold;
-                     font-size: 12px;
-                     width: 150px;
-                     overflow: hidden;
-                     display: -webkit-box;
-                     -webkit-box-orient: vertical;
-                     -webkit-line-clamp: 2;
-                   }
-                   .spec {
-                     font-size: 12px;
-                     width: 160px;
-                     height: 20px;
-                     .item {
-                        margin-right: 2px;
-                        border-radius: 10px;
-                        padding: 0px 2px 0px 2px;
-                        text-align: center;
-                        max-width: 50px;
-                        height: 20px;
-                        line-height: 20px;
-                        float: left;
-                        display: block;
-                        overflow: hidden;
-                        color: #606266;
-                        cursor: pointer;
-                        background: #cceeee;
-                        padding: 0px 3px 0px 3px;
-                        white-space: nowrap;
-                        text-overflow: ellipsis;
-                     }
-                   }
-                   .input {
-                     width: 120px;
-                     margin-top: 2px;
-                   }
-                }
-                .option {
-                   float: right;
-                   text-align: right;
-                   margin-right: 10px;
-                   .remove {
-                      font-size: 12px;
-                      cursor: pointer;
-                   }
-                   .total {
-                     margin-top: 10px;
-                     font-size: 16px;
-                     color: #ff5b57;
-                   }
-                }
-              }
-            }
-            .order-list {
-               margin-bottom: 60px;
-               .order-item {
-                 width: 310px;
-                 height: 100px;
-                 padding: 10px;
-                 border-bottom: 1px dashed #cccccc;
-                 margin-bottom: 5px;
-                 .left {
-                    float: left;
-                    font-size: 14px;
-                    .info {
-                      .order-price {
-                        font-weight: normal;
-                        color: #ff5b57;
-                      }
-                    }
-                 }
-                 .right {
-                   float: right;
-                   margin-top: 30px;
-                   margin-right: 10px;
-                 }
-               }
-            }
-            .empty {
-              width: 300px;
-            }
-          }
-       }
-       .footer {
-          position: fixed;
-          z-index: 999;
-          background: #6c757d;
-          bottom: 0;
-          height: 120px;
-          width: 100%;
-          padding-top: 5px;
-          padding-right: 15px;
-          color: #FFFFFF;
-          display: block;
-          width: 310px;
-          border-top: solid 1px #cccccc;
-          .number {
-            float: right;
-            margin: 5px;
-            .total-price {
-               margin-top: 3px;
-               .num {
-                 color: #ff5b57;
-                 font-size: 20px;
-               }
-            }
-          }
-          .options {
-             text-align: center;
-             cursor: pointer;
-             float: right;
-             color: #FFFFFF;
-            .cash {
-              float: left;
-              height: 50px;
-              border: solid 1px #00acac;
-              line-height: 50px;
-              width: 135px;
-              border-radius: 5px;
-              background: #00acac;
-              font-weight: bold;
-            }
-            .submit {
-               float: left;
-               height: 50px;
-               border: solid 1px #ff5b57;
-               margin-left: 10px;
-               line-height: 50px;
-               width: 135px;
-               border-radius: 5px;
-               background: #ff5b57;
-               font-weight: bold;
-            }
-          }
-       }
-     }
-     .main-side {
-       height: 100%;
-       width: 100%;
-       min-width: 760px;
-       margin-left: 160px;
-       margin-right: 320px;
-       overflow: auto;
-       display: block;
-       background: #FFFFFF;
-       margin-bottom: 10px;
-       .title {
-         position: fixed;
-         height: 106px;
-         width: calc(100% - 465px);
-         min-width: 700px;
-         background: #ffffff;
-         padding: 5px;
-         border-top: #CCCCCC 2px solid;
-         color: #FFFFFF;
-         top: 0;
-         .search-form {
-            height: 50px;
-            .input-item {
-              min-width: 456px;
-            }
-         }
-         .tab-box {
-            margin-top: 3px;
-            width: 100%;
-         }
-       }
-       .goods-list {
-         height: 100%;
-         width: 100%;
-         margin-top: 108px;
-         margin-left: 2px;
-         margin-bottom: 10px;
-         .goods-item {
-           width: 33%;
-           min-height: 320px;
-           min-width: 240px;
-           padding: 3px;
-           float: left;
-           background: #ffffff;
-           text-align: left;
-           cursor: pointer;
-           .item {
-              background: #FFFFFF;
-              padding: 10px;
-              border-radius: 5px;
-              margin: 0px;
-              border: solid 1px #cccccc;
-             .goods-name {
-               margin-top: 10px;
-               font-size: 18px;
-               color: #666666;
-               height: 30px;
-               overflow: hidden;
-               white-space: nowrap;
-               text-overflow: ellipsis;
-             }
-             .goods-price {
-               color: #ff5b57;
-               font-size: 18px;
-               font-weight: bold;
-             }
-             .image {
-               width: 100%;
-               height: 220px;
-               border-radius: 3px;
-             }
-           }
-         }
-       }
-     }
-   }
-   .goods-info {
-     border: solid 1px #ccc;
-     padding: 30px;
-     border-radius: 5px;
-     .name {
-        height: 40px;
-        font-weight: bold;
-        font-size: 20px;
-     }
-     .price {
-       height: 40px;
-       color: #ff5b57;
-       font-size: 16px;
-     }
-     .spec-list {
-        border: solid 1px #ccc;
-        padding: 20px;
-        margin-top: 10px;
-        border-radius: 6px;
-        .spec-item {
-           margin-bottom: 20px;
-          .spec-name {
-             font-weight: bold;
-             font-size: 16px;
-          }
-          .values {
-             display: block;
-             padding-top: 10px;
-             margin-left: 0px;
-             padding-left: 0px;
-             font-size: 12px;
-             .value {
-               border: solid 1px #cceeee;
-               margin-right: 10px;
-               padding: 8px 15px 5px 15px;
-               cursor: pointer;
-               border-radius: 4px;
-               background: rgba(0, 172, 172, 0.1);
-               color: #666666;
-             }
-             .active {
-               border: solid 1px #ff5891;
-               background: #ff5b57;
-               color: #FFFFFF;
-             }
-          }
-        }
-     }
-   }
-</style>
-<style scoped>
-  .input-item >>> .el-input__inner {
-    border: #00acac solid 2px;
-    line-height: 50px;
-    height: 50px;
-  }
-  .form-item >>> .el-form-item__label {
-    line-height: 50px;
-    height: 50px;
-  }
-  .el-tabs--border-card {
-    box-shadow: none;
-    border: none;
-  }
-  ::v-deep .el-tabs--border-card > .el-tabs__content {
-    padding: 0px;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/commission/cash/detail.vue b/fuintAdmin_zt/src/views/commission/cash/detail.vue
deleted file mode 100644
index cd1c775de..000000000
--- a/fuintAdmin_zt/src/views/commission/cash/detail.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-  <el-dialog class="common-dialog" title="提成明细" :visible="showDialog" width="1200px" @close="cancel" destroy-on-close>
-    <el-table :data="tableData" :summary-method="getSummaries" show-summary border size="medium" style="width: 100%">
-      <el-table-column prop="orderId" label="来源订单">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            style="color: #3594e3;font-size: 14px;"
-            v-hasPermi="['order:index']"
-            @click="handleView(scope.row.orderId)"
-          >订单
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column prop="staffName" label="员工姓名" width="77"></el-table-column>
-      <el-table-column prop="storeName" min-width="136" :show-overflow-tooltip="true" label="开单门店"></el-table-column>
-      <el-table-column prop="orderDate" label="开单日期" width="116"></el-table-column>
-      <el-table-column prop="goodName" label="商品名称" min-width="136" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="goodPrice" label="商品价格">
-        <template slot-scope="scope">
-          {{scope.row.goodPrice}} 元
-        </template>
-      </el-table-column>
-      <el-table-column prop="goodNum" label="商品数量" width="77"></el-table-column>
-      <el-table-column prop="priceType" label="价格类型">原价</el-table-column>
-      <el-table-column prop="tcWay" label="提成方式">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tcWay=='1'">比率提成</span>
-          <span v-if="scope.row.tcWay=='2'">固定提成</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="visitorVal" label="散客（首充）" width="106">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tcWay=='1'">{{scope.row.visitorVal}} %</span>
-          <span v-if="scope.row.tcWay=='2'">{{scope.row.visitorVal}} 元</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="memberVal" label="会员（续充）" width="106">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tcWay=='1'">{{scope.row.memberVal}} %</span>
-          <span v-if="scope.row.tcWay=='2'">{{scope.row.memberVal}} 元</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品分类" width="77">
-        <template slot-scope="scope">
-          <span v-if="scope.row.comType=='1'">项目</span>
-          <span v-if="scope.row.comType=='2'">商品</span>
-          <span v-if="scope.row.comType=='4'">次卡</span>
-          <span v-if="scope.row.comType=='5'">储值卡</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="comType" label="提成类型" :formatter="dataFormat"></el-table-column>
-      <el-table-column prop="commission" label="提成金额">
-        <template slot-scope="scope">
-          {{scope.row.commission}} 元
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-pagination
-      style="margin-top: 5px;text-align: right"
-      background
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-      :page-sizes="[10, 20, 40, 60, 80, 100, 1000, 10000, 100000]"
-      :page-size="pageSize"
-      :current-page="currentPage"
-      @current-change="handleCurrentChange"
-      @size-change="handleSizeChange"
-    ></el-pagination>
-  </el-dialog>
-</template>
-<script>
-  import {getStaffStatisticsDetail} from "@/api/commission/log";
-
-  export default {
-    props: {
-      orderInfo: {
-        type: [Object],
-        default: () => {
-        }
-      }
-    },
-    data() {
-      return {
-        showDialog: false,
-        tableData: [],
-        currentPage: 1, // 初始页
-        pageSize: 10, // 每页的数据
-        total: 0,
-        realName: '',
-        mobile: '',
-        storeId: '',
-        staffId: '',
-        startDate: null,
-        endDate: null
-      }
-    },
-    methods: {
-      init(params) {
-
-        this.realName = params.realName;
-        this.mobile = params.mobile;
-        this.storeId = params.storeId;
-        this.staffId = params.staffId;
-        this.startDate = params.startDate;
-        this.endDate = params.endDate;
-
-        this.showDialog = true;
-        this.handleCurrentChange(1);
-      },
-      // 订单详情
-      handleView(orderId) {
-        this.$router.push({path: '/order/detail?orderId=' + orderId})
-      },
-      handleCurrentChange(page) {
-        let params = {
-          page: page,
-          limit: this.pageSize,
-          realName: this.realName,
-          mobile: this.mobile,
-          storeId: this.storeId,
-          staffId: this.staffId,
-          startDate: this.startDate,
-          endDate: this.endDate
-        }
-        getStaffStatisticsDetail(params).then(r => {
-            this.tableData = r.data.rows;
-            this.total = r.data.total;
-          }
-        );
-      },
-      handleSizeChange(val) {
-        this.pageSize = val;
-        this.handleCurrentChange(1);
-      },
-      getSummaries(param) {
-        const {columns, data} = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '总计';
-            return;
-          }
-          if (index < 13) {
-            sums[index] = '--';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' 元';
-          } else {
-            sums[index] = 'N/A';
-          }
-        });
-        return sums;
-      },
-      dataFormat: function (row, column) {
-        //商品分类=提成类型：1：项目=劳动提成:2：卡项=销售提成:3：商品=销售提成
-        let val = row[column.property];
-        if (val == '1') {
-          return '劳动提成'
-        }
-        if (val == '3') {
-          return '销售提成'
-        }
-        if (val == '4') {
-          return '销售提成'
-        }
-        if (val == '5') {
-          return '销售提成'
-        }
-        return val;
-      },
-      cancel() {
-        this.showDialog = false;
-      }
-    }
-  }
-</script>
-<style scoped lang="scss">
-  .print-area {
-    font-size: 14px;
-    border: solid 1px #ccc;
-    padding: 10px;
-
-    .store {
-      font-weight: bold;
-      margin-bottom: 20px;
-    }
-
-    .goods-list {
-      margin-bottom: 20px;
-
-      .goods-item {
-        margin-bottom: 2px;
-      }
-    }
-
-    .member-info {
-      margin-bottom: 20px;
-    }
-
-    .total-info {
-      .item {
-        margin-bottom: 2px;
-      }
-    }
-  }
-</style>
-<style media="print" lang="scss">
-  @page {
-    size: auto;
-    margin: 0mm;
-  }
-
-  @media print {
-    html {
-      height: auto;
-      margin: 0px;
-    }
-    body {
-      border: solid 1px #ffffff;
-    }
-    #printArea {
-      font-size: 12px;
-      display: block;
-      min-height: 400px;
-
-      .store {
-        margin-bottom: 30px;
-        font-weight: bold;
-      }
-
-      .goods-list {
-        margin-bottom: 30px;
-
-        .goods-item {
-          margin-bottom: 15px;
-
-          .item {
-            margin-right: 10px;
-          }
-        }
-      }
-
-      .member-info {
-        margin-top: 20px;
-        margin-bottom: 20px;
-
-        .item {
-          margin-bottom: 2px;
-        }
-      }
-
-      .total-info {
-        margin-top: 20px;
-        margin-bottom: 20px;
-
-        .item {
-          margin-bottom: 2px;
-        }
-      }
-    }
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/commission/cash/index.vue b/fuintAdmin_zt/src/views/commission/cash/index.vue
deleted file mode 100644
index 696139d31..000000000
--- a/fuintAdmin_zt/src/views/commission/cash/index.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <el-form size="small" :inline="true" label-width="68px">
-      <el-form-item label="所属店铺" prop="storeId">
-        <el-select v-model="storeId" filterable clearable placeholder="请选择店铺" style="width: 100%;">
-          <el-option
-            v-for="item in storeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="姓名">
-        <el-input
-          v-model="realName"
-          placeholder="请输入姓名"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号">
-        <el-input
-          v-model="mobile"
-          placeholder="请输入手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始日期">
-        <el-date-picker
-          v-model="startDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束日期">
-        <el-date-picker
-          v-model="endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择结束日期">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table :data="tableData" :summary-method="getSummaries" show-summary border size="medium" style="width: 100%">
-      <el-table-column prop="staffName" label="员工姓名" width="77"></el-table-column>
-      <el-table-column prop="storeName" min-width="136" :show-overflow-tooltip="true" label="辖属门店"></el-table-column>
-      <el-table-column prop="orderDate" label="开单日期">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" style="color: #3594e3;font-size: 14px;" @click="handleDetail(scope.row.staffId, scope.row.orderDate)">
-            {{scope.row.orderDate}}
-          </el-button>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="提成金额">
-        <el-table-column prop="xmCount" label="项目">
-          <template slot-scope="scope">
-            ￥ {{scope.row.xmCount}} 元
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="spCount" label="商品">
-          <template slot-scope="scope">
-            ￥ {{scope.row.spCount}} 元
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="ckCount" label="次卡">
-          <template slot-scope="scope">
-            ￥ {{scope.row.ckCount}} 元
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="czCount" label="储值卡">
-          <template slot-scope="scope">
-            ￥ {{scope.row.czCount}} 元
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="commission" label="总计">
-          <template slot-scope="scope">
-            {{scope.row.commission}} 元
-          </template>
-        </el-table-column>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      style="margin-top: 5px;text-align: right"
-      background
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-      :page-sizes="[10, 20, 40, 60, 80, 100, 1000, 10000, 100000]"
-      :page-size="pageSize"
-      :current-page="currentPage"
-      @current-change="handleCurrentChange"
-      @size-change="handleSizeChange"
-    ></el-pagination>
-
-    <!--统计详情对话框 start-->
-    <detail :show-dialog="detailDialog" ref="detail"/>
-    <!--统计详情对话框 end-->
-
-  </div>
-</template>
-<script>
-  import {getStaffStatistics} from "@/api/commission/log";
-  import {searchStore} from "@/api/store";
-  import Detail from "./detail";
-
-  export default {
-    name: 'busStatList',
-    components: {
-      Detail
-    },
-    data() {
-      return {
-        currentPage: 1, //初始页
-        pageSize: 10, //每页的数据
-        total: 0,
-        tableData: [],
-        storeOptions: [],
-        realName: '',
-        mobile: '',
-        storeId: '',
-        startDate: null,
-        endDate: null,
-        openStaffScheme: false,
-        detailDialog: false
-      }
-    },
-    methods: {
-      handleCurrentChange(page) {
-        let params = {
-          page: page,
-          limit: this.pageSize,
-          realName: this.realName,
-          mobile: this.mobile,
-          storeId: this.storeId,
-          startDate: this.startDate,
-          endDate: this.endDate
-        }
-        getStaffStatistics(params).then(r => {
-            this.tableData = r.data.rows;
-            this.total = r.data.total;
-          }
-        );
-      },
-      getSummaries(param) {
-        const {columns, data} = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '总计';
-            return;
-          }
-          if (index < 3) {
-            sums[index] = '--';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' 元';
-          } else {
-            sums[index] = 'N/A';
-          }
-        });
-        return sums;
-      },
-      handleSizeChange(val) {
-        this.pageSize = val;
-        this.handleCurrentChange(1);
-      },
-      handleDetail(staffId,orderDate) {
-        this.detailDialog = true;
-        let params = {
-          realName: this.realName,
-          mobile: this.mobile,
-          storeId: this.storeId,
-          staffId: staffId,
-          startDate: orderDate,
-          endDate: orderDate
-        }
-        this.$nextTick(() => {
-          this.$refs.detail.init(params);
-        })
-      },
-      handleQuery() {
-        this.handleCurrentChange(1);
-      },
-      // 店铺列表
-      getStoreList() {
-        searchStore().then(response => {
-            this.storeOptions = response.data.storeList;
-          }
-        )
-      }
-    },
-    created: function () {
-      this.handleCurrentChange(this.currentPage);
-      this.getStoreList();
-    }
-  }
-</script>
-<style scoped>
-  .queryInput >>> .el-input__inner {
-    border-radius: 0px;
-    width: 200px;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/commission/log/index.vue b/fuintAdmin_zt/src/views/commission/log/index.vue
deleted file mode 100644
index 07bfeb3cd..000000000
--- a/fuintAdmin_zt/src/views/commission/log/index.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!--查询参数-->
-    <el-form size="small" :inline="true" label-width="68px">
-      <el-form-item label="所属店铺" prop="storeId">
-        <el-select v-model="storeId" filterable clearable placeholder="请选择店铺" style="width: 100%;">
-          <el-option
-            v-for="item in storeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="姓名">
-        <el-input
-          v-model="realName"
-          placeholder="请输入姓名"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号">
-        <el-input
-          v-model="mobile"
-          placeholder="请输入手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始日期">
-        <el-date-picker
-          v-model="startDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束日期">
-        <el-date-picker
-          v-model="endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择结束日期">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table :data="tableData" :summary-method="getSummaries" show-summary border size="medium" style="width: 100%">
-      <el-table-column prop="orderId" label="来源订单">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            style="color: #3594e3;font-size: 14px;"
-            v-hasPermi="['order:index']"
-            @click="handleView(scope.row.orderId)"
-          >订单
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column prop="staffName" label="员工姓名" width="77"></el-table-column>
-      <el-table-column prop="storeName" min-width="136" :show-overflow-tooltip="true" label="开单门店"></el-table-column>
-      <el-table-column prop="orderDate" label="开单日期" width="116"></el-table-column>
-      <el-table-column prop="goodName" label="商品名称" min-width="136" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="goodPrice" label="商品价格">
-        <template slot-scope="scope">
-          {{scope.row.goodPrice}} 元
-        </template>
-      </el-table-column>
-      <el-table-column prop="goodNum" label="商品数量" width="77"></el-table-column>
-      <el-table-column prop="priceType" label="价格类型">原价</el-table-column>
-      <el-table-column prop="tcWay" label="提成方式">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tcWay=='1'">比率提成</span>
-          <span v-if="scope.row.tcWay=='2'">固定提成</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="visitorVal" label="散客（首充）" width="106">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tcWay=='1'">{{scope.row.visitorVal}} %</span>
-          <span v-if="scope.row.tcWay=='2'">{{scope.row.visitorVal}} 元</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="memberVal" label="会员（续充）" width="106">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tcWay=='1'">{{scope.row.memberVal}} %</span>
-          <span v-if="scope.row.tcWay=='2'">{{scope.row.memberVal}} 元</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="商品分类" width="77">
-        <template slot-scope="scope">
-          <span v-if="scope.row.comType=='1'">项目</span>
-          <span v-if="scope.row.comType=='2'">商品</span>
-          <span v-if="scope.row.comType=='4'">次卡</span>
-          <span v-if="scope.row.comType=='5'">储值卡</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="comType" label="提成类型" :formatter="dataFormat"></el-table-column>
-      <el-table-column prop="commission" label="提成金额">
-        <template slot-scope="scope">
-          {{scope.row.commission}} 元
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-pagination
-      style="margin-top: 5px;text-align: right"
-      background
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-      :page-sizes="[10, 20, 40, 60, 80, 100, 1000, 10000, 100000]"
-      :page-size="pageSize"
-      :current-page="currentPage"
-      @current-change="handleCurrentChange"
-      @size-change="handleSizeChange"
-    ></el-pagination>
-
-
-  </div>
-</template>
-<script>
-  import { getStaffStatisticsDetail } from "@/api/commission/log";
-  import { searchStore } from "@/api/store";
-
-  export default {
-    name: 'busStaffList',
-    data() {
-      return {
-        currentPage: 1, //初始页
-        pageSize: 10, //每页的数据
-        total: 0,
-        tableData: [],
-        storeOptions: [],
-        realName: '',
-        mobile: '',
-        storeId: '',
-        startDate: null,
-        endDate: null,
-        openStaffScheme: false,
-        detailDialog: false
-      }
-    },
-    methods: {
-      handleCurrentChange(page) {
-        let params = {
-          page: page,
-          limit: this.pageSize,
-          realName: this.realName,
-          mobile: this.mobile,
-          storeId: this.storeId,
-          staffId: this.staffId,
-          startDate: this.startDate,
-          endDate: this.endDate
-        }
-        getStaffStatisticsDetail(params).then(r => {
-            this.tableData = r.data.rows;
-            this.total = r.data.total;
-          }
-        );
-      },
-      handleSizeChange(val) {
-        this.pageSize = val;
-        this.handleCurrentChange(1);
-      },
-      dataFormat: function (row, column) {
-        let val = row[column.property];
-        if (val == '1') {
-          return '劳动提成'
-        }
-        if (val == '3') {
-          return '销售提成'
-        }
-        if (val == '4') {
-          return '销售提成'
-        }
-        if (val == '5') {
-          return '销售提成'
-        }
-        return val;
-      },
-      handleQuery() {
-        this.handleCurrentChange(1);
-      },
-      // 店铺列表
-      getStoreList() {
-        searchStore().then(response => {
-            this.storeOptions = response.data.storeList;
-          }
-        )
-      },
-      // 订单详情
-      handleView(orderId) {
-        this.$router.push({path: '/order/detail?orderId=' + orderId})
-      },
-      getSummaries(param) {
-        const {columns, data} = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '总计';
-            return;
-          }
-          if (index < 13) {
-            sums[index] = '--';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' 元';
-          } else {
-            sums[index] = 'N/A';
-          }
-        });
-        return sums;
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      }
-    },
-    created: function () {
-      this.handleCurrentChange(this.currentPage);
-      this.getStoreList();
-    }
-  }
-</script>
-<style scoped>
-
-  select {
-    /*去除select边框*/
-    border: 0;
-    background: transparent;
-    /*去除下拉框的三角下标*/
-    appearance: none;
-    -moz-appearance: none; /* Firefox */
-    -webkit-appearance: none; /* Safari 和 Chrome */
-    height: 32px;
-    width: 100%;
-    background-color: white;
-    padding-left: 5px;
-    border-radius: 5px;
-  }
-
-  input {
-    width: 96%;
-    height: 32px;
-    font-size: 14px;
-    color: #686868;
-    border: 1px solid #d3d6dd;
-    padding-left: 5px;
-    border-radius: 5px;
-  }
-
-  .queryInput >>> .el-input__inner {
-    border-radius: 0px;
-    width: 200px;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/commission/relation/index.vue b/fuintAdmin_zt/src/views/commission/relation/index.vue
deleted file mode 100644
index 39a1cdcdf..000000000
--- a/fuintAdmin_zt/src/views/commission/relation/index.vue
+++ /dev/null
@@ -1,377 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-          clearable
-          style="width: 200px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="store">
-        <el-select
-          v-model="queryParams.storeId"
-          placeholder="所属店铺"
-          clearable
-          style="width: 180px"
-        >
-          <el-option :key="0" label="公共所有" v-if="!this.$store.getters.storeId" :value="0"/>
-          <el-option v-for="storeInfo in storeList" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 100px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['content:banner:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="55"/>
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="所属店铺" align="center" prop="store">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeId && scope.row.storeId > 0">
-              <span>{{ getName(storeList, scope.row.storeId) }}</span>
-          </span>
-          <span v-else>公共所有</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="排序" align="center" prop="sort" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['content:banner:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['content:banner:edit']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="标题" prop="title">
-              <el-input v-model="form.title" placeholder="请输入标题" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属店铺" prop="storeId">
-              <el-select
-                v-model="form.storeId"
-                style="width: 260px"
-                placeholder="所属店铺，空则为公共所有"
-              >
-                <el-option :key="0" label="公共所有" v-if="!this.$store.getters.storeId" :value="0"/>
-                <el-option v-for="storeInfo in storeList" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="链接" prop="url">
-              <el-input v-model="form.url" placeholder="请输入链接，如：pages/user/index" maxlength="200"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="9">
-            <el-form-item label="图片" prop="image">
-              <el-upload
-                   :action="uploadAction"
-                   list-type="picture-card"
-                   :class="{hide:hideUpload}"
-                   :file-list="uploadFiles"
-                   :auto-upload="true"
-                   :show-file-list="false"
-                   :headers="uploadHeader"
-                   :on-success="handleUploadSuccess">
-                <img
-                  v-if="this.form.image"
-                  :src="imagePath + this.form.image"
-                  class="list-img"
-                />
-                <i v-if="!this.form.image" class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改，建议尺寸：640 x 350）</p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="排序" prop="sort">
-              <el-input v-model="form.sort" placeholder="请输入排序数字，越小越靠前" maxlength="10"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { getBannerList, updateBannerStatus, getBannerInfo, saveBanner } from "@/api/banner";
-export default {
-  name: "CommissionRelation",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 图片根目录
-      imagePath: "",
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'sort', order: 'ascending'},
-      // 表单参数
-      form: { id: '', title: '', storeId: 0,  status: "A", sort: 0 },
-      // 店铺列表
-      storeList: [],
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        title: '',
-        storeId: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" },
-          { min: 2, max: 200, message: '标题长度必须介于2 和 200 之间', trigger: 'blur' }
-        ],
-        image: [{ required: true, message: "请上传图片", trigger: "blur" }]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getBannerList(this.queryParams).then( response => {
-          this.list = response.data.dataList.content;
-          this.total = response.data.dataList.totalElements;
-          this.imagePath = response.data.imagePath
-          this.storeList = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.title + '"吗？').then(function() {
-        return updateBannerStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增Banner";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        title: "",
-        status: "A",
-        image: "",
-        description: ""
-      };
-      this.uploadFiles = []
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != undefined) {
-              saveBanner(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveBanner(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getBannerInfo(id).then(response => {
-        this.form = response.data.bannerInfo;
-        this.uploadFiles = [{ url: response.data.imagePath + this.form.image, status: 'finished'}]
-        this.open = true;
-        this.title = "编辑Banner";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.title
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return updateBannerStatus(row.id, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleUploadSuccess(file) {
-      this.form.image = file.data.fileName
-    }
-  }
-};
-</script>
-<style scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/commission/rule/index.vue b/fuintAdmin_zt/src/views/commission/rule/index.vue
deleted file mode 100644
index 81d09752f..000000000
--- a/fuintAdmin_zt/src/views/commission/rule/index.vue
+++ /dev/null
@@ -1,489 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!--查询参数-->
-    <el-form size="small" :inline="true" label-width="68px">
-      <el-form-item label="方案类别" prop="comType">
-        <el-select v-model="comTypeParam" placeholder="请选择类别" clearable style="width: 100%;">
-          <el-option key="1" label="项目" value="1"/>
-          <el-option key="3" label="商品" value="3"/>
-          <el-option key="4" label="次卡" value="4"/>
-          <el-option key="5" label="储值" value="5"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="方案名称">
-        <el-input
-          v-model="comNameParam"
-          placeholder="请输入方案名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          v-hasPermi="['commission:rule:index']"
-          @click="handleAdd('')"
-        >新增方案
-        </el-button>
-      </el-form-item>
-    </el-form>
-
-    <!--方案列表-->
-    <el-table :data="tableData" border size="medium" style="width: 100%">
-      <el-table-column prop="comName" label="方案名称"></el-table-column>
-      <el-table-column prop="comType" label="商品分类" :formatter="dataFormat2"></el-table-column>
-      <el-table-column label="创建时间">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="操作">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['scheme:add']"
-            @click="handleAdd(scope.row.id)"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['scheme:remove']"
-            @click="handleDelete(scope.row)"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      style="margin-top: 5px;text-align: right"
-      background
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-      :page-sizes="[10, 20, 30, 40, 50, 60, 70, 80, 90, 100]"
-      :page-size="pageSize"
-      :current-page="currentPage"
-      @current-change="getCommissionRuleList"
-      @size-change="handleSizeChange"
-    ></el-pagination>
-
-    <!-- 添加或修改方案对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="1100px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="126px">
-        <el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="提成方案名称" prop="comName">
-                <el-input v-model="form.comName" placeholder="请输入名称" maxlength="90" style="width: 55%"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-col :span="24">
-            <el-form-item label="提成方案类别" prop="comType">
-              <el-radio-group v-model="form.comType">
-                <el-radio label="1">项目</el-radio>
-                <el-radio label="3">商品</el-radio>
-                <el-radio label="4">次卡</el-radio>
-                <el-radio label="5">储值</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="方案适用门店" prop="storeIdList">
-              <el-select v-model="form.storeIdList" filterable multiple clearable placeholder="请选择适用门店"
-                         style="width: 55%">
-                <el-option v-for="item in storeOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <div style="margin-bottom: 20px;">
-        <span style="size: 26px;font-weight: bold;margin-left: 20px;"><span
-          style="color: red;margin-right: 5px;">*</span>提成规则配置：</span>
-        <el-button type="primary" size="mini" icon="el-icon-plus" plain @click="addTc">添加项目提成</el-button>
-      </div>
-
-      <el-table :data="form.detailList" id="elTableIdWW" border size="medium" style="width: 100%">
-        <el-table-column label="图片" align="center" width="136">
-          <template slot-scope="scope">
-            <img class="list-img" style="width: 45px;height: 35px;" :src="uploadAction + scope.row.logo">
-          </template>
-        </el-table-column>
-        <el-table-column prop="goodsName" label="商品名称" min-width="136" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="标准价(原价)">
-          <template slot-scope="scope">
-            ￥ {{scope.row.price}} 元
-          </template>
-        </el-table-column>
-        <el-table-column prop="comType" label="提成类型" :formatter="dataFormat"></el-table-column>
-
-        <el-table-column label="价格类型" width="99">
-            <template slot-scope="scope">
-              原价
-            </template>
-        </el-table-column>
-        <el-table-column prop="tcWay" label="提成方式" width="126">
-          <template slot-scope="scope">
-            <select :rowId="scope.row.goodsId" tp="tcWay" @change="selectChange(scope.row.goodsId,'tcWay')" style="border: 1px solid #dbdee5;">
-              <option :selected="scope.row.tcWay=='1'?true:false" value="1">比率提成（%）</option>
-              <option :selected="scope.row.tcWay=='2'?true:false" value="2">固定提成（元）</option>
-            </select>
-          </template>
-        </el-table-column>
-        <el-table-column prop="visitorVal" :label="form.comType=='5'?'首冲':'散客'" width="99">
-          <template slot-scope="scope">
-            <input :value="scope.row.visitorVal" v-if="form.comType != '4'" @change="inputChange(scope.row.goodsId,'visitorVal')" onkeyup="value=value.replace(/[^\d.]/g,'')" :rowId="scope.row.goodsId" tp="visitorVal"/>
-          </template>
-        </el-table-column>
-
-        <el-table-column :label="form.comType=='5'?'次冲':'会员'" width="99">
-          <template slot-scope="scope">
-            <input :value="scope.row.memberVal" @change="inputChange(scope.row.goodsId,'memberVal')" onkeyup="value=value.replace(/[^\d.]/g,'')" :rowId="scope.row.goodsId" tp="memberVal"/>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" width="77">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="removeGd(scope.row.goodsId)" slot="reference" type="text">删除<i class="el-icon-delete"></i>
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="open=false">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!--商品服务选择列表-->
-    <el-dialog title="卡项/商品/服务选择" :visible.sync="openSelect" class="common-dialog" width="700px" append-to-body>
-      <el-table
-        :data="selectGoodList"
-        border
-        size="medium"
-        ref="multipleTable"
-        @selection-change="handleSelectionChange"
-        :row-key="getRowKeys"
-        style="width: 100%">
-        <el-table-column
-          type="selection"
-          width="55"
-          :reserve-selection="true"
-        >
-        </el-table-column>
-        <el-table-column label="图片" align="center" width="156">
-          <template slot-scope="scope">
-            <img class="list-img" style="width: 45px;height: 35px;" :src="uploadAction + scope.row.logo">
-          </template>
-        </el-table-column>
-        <el-table-column prop="name" label="商品名称"></el-table-column>
-        <el-table-column label="标准价(原价)" width="100">
-          <template slot-scope="scope">
-            ￥{{scope.row.price}} 元
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectOk">确 定</el-button>
-        <el-button @click="openSelect=false">取 消</el-button>
-      </div>
-    </el-dialog>
-
-
-  </div>
-</template>
-<script>
-  import { getCommissionRuleList, removeCommissionRule, getCommissionRuleInfo, saveCommissionRule, selectGoodList } from "@/api/commission/rule";
-  import { searchStore } from "@/api/store";
-
-  export default {
-    name: 'busStaffList',
-    data() {
-      return {
-        multipleSelection: [],
-        uploadAction: process.env.VUE_APP_SERVER_URL + '/backendApi/file/getImg/',
-        currentPage: 1, //初始页
-        pageSize: 10, //每页的数据
-        total: 0,
-        tableData: [],
-        selectGoodList: [],
-        storeOptions: [],
-        comNameParam: '',
-        comTypeParam: '',
-        title: '',
-        open: false,
-        openSelect: false,
-
-        form: {
-          id: '',
-          storeIdList: [],
-          comName: '',
-          comType: '1',
-          createTime: '',
-          updateTime: '',
-          status: '',
-          detailList: []
-        },
-        rules: {
-          storeIdList: [{required: true, message: '请选择方案使用门店', trigger: 'blur'}],
-          comName: [{required: true, message: '请输入方案名称', trigger: 'blur'}],
-          comType: [{required: true, message: '请选择商品分类', trigger: 'blur'}]
-        }
-      }
-    },
-    methods: {
-      getCommissionRuleList(page) {
-        let params = {
-          page: page,
-          limit: this.pageSize,
-          comName: this.comNameParam,
-          comType: this.comTypeParam
-        }
-        getCommissionRuleList(params).then(r => {
-            this.tableData = r.data.rows;
-            this.total = r.data.total;
-          }
-        );
-      },
-      handleSizeChange(val) {
-        this.pageSize = val;
-        this.getCommissionRuleList(1);
-      },
-      dataFormat: function (row, column) {
-        //商品分类=提成类型：1：项目=劳动提成:2：卡项=销售提成:3：商品=销售提成
-        let val = row[column.property];
-        if (val == '1') {return '劳动提成'}
-        if (val == '3') {return '销售提成'}
-        if (val == '4') {return '销售提成'}
-        if (val == '5') {return '销售提成'}
-        return val;
-      },
-      dataFormat2: function (row, column) {
-        //商品分类=提成类型：1：项目=劳动提成:2：卡项=销售提成:3：商品=销售提成
-        let val = row[column.property];
-        if (val == '1') {return '项目'}
-        if (val == '3') {return '商品'}
-        if (val == '4') {return '次卡'}
-        if (val == '5') {return '储值'}
-        return val;
-      },
-      // 店铺列表
-      getStoreList() {
-        searchStore().then(response => {
-            this.storeOptions = response.data.storeList;
-          }
-        )
-      },
-      handleQuery() {
-        this.getCommissionRuleList(1);
-      },
-      handleAdd(id) {
-        this.title = "新增方案"
-        this.form.id = '';
-        this.form.storeIdList = [];
-        this.form.detailList = [];
-        this.form.comName = '';
-        this.form.comType = '1';
-        this.form.createTime = '';
-        this.form.updateTime = '';
-        this.form.status = '';
-        this.open = true;
-        if (id) {
-          this.title = "修改方案"
-          getCommissionRuleInfo({id: id}).then(r => {
-              this.form = r.data;
-            }
-          );
-        }
-      },
-      // 提交按钮
-      submitForm: function () {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (!this.form.id) {
-              saveCommissionRule(this.form).then(r => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.handleQuery();
-              });
-            } else {
-              saveCommissionRule(this.form).then(r => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.handleQuery();
-              });
-            }
-          }
-        });
-      },
-      handleDelete(row) {
-        this.$confirm('确认删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let id = row.id;
-          removeCommissionRule({id: id}).then(r => {
-              if (r.code == 200) {
-                this.$message({ // 成功
-                  type: 'success',
-                  message: '操作成功'
-                })
-                this.getCommissionRuleList(1);
-              }
-            }
-          )
-        }).catch(() => {
-        });
-      },
-      addTc() {//添加提成方案详情
-        if (!this.form.comType) {
-          this.$modal.msgWarning("请先选择提成方案类别");
-          return;
-        }
-        this.openSelect = true;
-
-        this.multipleSelection = [];//清空已选择的列表
-        //清空所有选中
-        this.$nextTick(() => {
-          this.$refs.multipleTable.clearSelection();
-        })
-
-        let params = {comType: this.form.comType}
-        selectGoodList(params).then(r => {
-            this.selectGoodList = r.data;
-            //数据回显
-            this.selectGoodList.forEach(item => {
-              this.form.detailList.forEach(item2 => {
-                if(item2.goodsId==item.id){
-                  //满足条件选中
-                  this.$refs.multipleTable.toggleRowSelection(item);
-                }
-              })
-            })
-          }
-        );
-      },
-      removeGd(goodId){//删除提成方案商品服务
-        this.form.detailList = this.form.detailList.filter(item => {
-          return item.goodsId != goodId;
-        })
-      },
-      inputChange(goodId,filed){
-        let input = $("#elTableIdWW .el-table__body-wrapper tbody").find("input[rowId='" + goodId + "'][tp='" + filed + "']");
-        if (input.val()=='') {
-            input.val(0)
-        }
-        //去掉左右空格
-        let val = Number($.trim(input.val()));
-        input.val(val);
-        this.form.detailList.forEach(item => {
-          if (item.goodsId == goodId) {
-            item[filed] = val;
-          }
-        })
-      },
-      selectChange(goodId,filed){
-        let select = $("#elTableIdWW .el-table__body-wrapper tbody").find("select[rowId='" + goodId + "'][tp='" + filed + "']");
-        let val = select.val();
-        this.form.detailList.forEach(item => {
-          if (item.goodsId == goodId) {
-              item[filed] = val;
-          }
-        })
-      },
-      getRowKeys(row) {
-        return row.id;
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      selectOk() {//确定选择的商品服务
-        let selectList = [];
-        //1.转换已经选择的商品
-        this.multipleSelection.forEach(item => {
-          if (item.comType == this.form.comType) {
-            let detailObj = {
-              goodsId: item.id,//商品ID
-              priceType: "1",//价格类型 1：标准价(原价) 2：会员价
-              tcWay: "1",//提成方式 1：比率提成(按100的比率) 2：固定提成
-              visitorVal: 0.00,//散客（提成值）
-              memberVal: 0.00,//会员（提成值）
-              comType: item.comType,//商品分类=提成类型：1：项目=劳动提成:3：商品=销售提成 4：次卡=销售提成: 5：储值=销售提成:
-              goodsName: item.name,//商品名称
-              price: item.price,//商品价格
-              logo: item.logo//商品图片
-            }
-
-            //2.比对现有已选择的商品
-            this.form.detailList.forEach(item2 => {
-              if(item2.goodsId==item.id){
-                detailObj = item2;
-              }
-            })
-
-            selectList.push(detailObj);
-          }
-        })
-
-        this.form.detailList = selectList;
-        this.openSelect = false;
-      }
-    },
-    created: function () {
-      this.getCommissionRuleList(this.currentPage);
-      this.getStoreList();
-    }
-  }
-</script>
-<style scoped>
-
-  select {
-    /*去除select边框*/
-    border: 0;
-    background: transparent;
-    /*去除下拉框的三角下标*/
-    appearance: none;
-    -moz-appearance: none; /* Firefox */
-    -webkit-appearance: none; /* Safari 和 Chrome */
-    height: 32px;
-    width: 100%;
-    background-color: white;
-    padding-left: 5px;
-    border-radius: 5px;
-  }
-
-  input {
-    width: 96%;
-    height: 32px;
-    font-size: 14px;
-    color: #686868;
-    border: 1px solid #d3d6dd;
-    padding-left: 5px;
-    border-radius: 5px;
-  }
-
-  .queryInput >>> .el-input__inner {
-    border-radius: 0px;
-    width: 200px;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
deleted file mode 100644
index 3378f1f25..000000000
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <div class="bai-box" style="margin-top: 20px" >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-        <el-form-item label="" prop="type">
-          <el-select
-            v-model="queryParams.type"
-            placeholder="请选择订单类型"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-
-
-        </el-form-item>
-        <el-form-item label="" prop="orderNo">
-          <el-input
-            v-model="queryParams.orderNo"
-            placeholder="请输入订单号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="payChannel">
-          <el-select
-            v-model="queryParams.payChannel"
-            placeholder="请选择支付渠道"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in payChannelList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-        <el-form-item label="" prop="payType">
-          <el-select
-            v-model="queryParams.payType"
-            placeholder="状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.payment_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            size="medium"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-
-        </el-form-item>
-      </el-form>
-      <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-        <el-table-column label="订单号" align="center" prop="orderNo" />
-        <el-table-column label="订单类型" align="center" prop="type" width="100">
-          <template slot-scope="scope">
-            {{ getType(scope.row.type) }}
-          </template>
-          </el-table-column>
-        <el-table-column label="渠道订单号" align="center" prop="transactionId"/>
-        <el-table-column :label="sumPayMoney" align="center" prop="payMoney">
-
-        </el-table-column>
-        <el-table-column label="支付时间" align="center" prop="payTime" width="150">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.payTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="付款方式" align="center" prop="payType">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.payment_type" :value="scope.row.payType"/>
-          </template>
-
-        </el-table-column>
-
-
-        <el-table-column label="创建时间" align="center" prop="createTime" width="150">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="支付渠道" align="center" prop="createTime" width="150">
-          <template slot-scope="scope">
-            <span>{{ scope.row.payChannel==='applet'?'小程序': '收银台'}}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="付款用户手机号" align="center" prop="userMobile" width="150">
-          <template slot-scope="scope">
-            <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
-          </template>
-        </el-table-column>
-
-
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-  import {getName} from "../../../utils/fuint";
-  import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
-  // import {getDuty, listDuty} from "@/api/staff/duty";
-  import { getOrderListApi,getSumPayMoneyApi } from "../../../api/allOrder";
-  export default {
-    name: "asdf",
-    dicts: ['transaction','handover','handover_quit','payment_type',
-      'jbjl','official','notice','role'],
-      props: ["id"],
-
-    data() {
-      return {
-        drawer: false,
-        // 标题
-        title: "",
-        // 遮罩层
-        loading: false,
-        // 选中数组
-        ids: [],
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        categoryOptions: [],
-        storeOptions: [],
-        posPrem:'',
-
-        props: { multiple: true },
-        appletPrem:'',
-
-        writeOff:[],
-        write:[],
-        specialPrem:[],
-        special:[],
-        // 总条数
-        total: 0,
-        // 表格数据
-        list: [],
-        // 是否显示弹出层
-        open: false,
-        // 日期范围
-        dateRange: [],
-        // 默认排序
-        defaultSort: {prop: 'createTime', order: 'descending'},
-        // 表单参数
-        form: {
-          id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'',
-          auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
-          merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
-          transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
-        },
-        // 查询参数
-        queryParams: {
-          type:'',
-          orderNo:'',
-          payChannel:'',
-          payType:'',
-          page: 1,
-          pageSize: 10,
-        },
-
-        typeList:[
-          { value: '1',label: '油品'},
-          { value: '2',label: '商品'},
-          { value: '3',label: '储值卡'},
-          { value: '4',label: '积分'},
-          { value: '5',label: '囤油卡'},
-          { value: '6',label: '油品加加商品(收银台订单)'},
-          { value: '7',label: '挂账订单'},
-        ],
-        payTypeList:[
-          { value: '选项1',label: '黄金糕'},
-
-        ],
-        payChannelList:[
-          { value: 'applet',label: '小程序'},
-          { value: 'cashier',label: '收银台'},
-        ],
-        sumPayMoney:'支付金额'
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-       // 查询列表
-       getList() {
-        this.loading = true;
-        this.queryParams.storeId = this.id
-        getOrderListApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            this.list = response.data.records;
-            this.total = response.data.total;
-            this.getSumPayMoney()
-            this.loading = false;
-          }
-        );
-      },
-
-       // 查询总钱数
-       getSumPayMoney() {
-        // this.loading = true;
-        this.queryParams.storeId = this.id
-        getSumPayMoneyApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            if(response.data > 0) {
-              const sum = response.data
-              this.sumPayMoney = '支付金额(总计：￥'+sum+')'
-            }else {
-              this.sumPayMoney = '支付金额'
-
-            }
-            // this.loading = false;
-          }
-        );
-      },
-
-      getType(data) {
-        const matchedElement = this.typeList.find(element => element.value === data);
-        if (matchedElement) {
-            return matchedElement.label;
-        }
-        return null;
-      },
-
-      showDesc(){
-        this.drawer = true;
-      },
-      handleNodeClick1(data) {
-        this.form.posPrem = JSON.stringify(data);
-      },
-      handleNodeClick2(data) {
-        this.form.appletPrem = JSON.stringify(data);
-      },
-      getCheckbox(){
-        this.form.writeOff = this.writeOff.toString();
-        this.form.specialPrem = this.specialPrem.toString();
-      },
-      // 页面跳转
-      toTarget(url) {
-        this.$router.push( { path: url } );
-      },
-
-      // 查询角色列表
-      getDuty(){
-        listDuty().then(response => {
-          this.role = response.data
-        })
-      },
-      // 店铺列表
-      getStoreList() {
-        listStaff().then(response => {
-            this.storeOptions = response.data.records;
-          }
-        );
-        // searchStore().then(response => {
-        //     this.storeOptions = response.data.storeList;
-        //   }
-        // );
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-        this.handleQuery();
-      },
-
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.operId)
-        this.multiple = !selection.length
-      },
-      // 排序触发事件
-      handleSortChange(column, prop, order) {
-        this.queryParams.orderByColumn = column.prop;
-        this.queryParams.isAsc = column.order;
-        this.getList();
-      },
-      // 新增按钮操作
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "新增员工";
-      },
-      // 表单重置
-      reset() {
-        this.posPrem = '';
-        this.appletPrem = '';
-        this.writeOff = []
-        this.form = {
-          id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'A',
-          auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
-          merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
-          transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
-        };
-        this.resetForm("form");
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-
-    }
-  };
-</script>
-
-<style scoped>
-  .app-container{
-    width: 100%;
-    height: 100%;
-    /* height: 100vh; */
-    background: #f9f9f9;
-  }
-  .pagin-box{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-  }
-  .baoguo{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-    margin-bottom: 20px;
-  }
-  .bai-box{
-    background: #fff;
-    box-sizing: border-box;
-    padding: 20px;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/components/Service/index.vue b/fuintAdmin_zt/src/views/components/Service/index.vue
deleted file mode 100644
index dbd097aa0..000000000
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ /dev/null
@@ -1,589 +0,0 @@
-<template>
-
-      <div style="width: 100%;height: 100%;position: relative;background: #f9f9f9; ">
-        <div class="box-h">
-        <div class="dis-box" style="align-items: center; margin-bottom: 15px">
-          <div class="gang"></div>
-          <div class="title">基本设置</div>
-        </div>
-        <div class="dis-box">
-          <div class="block">
-            <el-avatar v-if="fullImagePath" shape="square" :size="96" :key="fullImagePath" :src="fullImagePath"></el-avatar>
-            <el-avatar v-else shape="square" :size="96"  src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png"></el-avatar>
-          </div>
-          <div style="width: 100%">
-            <div class="dis-box" style="align-items: center;cursor: pointer;margin-bottom: 20px">
-              <div class="title">{{from.name}}</div>
-              <div class="lansiez" v-hasPermi="['Servic:edit']" @click="editInfo()">编辑油站</div>
-              <div class="lansiez" v-hasPermi="['Service:enter']" @click="enterThePetrolStation()">进入油站</div>
-            </div>
-            <div class="wrap-box">
-              <div class="threebox">
-                <div>油站状态：</div>
-                <div v-if="from.status === 'qy'">
-                  <el-tag type="success">正常</el-tag>
-                </div>
-                <div v-else>
-                  <el-tag type="danger">停用</el-tag>
-                </div>
-
-              </div>
-              <div class="threebox">
-                <div>油站联系人：</div>
-                <div>{{ seeFrom.contact }}</div>
-              </div>
-              <div class="threebox">
-                <div>油站联系方式：</div>
-                <div>{{ seeFrom.phone }}</div>
-              </div>
-              <div class="threebox">
-                <div>油站ID：</div>
-                <div>{{ seeFrom.id }}</div>
-              </div>
-              <div class="threebox">
-                <div>油站创建时间：</div>
-                <div>{{ parseTime(seeFrom.createTime) }}</div>
-              </div>
-<!--              <div class="threebox">-->
-<!--                <div>套餐到期时间：</div>-->
-<!--                <div>{{ from.expirationTime?parseTime(seeFrom.expirationTime):"&#45;&#45;"  }}</div>-->
-<!--              </div>-->
-              <div class="threebox">
-                <div>地址：</div>
-                <div>{{ seeFrom.address }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bottom-box2">
-          <div style="height: 200px; width: 300px;">
-            <span class="demonstration" >营业执照</span>
-            <br/>
-
-            <el-image v-if="from.license" :src="imagePath+from.license" style="margin-top: 10px;"></el-image>
-            <el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image>
-
-          </div>
-          <div style="height: 200px; width: 300px; margin-left: 100px;">
-            <span class="demonstration">门头照</span>
-            <br/>
-
-            <el-image v-if="from.doorstepPhoto[0]" :src="imagePath+from.doorstepPhoto[0]" style="margin-top: 10px;"></el-image>
-            <el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image>
-
-          </div>
-        </div>
-        <el-dialog title="编辑油站" class="d-dialog"  :visible.sync="editDialog" width="900px" style="padding-right: 10px;">
-          <el-form :model="from" ref="form" :rules="rules">
-            <el-row>
-                <el-col :span="10">
-                  <el-form-item label="油站名称" prop="name" :label-width="formLabelWidth">
-                    <el-input v-model="from.name" autocomplete="off" style="width:220px"></el-input>
-                  </el-form-item>
-
-                  <el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth">
-                    <el-input v-model="from.contact" autocomplete="off" style="width:220px"></el-input>
-                  </el-form-item>
-
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="上传头像" prop="name" :label-width="formLabelWidth">
-                  <el-upload
-                      :action="uploadAction"
-                      list-type="picture-card"
-                      :class="{hide:hideUpload}"
-                      :file-list="uploadFiles"
-                      :auto-upload="true"
-                      :show-file-list="false"
-                      :headers="uploadHeader"
-                      :on-success="handleUploadSuccessLogo">
-                    <img
-                      v-if="this.from.logo"
-                      :src="imagePath + this.from.logo"
-                      class="list-img"
-                    />
-                    <i v-if="!this.from.logo"  class="el-icon-plus"></i>
-                  </el-upload>
-                   </el-form-item>
-
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="10">
-                  <el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth">
-                    <el-input v-model="from.phone" autocomplete="off" style="width:220px"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="10">
-                <el-form-item label="店铺地址" prop="address" :label-width="formLabelWidth">
-                  <el-input
-                  style="width:220px"
-                    type="textarea"
-                    :rows="2"
-                    placeholder="请输入地址"
-                    v-model="from.address">
-                  </el-input>
-                </el-form-item>
-
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="油站状态" prop="status" :label-width="formLabelWidth">
-                  <el-tooltip class="item" effect="dark" content="油站状态在组织架构中设置" placement="top-start">
-
-                  <el-switch
-                  disabled
-                  v-model="from.status"
-                    @change="getswitch"
-                    active-value="qy"
-                    inactive-value="jy"
-                    ></el-switch>
-                  </el-tooltip>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col  :span="6">
-                <el-form-item label="上传营业执照" prop="name" :label-width="formLabelWidth">
-                  <el-upload
-                      :action="uploadAction"
-                      list-type="picture-card"
-                      :class="{hide:hideUpload}"
-                      :file-list="uploadFiles"
-                      :auto-upload="true"
-                      :show-file-list="false"
-                      :headers="uploadHeader"
-                      :on-success="handleUploadSuccessLicence">
-                    <img
-                      v-if="this.from.license"
-                      :src="imagePath + this.from.license"
-                      class="list-img"
-                    />
-                    <i v-if="!this.from.license"  class="el-icon-plus"></i>
-                  </el-upload>
-                </el-form-item>
-              </el-col>
-
-
-              <el-col :span="18">
-                <el-form-item label="上传门头照" prop="name" :label-width="formLabelWidth">
-                  <el-upload
-                    :action="uploadAction"
-                      list-type="picture-card"
-                      :class="{hide:hideUpload}"
-                      :file-list="uploadImages"
-                      :headers="uploadHeader"
-                      :auto-upload="true"
-                      :on-preview="handlePictureCardPreview"
-                      :on-success="handleUploadSuccessGift"
-                      style="height: 100px;"
-                      :on-remove="handleRemove"
-                      :before-upload="beforeUpload"
-                        >
-                      <i  class="el-icon-plus"></i>
-                  </el-upload>
-                  <el-dialog :visible.sync="dialogVisible">
-                    <img width="100%" :src="dialogImageUrl" alt="">
-                  </el-dialog>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="editDialog = false">取 消</el-button>
-            <el-button type="primary" @click=" edit">确 定</el-button>
-          </div>
-        </el-dialog>
-        <el-dialog title="收货地址" :visible.sync="dialogFormVisible">
-    <el-form :model="form">
-      <el-form-item label="活动名称" :label-width="formLabelWidth">
-        <el-input v-model="form.name" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="活动区域" :label-width="formLabelWidth">
-        <el-select v-model="form.region" placeholder="请选择活动区域">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="dialogFormVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-    </div>
-  </el-dialog>
-      </div>
-      </div>
-</template>
-
-<script>
-  import { Storelist, Storedetails,getStoreInfo,editStoreInfoApi,singleSignOnApi } from "@/api/service/service";
-  import { parseTime } from "@/utils/fuint";
-  import BigNumber from 'bignumber.js';
-  import { getToken } from '@/utils/auth'
-
-  export default {
-    name: 'index',
-    props: ["id"],
-    data(){
-      return{
-        dataForm:{coverImage:''},
-        // 上传地址
-        // uploadAction: 'http://192.168.0.178:8008/backendApi/file/upload',
-        uploadAction: process.env.VUE_APP_SERVER_URL+'/backendApi/file/upload',
-        uploadHeader: { 'Access-Token' : getToken() },
-        // 隐藏上传
-        hideUpload: false,
-        // 上传文件列表
-        uploadFiles: [
-          {
-            name:"nihao",
-            url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
-        ],
-        imagePath: process.env.VUE_APP_SERVER_URL,
-
-        // 多文件上传
-        uploadImages: [],
-        dialogImageUrl: "",
-        dialogVisible: false,
-        // hideUpload: false,
-
-        from:{
-          name: '',
-          status:'',
-          expirationTime:'',
-          address:'',
-          contact:'',
-          phone:'',
-          logo:'',
-          license:'',
-          doorstepPhoto:[],
-        },
-
-
-        seeFrom:{
-          name: '',
-          status:'',
-          expirationTime:'',
-          address:'',
-          contact:'',
-          phone:'',
-          logo:'',
-          license:'',
-          doorstepPhoto:[],
-        },
-
-
-
-        squareUrl: "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png",
-        dialogFormVisible: false,
-        editDialog: false,
-        baseUrl: process.env.VUE_APP_SERVER_URL,
-        form: {
-          name: '',
-          status:'',
-          expirationTime:'',
-          address:'',
-          contact:'',
-          phone:'',
-          region: '',
-          date1: '',
-          date2: '',
-          delivery: false,
-          type: [],
-          resource: '',
-          desc: ''
-        },
-        formLabelWidth: '120px',
-
-
-        rules: {
-          name: [
-            { required: true, message: '油站名称不能为空', trigger: 'blur' },
-          ],
-          contact: [
-            { required: true, message: '油站联系人不能为空', trigger: 'blur' },
-          ],
-          phone: [
-            { required: true, message: '联系人电话不能为空', trigger: 'blur' },
-          ],
-
-          expirationTime: [
-            { type: 'date', required: true, message: '请选择套餐到期时间', trigger: 'change' }
-          ],
-        }
-      }
-    },
-
-    computed: {
-      uploadAction(){
-
-      },
-      fullImagePath() {
-        return this.imagePath + this.from.logo;
-      }
-    },
-    mounted() {
-    },
-    created() {
-      this.getindex()
-    },
-    methods:{
-
-
-
-      editInfo() {
-        this.editDialog = true
-      },
-      // 修改
-      edit: function () {
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            this.from.expirationTime = Date.parse(this.from.expirationTime);
-            this.from.doorstepPhoto = JSON.stringify(this.from.doorstepPhoto);
-            // this.from.expirationTime  = new Date(this.from.expirationTime).toLocaleString('en-US', { timeZone: 'UTC' });
-
-            editStoreInfoApi(this.from).then(res=>{
-                if(res.code = 200){
-
-                }
-                this.getindex()
-            })
-            this.editDialog = false
-
-          }
-        })
-
-
-
-      },
-      getindex(){
-        if(this.id){
-          Storedetails(this.id).then(res=>{
-            // console.log("hello1",res.data)
-            if (res.code == 200) {
-
-              // this.from = {}
-
-              // this.seeFrom = {}
-              // this.from = res.data
-              if(!res.data.doorstepPhoto){
-                res.data.doorstepPhoto=[]
-              }
-              console.log("this.from",this.from)
-              console.log("this.from",res.data.doorstepPhoto)
-              this.from = res.data
-
-              this.seeFrom = res.data
-
-              this.uploadImages = []
-              if (res.data.doorstepPhoto) {
-                if (res.data.doorstepPhoto.length>0) {
-                  this.from.doorstepPhoto = JSON.parse(res.data.doorstepPhoto);
-                  this.from.doorstepPhoto.forEach(res=> {
-                  let newImage = {
-                    url: this.baseUrl+res,
-                    fileName: res
-                  }
-                  this.uploadImages.push(newImage);
-                })
-                }
-
-              }
-              this.$forceUpdate();
-            }
-
-
-          })
-        }else {
-          console.log('没有id',this.id)
-        }
-      },
-
-
-      enterThePetrolStation() {
-        if (this.from.status === 'jy') {
-          this.$message('该油站已被禁用');
-
-          return
-        }
-        singleSignOnApi(this.id).then(res=>{
-          if (res.code == 200) {
-            window.open(this.pcUrl+'index?entrance='+this.id)
-          }
-        })
-      },
-
-
-      // 上传封面
-      handleUploadSuccessLogo(file) {
-        console.log("1231231231231")
-        this.from.logo = file.data.fileName;
-      },
-      handleUploadSuccessLicence(file) {
-        this.from.license = file.data.fileName;
-      },
-
-
-      // 上传门头照
-      // 上传详情图
-    handleUploadSuccessGift(file) {
-      let newImage = {
-        url: process.env.VUE_APP_SERVER_URL + file.data.fileName,
-        fileName: file.data.fileName
-      }
-      if (this.uploadImages == undefined) {
-        this.uploadImages = [];
-
-      }
-      this.uploadImages.push(newImage);
-      this.from.doorstepPhoto.push(file.data.fileName);
-      this.$forceUpdate()
-
-    },
-
-    handleRemove(file, fileList) {
-      this.$forceUpdate()
-
-      this.hideUpload = true
-      console.log("qweqweqe",this.hideUpload)
-      this.uploadImages.forEach((image, index) => {
-        if (file.url === image.url) {
-          this.uploadImages.splice(index, 1);
-        }
-      });
-      this.from.doorstepPhoto.forEach((image, index) => {
-        if (file.fileName == image) {
-          this.from.doorstepPhoto.splice(index, 1);
-        }
-      });
-    },
-      handlePictureCardPreview(file) {
-        console.log(file);
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-
-      beforeUpload(file) {
-        this.hideUpload = true
-
-      // Check if the number of files exceeds 3
-      if (this.uploadImages.length >= 3) {
-        this.$message.warning('最多只可以上传三张');
-        return false; // Cancel upload
-      }
-      return true; // Continue with the upload
-    },
-
-
-
-      getswitch(value) {
-        console.log(value)
-      },
-      handleClick(tab, event) {
-        console.log(tab, event);
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .dis-box{
-    display: flex;
-    width: 100%;
-  }
-  .gang{
-    height: 15px;
-    background: #3058d8;
-    width: 4px;
-    margin-right: 10px;
-  }
-  .title{
-    font-size: 16px;
-    font-weight: bold;
-  }
-  .img-box{
-    width: 96px;
-    height: 96px;
-    overflow: hidden;
-    border-radius: 8px;
-    margin-right: 15px;
-
-  }
-  .lansiez{
-    font-size: 12px;
-    color: #006cff;
-    margin-left: 10px;
-  }
-  .wrap-box{
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-
-  }
-  .threebox{
-    width: 33%;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    margin-bottom: 20px;
-  }
-  .bottom-box2{
-    background: rgb(255, 255, 255);
-    display: flex;
-    justify-content: left;
-  }
-  .box-h{
-    background: rgb(255, 255, 255);
-    width: 98%;
-    margin: 10px auto;
-    box-sizing: border-box;
-    padding: 20px;
-  }
-  .bottom-box{
-    width: 1600px;
-    position: absolute;
-    bottom: 0px;
-
-    height: 75px;
-    background: white;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .bott-box{
-    margin: 10px;
-  }
-  .block{
-    margin-right: 20px;
-  }
-  /* 上传头像 */
-  .list-img{
-  width: 98px;
-  height: 98px;
-  }
-.d-dialog >>> .el-upload--picture-card {
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-}
-.d-dialog >>> .avatar-uploader .el-upload {
-  width: 100px;
-  height: 100px;
-}
-.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
-  width: 100px;
-  height: 100px;
-}
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-
-
-</style>
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
deleted file mode 100644
index ab1dc45ee..000000000
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ /dev/null
@@ -1,1298 +0,0 @@
-<template>
-  <div class="box-centenr">
-    <div class="new-box">
-      <div class="n-top-box">
-        <div class="d-s">
-          <div class="gang"></div>
-          <div class="title_">商户信息</div>
-          <div class="size_">
-            说明：为了保证加油站商户日常在线支付业务的稳定性，目前支持多通道支付，可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题，加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务
-          </div>
-        </div>
-        <div class="o-button"  v-hasPermi="['Merchant:add']" @click="addMerchantShow()">新增商户信息</div>
-      </div>
-      <el-table
-        :data="merchantList"
-
-        border
-        style="width: 100%">
-        <el-table-column
-          type="index"
-          align="center"
-          label="序号"
-          width="50">
-        </el-table-column>
-        <el-table-column
-          prop="merchantName"
-          align="center"
-          label="支付通道"
-          width="120">
-        </el-table-column>
-        <el-table-column
-          prop="mchntCd"
-          align="center"
-          label="商户号编码"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          align="center"
-          label="所属机构">
-        </el-table-column>
-        <el-table-column
-          prop="amount"
-          align="center"
-          label="累计收款金额（元）">
-        </el-table-column>
-        <el-table-column
-          prop="isUse"
-          align="center"
-          label="使用状态"
-          width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.isUse==1">正在使用</span>
-            <span v-else>未使用</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="remark"
-          align="center"
-          label="备注">
-          <template slot-scope="scope">
-            <span>{{ scope.row.remark || '--' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="realName"
-          align="center"
-          width="100"
-          label="创建人">
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          align="center"
-          label="创建时间">
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          align="center"
-          width="100"
-          label="操作">
-          <template slot-scope="scope">
-            <div style="color: #409EFF;cursor: pointer" v-hasPermi="['Merchant:edit']"  @click="editMerchant(scope.row)">修改</div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="n-top-box" style="margin-top: 30px">
-        <div class="d-s">
-          <div class="gang"></div>
-          <div class="title_">商户分账规则</div>
-          <div class="size_">使用说明：添加/编辑对应的规则->规则配置正常->发布规则->规则生效
-            注意:功能状态启用且通道规则发布生效后当前功能才有效,否则使用系统单商户号模式
-          </div>
-        </div>
-        <div class="o-button" v-hasPermi="['payment:add']"  @click="addRules()">新增规则</div>
-      </div>
-      <el-table
-        :data="tableData1"
-        style="width: 100%;margin-bottom: 20px;"
-        border>
-        <el-table-column type="expand" >
-          <template slot-scope="props">
-            <el-table ref="tables" :data="props.row.ruleList">
-              <el-table-column align="center"  width="50"></el-table-column>
-              <el-table-column label="支付通道" prop="merchantName" align="center" width="120"/>
-              <el-table-column label="商户号编码" prop="mchntCd" align="center" width="150"/>
-              <el-table-column label="交易占比" prop="proportion" v-if="props.row.ruleType==1" align="center" width="80">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.proportion }}%</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="交易类型" prop="transactionType" v-if="props.row.ruleType==2"  align="center" width="400">
-                <template slot-scope="scope">
-                  <div v-if="scope.row.transactionType.includes('1')">会员充值,</div>
-                  <div v-if="scope.row.transactionType.includes('2')">便利店,</div>
-                  <div v-if="scope.row.transactionType.includes('3')">积分商城,</div>
-                  <div v-if="scope.row.transactionType.includes('4')">{{ scope.row.oilGunName }}</div>
-                  <div v-if="scope.row.transactionType.includes('5')">油品+便利店组合付款</div>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          type="index"
-          align="center"
-          label="序号"
-          width="50">
-        </el-table-column>
-        <el-table-column
-          prop="ruleName"
-          label="规则名称"
-          align="center"
-          width="120">
-<!--          <template slot-scope="scope">-->
-<!--            <div style="color: #409EFF;cursor: pointer">{{ scope.row.ruleName }}</div>-->
-<!--          </template>-->
-
-        </el-table-column>
-        <el-table-column
-          prop="ruleType"
-          label="规则类型"
-          align="center"
-          width="180">
-          <template slot-scope="scope">
-            <span v-if="scope.row.ruleType==1">按比例分账</span>
-            <span v-if="scope.row.ruleType==2">按交易类型分账</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="status"
-          label="规则状态"
-          align="center"
-          width="80">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              @change="scope.row.status=='qy' ? EnableRule(scope.row) : submitEnable('jy')"
-              active-value="qy"
-              inactive-value="jy"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="startTime"
-          label="开始时间"
-          align="center"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="description"
-          align="center"
-          label="规则描述">
-        </el-table-column>
-        <el-table-column
-          prop="realName"
-          align="center"
-          width="100"
-          label="创建人">
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          align="center"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          align="center"
-          width="180"
-          label="操作">
-          <template slot-scope="scope">
-            <div style="display: flex;justify-content: center;width: 100%">
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']" @click="editRule(scope.row)">修改</div>
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']" @click="deleteRule(scope.row)">删除</div>
-              <div style="color: #409EFF;cursor: pointer;margin: 0 10px" @click="EnableRule(scope.row)">启用</div>
-            </div>
-
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-dialog :title="addMerchantTitile" :visible.sync="addMerchants" width="550px">
-      <el-form :model="form" ref="formAdd" :rules="rules">
-        <el-form-item label="所属机构" :label-width="formLabelWidth" prop="deptId">
-          <el-select v-model="form.deptId+''" placeholder="请选择所属机构" style="width: 350px">
-            <el-option
-              v-for="item in deptListSelect"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId+''"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName">
-          <el-select
-            v-model="form.merchantName"
-            placeholder="全部"
-            clearable
-            style="width: 350px"
-          >
-            <el-option
-              v-for="dict in dict.type.payment_channel"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="商户号编号" :label-width="formLabelWidth" prop="mchntCd">
-          <el-input v-model="form.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
-                    style="width: 350px"></el-input>
-        </el-form-item>
-        <el-form-item label="备注" :label-width="formLabelWidth">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" autocomplete="off"
-                    style="width: 350px"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="addMerchants = false">取 消</el-button>
-        <el-button type="primary" @click="submitMerchant">确 定</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :title="Ruletitle" :visible.sync="addRule">
-      <el-form :model="formRule" ref="formRule" :rules="rules">
-        <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
-          <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
-        </el-form-item>
-        <el-form-item label="规则描述" :label-width="formLabelWidth">
-          <el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
-                    style="width: 350px"></el-input>
-        </el-form-item>
-        <el-form-item label="规则类型" :label-width="formLabelWidth">
-          <div style="display: flex">
-            <div class="xz_box" :class=" {'active' : formRule.ruleType == 1 } " @click="formRule.ruleType = 1"><i
-              class="el-icon-aim"></i> 按比例分账
-            </div>
-            <div class="xz_box" :class=" {'active' : formRule.ruleType == 2 } " @click="formRule.ruleType = 2"><i
-              class="el-icon-aim"></i> 按交易类型分账
-            </div>
-          </div>
-        </el-form-item>
-        <el-form-item label="规则配置" :label-width="formLabelWidth">
-          <i class="el-icon-circle-plus-outline" style="font-size: 14px;color:#FF9655 " @click="addboxlsit()"></i>
-        </el-form-item>
-        <div class="d-s" v-for="(item,index) in formRule.ruleList" :key="index" style="margin-bottom: 15px"
-             v-if=" formRule.ruleType == 1">
-          <div class="list-box">
-            <el-form-item label="支付通道" :label-width="formLabelWidth">
-              <el-select v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
-                         @change="chooseMerchConfig(item.merchConfigId,index)">
-                <el-option
-                  v-for="(item1,i) in merchantList"
-                  :key="item1.id"
-                  :label="item1.remark ? (item1.merchantName+'（'+item1.remark+'）') : (item1.merchantName+'（--）')"
-                  :value="item1.id"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="商户号编号" :label-width="formLabelWidth">
-              <el-input v-model="item.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
-                        style="width: 300px" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="交易占比" :label-width="formLabelWidth">
-
-              <el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 300px">
-                <template slot="append">%</template>
-              </el-input>
-            </el-form-item>
-          </div>
-          <i class="el-icon-delete" style="font-size: 28px;margin-left: 15px" @click="deleteDoxlist(index)"></i>
-        </div>
-        <div class="d-s" v-for="(item,index) in formRule.ruleList" :key="index" style="margin-bottom: 15px"
-             v-if=" formRule.ruleType == 2">
-          <div class="list-box">
-            <el-form-item label="支付通道" :label-width="formLabelWidth">
-              <el-select v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
-                         @change="chooseMerchConfig(item.merchConfigId,index)">
-                <el-option
-                  v-for="(item1,i) in merchantList"
-                  :key="item1.id"
-                  :label="item1.remark ? (item1.merchantName+'（'+item1.remark+'）') : (item1.merchantName+'（--）')"
-                  :value="item1.id"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="商户号编号" :label-width="formLabelWidth">
-              <el-input v-model="item.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
-                        style="width: 300px" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="交易类型" :label-width="formLabelWidth">
-              <el-select v-model="item.transactionType" multiple placeholder="请选择交易类型" style="width: 300px">
-                <el-option label="会员充值" value="1"></el-option>
-                <el-option label="便利店" value="2"></el-option>
-                <el-option label="积分商城" value="3"></el-option>
-                <el-option label="油品" value="4"></el-option>
-                <el-option label="油品+便利店组合收款" value="5"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="油号-油枪" :label-width="formLabelWidth" v-if="item.transactionType.includes('4')">
-              <el-select v-model="item.oilGunId" multiple collapse-tags placeholder="请选择油号-油枪" style="width: 300px">
-                <el-option
-                  v-for="item1 in oilGunList"
-                  :key="item1.id"
-                  :label="item1.oilNumber+'-'+item1.gunName"
-                  :value="item1.id+''"></el-option>
-              </el-select>
-            </el-form-item>
-          </div>
-          <i class="el-icon-delete" style="font-size: 28px;margin-left: 15px" @click="deleteDoxlist(index)"></i>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="addRule = false">取 消</el-button>
-        <el-button type="primary" @click="submitAddRule">确 定</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="启用" :visible.sync="Enable" width="650px">
-      <el-form :model="formRule">
-        <el-form-item label="开始时间" required>
-          <div style="display: flex;align-items: center;">
-            <el-form-item prop="date1">
-              <el-date-picker type="datetime" placeholder="选择日期" v-model="formRule.startTime" value-format="yyyy-MM-dd HH:mm:ss"
-                              style="width: 100%;"></el-date-picker>
-            </el-form-item>
-            <div style="width: 15px"></div>
-<!--            <el-form-item prop="date2">-->
-<!--              <el-time-picker placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-time-picker>-->
-<!--            </el-form-item>-->
-          </div>
-          <div style="margin-left: 80px">启用成功后其他规则的规则状态变为停用！</div>
-
-
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="Enable = false">取 消</el-button>
-        <el-button type="primary" @click="submitEnable('qy')">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--    <div style="width: 100%;display: flex">-->
-    <!--      <el-alert-->
-    <!--        title="说明"-->
-    <!--        type="error"-->
-    <!--        description="为了保证加油站商户日常在线支付业务的稳定性，来个油惠目前支持多通道支付-->
-    <!--                      可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题-->
-    <!--                      加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务"-->
-    <!--        :closable="false"-->
-    <!--      >-->
-    <!--      </el-alert>-->
-
-    <!--      <div style="width: 150%;display: flex;justify-content: right">-->
-    <!--        <div class="mingc">功能状态</div>-->
-    <!--        <el-switch-->
-    <!--          v-model="value1"-->
-    <!--          @change="changeStatus1"-->
-    <!--        >-->
-    <!--        </el-switch>-->
-    <!--      </div>-->
-    <!--    </div>-->
-    <!--    <div style="margin-top: 20px"><el-button type="primary" icon="el-icon-plus" v-hasPermi="['Merchant:add']" @click="addMerchant">添加商户信息</el-button></div>-->
-    <!--    <div class="content-box">-->
-    <!--&lt;!&ndash;      <el-card class="box-card" shadow="hover" v-for="(item,index) in 10" :key="index">&ndash;&gt;-->
-    <!--&lt;!&ndash;        <div slot="header" class="clearfix">&ndash;&gt;-->
-    <!--&lt;!&ndash;          <span>卡片名称</span>&ndash;&gt;-->
-    <!--&lt;!&ndash;          <el-button style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>&ndash;&gt;-->
-    <!--&lt;!&ndash;        </div>&ndash;&gt;-->
-    <!--&lt;!&ndash;        <div>商户编号:1861975</div>&ndash;&gt;-->
-    <!--&lt;!&ndash;      </el-card>&ndash;&gt;-->
-    <!--      <el-card class="box-card" shadow="hover" v-for="item in merchantList" :key="item.id">-->
-    <!--        <div slot="header" class="clearfix">-->
-    <!--          <span><dict-tag :options="dict.type.payment_channel" :value="item.merchantName"/></span>-->
-    <!--          <el-button v-if="item.isUse=='0'"-->
-    <!--                     @click="editStatus(item,1)"-->
-    <!--                     style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>-->
-    <!--          <el-tag v-else effect="dark" type="success" style="float: right">当前使用中</el-tag>-->
-    <!--        </div>-->
-    <!--        <div>商户编号: {{ item.mchntCd }}</div>-->
-    <!--        <div style="margin-top: 5px;display: flex;justify-content: space-between">-->
-    <!--          <span>-->
-    <!--            备注: <span style="color: #00afff;margin-left: 3px" @click="editRemark(item.id)">{{ item.remark ? item.remark : "&#45;&#45;" }}</span>-->
-    <!--          </span>-->
-    <!--          <span>-->
-    <!--            <el-button-->
-    <!--              size="mini"-->
-    <!--              type="text"-->
-    <!--              icon="el-icon-edit"-->
-    <!--              @click="handleUpdate(item)"-->
-    <!--              v-hasPermi="['Merchant:edit']"-->
-    <!--            >修改</el-button>-->
-    <!--            <el-button-->
-    <!--              size="mini"-->
-    <!--              type="text"-->
-    <!--              icon="el-icon-delete"-->
-    <!--              @click="handleDelete(item)"-->
-    <!--              v-hasPermi="['Merchant:delete']"-->
-    <!--            >删除</el-button>-->
-    <!--          </span>-->
-    <!--        </div>-->
-    <!--      </el-card>-->
-    <!--    </div>-->
-    <!--    <el-divider></el-divider>-->
-    <!--    <div class="cont-box">-->
-    <!--      <div style="width: 40%">-->
-    <!--        <el-alert-->
-    <!--          title="使用说明"-->
-    <!--          type="error"-->
-    <!--          description="添加/编辑对应的规则->规则配置正常->发布规则->规则生效-->
-    <!--注意:功能状态启用且通道规则发布生效后当前功能才有效,否则使用系统单商户号模式"-->
-    <!--          :closable="false"-->
-    <!--        >-->
-    <!--        </el-alert>-->
-    <!--      </div>-->
-
-    <!--      <div style="display: flex;align-items: center">-->
-    <!--        <div class="mingc">规则周期</div>-->
-    <!--        <el-radio-group v-model="labelPosition" @input="ruleCycle == labelPosition" size="small">-->
-    <!--          <el-radio-button label="permanent">永久</el-radio-button>-->
-    <!--          <el-radio-button label="singleDay">单日</el-radio-button>-->
-    <!--        </el-radio-group>-->
-    <!--        <div class="mingc">功能状态</div>-->
-    <!--        <el-switch-->
-    <!--          v-model="value"-->
-    <!--          @change="changeStatus"-->
-    <!--        >-->
-    <!--        </el-switch>-->
-    <!--      </div>-->
-    <!--    </div>-->
-
-    <!--    <div class="cont-box" >-->
-    <!--      <div><el-button type="primary" icon="el-icon-plus"-->
-    <!--                      v-hasPermi="['payment:add']" @click="addOil">添加规则</el-button></div>-->
-    <!--      <div><el-button type="success" icon="el-icon-s-promotion" @click="open">发布规则</el-button></div>-->
-    <!--    </div>-->
-    <!--    <div class="hangbox" v-for="(item,index) in oilConfigList" :key="item.id">-->
-    <!--      <div>{{index + 1}}.通道</div>-->
-    <!--      <div class="jiaong">{{ item.merchantName }}({{ item.remark }})</div>-->
-    <!--      <div> 商户号 </div>-->
-    <!--      <div class="jiaong">{{ item.mchntCd }}</div>-->
-    <!--      <div> 交易占比 </div>-->
-    <!--      <div class="jiaong"> {{ item.proportion }} </div>-->
-    <!--      <div style="margin-right: 20px"> %更换支付通道   </div>-->
-    <!--      <el-button type="primary" icon="el-icon-edit"-->
-    <!--                 v-hasPermi="['payment:edit']" @click="editOilConfig(item.id)">编辑</el-button>-->
-    <!--      <el-button type="danger" icon="el-icon-close"-->
-    <!--                 v-hasPermi="['payment:delete']" @click="deleteOilConfig(item.id)">删除</el-button>-->
-    <!--    </div>-->
-    <!--    <div class="hsize">注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效</div>-->
-
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%">
-      <el-form :model="form1" ref="form1" :rules="rules">
-        <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">
-          <el-select
-            v-model="form1.merchantName"
-            placeholder="全部"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.payment_channel"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="商户号" :label-width="formLabelWidth" prop="mchntCd">
-          <el-input v-model="form1.mchntCd" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="备注" :label-width="formLabelWidth" prop="remark">
-          <el-input v-model="form1.remark" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitMerchant">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
-      <span>请输入备注信息</span>
-      <el-input placeholder="请输入备注信息" style="margin-top: 20px"
-                v-model="merchantConfig.remark"
-                clearable>
-      </el-input>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="show = false">取 消</el-button>
-        <el-button type="primary" @click="submitRemark">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <!--    编辑通道规则-->
-    <el-dialog :title="title" :visible.sync="dialogFormVisible"
-               width="30%">
-      <el-form :model="form" ref="form">
-
-        <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
-          <el-select v-model="form.merchConfigId"
-                     @change="changeMerch"
-                     :disabled="isDis" placeholder="请选择商户信息" style="width: 100%">
-            <el-option
-              v-for="item in merchantList" :key="item.id"
-              :label="item.merchantName"
-              :value="item.id">
-              <span style="float: left">
-                <dict-tag :options="dict.type.payment_channel" :value="item.merchantName"/>
-              </span>
-              <span style="color: #00ff80">({{ item.remark ? item.remark : "--" }})</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mchntCd }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="商户号" :label-width="formLabelWidth">
-          <el-input v-model="form.mchntCd" disabled autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="交易占比" :label-width="formLabelWidth">
-          <el-input v-model="form.proportion" autocomplete="off">
-            <template slot="append">%</template>
-          </el-input>
-          <div>交易占比满足规则后切换到下一个支付通道</div>
-        </el-form-item>
-        <!--        <el-form-item label="参与次数" :label-width="formLabelWidth">-->
-        <!--          <el-radio-group v-model="form.resource" >-->
-        <!--            <el-radio label="不固定次数"></el-radio>-->
-        <!--            <el-radio label="固定次数"></el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--          <div>是否限制当前配置在生效期间内的参与次数</div>-->
-        <!--        </el-form-item>-->
-
-        <!--        <el-form-item label="排序" :label-width="formLabelWidth">-->
-        <!--          <el-input-number v-model="form.num" controls-position="right"  :min="1" :max="100"></el-input-number>-->
-        <!--          <div>数值越大顺序越在前</div>-->
-        <!--        </el-form-item>-->
-
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="clearOil">取 消</el-button>
-        <el-button type="primary" @click="submitOilConfig">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import {
-  addMerchantApi, deleteMerchant,
-  editMerchant,
-  editMerchantRemark,
-  listMerchant,
-  listMerchant2,
-  merchantInfo
-} from "@/api/payConfig/merchantconfig";
-import {
-  addOilConfig,
-  delOilConfig,
-  editOilConfig,
-  isOpenOilConfig,
-  listOilConfig,
-  oilConfigInfo
-} from "@/api/payConfig/oilconfig";
-import {addUser, getUserMobile, updateUser} from "@/api/staff/user/user";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-import {
-  addRuleConfig,
-  deleteRuleConfig,
-  editRuleConfig, enableRuleConfig,
-  getOilGunList,
-  getRuleConfig,
-  listRuleConfig
-} from "@/api/payConfig/ruleConfig";
-
-export default {
-  dicts: ['payment_channel'],
-  name: 'peizhi',
-  props: ["id","deptId"],
-
-  data() {
-    return {
-      ruleForm: [],
-      Enable: false,
-      SeparateAccounts: 1,
-      addRule: false,
-      Ruletitle: '',
-      addMerchants: false,
-      addMerchantTitile: '',
-      // 是否禁用
-      isDis: false,
-      // 商户配置信息
-      merchantList: [],
-      // 商品规则配置信息
-      oilConfigList: [],
-      // 规则周期
-      ruleCycle: "singleDay",
-      form: {
-        name: '',
-        deptId: '',
-        date1: '',
-        date2: '',
-        num: 1,
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: '',
-        boxlist: [],
-      },
-      formRule: {
-        ruleList:[],
-        ruleType:1,
-      },
-      deptListSelect: [],
-      form1: {},
-      oilGunList:[],
-      formLabelWidth: '100px',
-      dialogFormVisible: false,
-      dialogVisible: false,
-      show: false,
-      value: false,
-      value1: true,
-      labelPosition: 'singleDay',
-      title: "",
-      boxlist: [],
-      merchantConfig: {},
-      tableData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄',
-        PaymentChannel: '富有',
-        PaymentNum: '00004879449874854',
-        price: '1587461740.00',
-        status: '正在使用',
-        remark: '',
-        founder: 'xxxx',
-      }, {
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄',
-        PaymentChannel: '富有',
-        PaymentNum: '00004879449874854',
-        price: '1587461740.00',
-        status: '正在使用',
-        remark: '',
-        founder: 'xxxx',
-      }, {
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄',
-        PaymentChannel: '富有',
-        PaymentNum: '00004879449874854',
-        price: '1587461740.00',
-        status: '正在使用',
-        remark: '',
-        founder: 'xxxx',
-      }, {
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄',
-        PaymentChannel: '富有',
-        PaymentNum: '00004879449874854',
-        price: '1587461740.00',
-        status: '正在使用',
-        remark: '',
-        founder: 'xxxx',
-      },],
-      tableData1: [{
-        date: '2016-05-02',
-        name: '按交易类型分账',
-        address: 'xxxxxxxxxxxxxxxxxxx',
-        RuleName: '规则名字',
-        PaymentNum: '00004879449874854',
-        price: '1587461740.00',
-        status: true,
-        remark: '',
-        founder: 'xxxx',
-      }, {
-        id: 2,
-        date: '2016-05-04',
-        name: '王小虎',
-        address: 'xxxxxxxxxxxxxxxxxxx',
-      }, {
-        id: 3,
-        date: '2016-05-01',
-        name: '王小虎',
-        address: 'xxxxxxxxxxxxxxxxxxx',
-
-      }, {
-        id: 4,
-        date: '2016-05-03',
-        name: '王小虎',
-        address: 'xxxxxxxxxxxxxxxxxxx',
-      }],
-      rules: {
-        merchantName: [
-          {required: true, message: '请选择支付通道', trigger: 'blur'},
-        ],
-        mchntCd: [
-          {required: true, message: '请填写商户号', trigger: 'blur'},
-        ],
-        deptId: [
-          {required: true, message: '请选择机构信息', trigger: 'blur'},
-        ],
-        ruleName: [
-          {required: true, message: '请输入规则名称', trigger: 'blur'},
-        ],
-      }
-    }
-  },
-  created() {
-    this.getList();
-    this.selectChildByDeptIdApi()
-    this.getOilGunList()
-  },
-  methods: {
-    submitEnable(val){
-      this.formRule.status = val
-      enableRuleConfig(this.formRule).then(res => {
-        if (res.data === 1) {
-          this.$modal.msgSuccess("启用成功")
-          this.getList()
-          this.Enable = false
-        }else {
-          this.$modal.msgError("启用失败，请确保交易占比相加满足百分之百")
-        }
-      })
-    },
-    // 确定信息
-    submitAddRule(){
-      this.$refs["formRule"].validate(valid => {
-        if (this.formRule.ruleType == 2) {
-          let typeList = []
-          let oilGunIds = []
-          this.formRule.ruleList.forEach(item => {
-            if (item.oilGunId) {
-              oilGunIds.push(...item.oilGunId)
-            }
-            if (item.transactionType) {
-              typeList.push(...item.transactionType)
-            }
-          })
-          typeList = typeList.filter((item, index, arr) => arr.indexOf(item) === index);
-          oilGunIds = oilGunIds.filter((item, index, arr) => arr.indexOf(item) === index);
-          if (typeList.length < 5) {
-            this.$message.error("请确保交易类型全部选择")
-            return
-          }
-          if (oilGunIds.length < this.oilGunList.length) {
-            this.$message.error("请确保油枪号全部选择")
-            return;
-          }
-        }else {
-          let proportion = 0
-          this.formRule.ruleList.forEach(item => {
-            if (item.proportion) {
-              proportion += Number(item.proportion)
-            }
-          })
-          console.log(proportion)
-          if (proportion!=100){
-            this.$message.error("请确保交易占比相加为百分之百")
-            return;
-          }
-        }
-        if (valid) {
-          this.formRule.ruleList.forEach(item => {
-            if (item.oilGunId){
-              item.oilGunId = item.oilGunId.toString()
-            }
-            if (item.transactionType){
-              item.transactionType = item.transactionType.toString()
-            }
-          })
-          if (this.formRule.id) {
-            editRuleConfig(this.formRule).then(res => {
-              if (res.data === 1) {
-                this.$modal.msgSuccess("修改成功")
-                this.getList()
-                this.addRule = false
-              }else {
-                this.$modal.msgError("规则名称不可重复")
-              }
-            })
-          } else {
-            this.formRule.storeId = this.id
-            this.formRule.deptId = this.deptId
-            addRuleConfig(this.formRule).then(res => {
-              if (res.data == 1) {
-                this.$modal.msgSuccess("添加成功");
-                this.getList()
-                this.addRule = false
-              } else {
-                this.$modal.msgError("添加失败，规则名称不可重复")
-              }
-            })
-          }
-        }
-      })
-    },
-    // 获取油枪列表信息
-    getOilGunList(){
-      getOilGunList({storeId:this.id}).then(res => {
-        this.oilGunList = res.data.records
-      })
-    },
-    // 查询
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.deptListSelect = res.data
-      })
-    },
-    chooseMerchConfig(val,index){
-      this.merchantList.forEach(item => {
-        if (item.id == val){
-          this.formRule.ruleList[index].mchntCd = item.mchntCd
-        }
-      })
-    },
-    addboxlsit() {
-
-      let data = {
-        storeId: this.id,
-        merchConfigId: '',
-        transactionType: '',
-        proportion: '',
-        oilGunId: '',
-      }
-      this.formRule.ruleList.push(data)
-    },
-    deleteDoxlist(index) {
-      this.formRule.ruleList.splice(index, 1)
-    },
-    addRules() {
-      this.Ruletitle = '新增规则'
-      this.addRule = true
-      this.formRule = { ruleList:[],ruleType:1 }
-      this.formRule.deptId = this.deptId
-    },
-    addMerchantShow() {
-      this.addMerchantTitile = '新增商户信息'
-      this.addMerchants = true
-      this.form = {}
-      this.form.deptId = this.deptId
-    },
-    editRule(data){
-      getRuleConfig(data.id).then(res => {
-        this.Ruletitle = '修改商户信息'
-        this.addRule = true
-        this.formRule = res.data
-        this.formRule.ruleList.forEach(item => {
-          if (item.oilGunId){
-            item.oilGunId = item.oilGunId.split(",")
-          }
-          if (item.transactionType){
-            item.transactionType = item.transactionType.split(",")
-          }
-        })
-      })
-    },
-    EnableRule(data){
-      getRuleConfig(data.id).then(res => {
-        this.Ruletitle = '修改商户信息'
-        this.Enable = true
-        this.formRule = res.data
-      })
-    },
-    deleteRule(data){
-      let name = data.ruleName
-      this.$modal.confirm('是否确认删除"' + name + '"的支付配置信息？').then(function () {
-        return deleteRuleConfig(data.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    editMerchant(data) {
-      // data用于请求接口
-      merchantInfo(data.id).then(res => {
-        this.addMerchantTitile = '修改商户信息'
-        this.addMerchants = true
-        this.form = res.data
-      })
-    },
-    handleUpdate(data) {
-      merchantInfo(data.id).then(res => {
-        this.title = "商户信息"
-        this.dialogVisible = true
-        this.form1 = res.data
-      })
-    },
-    handleDelete(data) {
-      let name = data.remark ? data.merchantName + "(" + data.remark + ")" : data.merchantName
-      this.$modal.confirm('是否确认删除"' + name + '"的支付配置信息？').then(function () {
-        return deleteMerchant(data.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    // 修改商户备注信息
-    submitRemark() {
-      editMerchantRemark(this.merchantConfig).then(res => {
-        if (res.data === 1) {
-          this.$modal.msgSuccess("修改成功")
-          this.getList()
-          this.show = false
-        }
-      })
-    },
-    // 打开修改商户备注信息对话框
-    editRemark(id) {
-      this.title = "备注"
-      this.show = true
-      merchantInfo(id).then(res => {
-        this.merchantConfig = res.data
-      })
-    },
-    submitMerchant() {
-      this.$refs["formAdd"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-            editMerchantRemark(this.form).then(res => {
-              if (res.data === 1) {
-                this.$modal.msgSuccess("修改成功")
-                this.getList()
-                this.addMerchants = false
-              }else {
-                this.$modal.msgError("商户编号不可重复")
-              }
-            })
-          } else {
-            this.form.storeId = this.id
-            addMerchantApi(this.form).then(res => {
-              if (res.data == 1) {
-                this.$modal.msgSuccess("添加成功");
-                this.getList()
-                this.addMerchants = false
-              } else if (res.data == 0) {
-                this.$modal.msgError("添加失败，当前通道未配置")
-              }else {
-                this.$modal.msgError("商户编号不可重复")
-              }
-            })
-          }
-        }
-      })
-    },
-    // 添加商户号信息
-    addMerchant() {
-      this.title = "添加商户信息"
-      this.dialogVisible = true
-      this.form1 = {}
-    },
-    // 删除支付配置信息
-    deleteOilConfig(id) {
-      this.$confirm('确认删除此通道规则吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        delOilConfig(id).then(response => {
-          this.$message({
-            type: 'success',
-            message: '规则数据删除成功'
-          });
-          this.getList();
-          this.value1 = true;
-          this.changeStatus1();
-        })
-      }).catch(() => {
-      });
-    },
-    // 添加商户信息
-    addOil() {
-      this.title = "添加商户规则"
-      this.dialogFormVisible = true;
-      this.form = {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        num: 1,
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      }
-    },
-    // 选择下拉商户信息
-    changeMerch(val) {
-      this.merchantList.forEach(item => {
-        if (item.id == val) {
-          this.form.mchntCd = item.mchntCd
-        }
-      })
-    },
-    // 提交按钮
-    submitOilConfig() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.form.storeId = this.id
-          if (this.form.id) {
-            editOilConfig(this.form).then(response => {
-              this.$modal.msgSuccess("修改通道成功");
-              this.getList();
-              this.dialogFormVisible = false;
-              this.isDis = false;
-            });
-          } else {
-            addOilConfig(this.form).then(response => {
-              if (response.data == 1) {
-                this.$modal.msgSuccess("新增通道成功");
-                this.getList();
-                this.dialogFormVisible = false;
-                this.isDis = false;
-              } else {
-                this.$modal.msgError("已存在当前通道商户号的规则");
-              }
-            })
-          }
-        }
-      });
-    },
-    // 取消按钮
-    clearOil() {
-      this.dialogFormVisible = false;
-      this.isDis = false;
-    },
-    // 修改支付配置信息
-    editOilConfig(id) {
-      this.title = "修改商户规则"
-      this.isDis = true;
-      this.dialogFormVisible = true;
-      oilConfigInfo(id).then(response => {
-        this.form = response.data
-      })
-    },
-    // 修改启用状态
-    changeStatus() {
-      if (this.value) {
-        isOpenOilConfig({isOpen: 1, ruleCycle: this.ruleCycle, storeId: this.id}).then(response => {
-          if (response.data != 1) {
-            this.$message({
-              type: 'error',
-              message: '支付通道切换失败,请确保交易占比相加满足百分之百'
-            });
-            this.value = false;
-            this.value1 = true;
-          } else {
-            this.$message({
-              type: 'success',
-              message: '发布成功!'
-            });
-            this.value1 = false;
-          }
-        })
-      } else {
-        isOpenOilConfig({isOpen: 0, ruleCycle: this.ruleCycle, storeId: this.id}).then(response => {
-          this.value1 = true;
-        })
-      }
-    },
-    changeStatus1() {
-      if (this.value1) {
-        isOpenOilConfig({isOpen: 0, ruleCycle: this.ruleCycle, storeId: this.id}).then(response => {
-          this.value = false;
-        })
-      } else {
-        isOpenOilConfig({isOpen: 1, ruleCycle: this.ruleCycle, storeId: this.id}).then(response => {
-          if (response.data != 1) {
-            this.$message({
-              type: 'error',
-              message: '支付通道切换失败,请确保交易占比相加满足百分之百'
-            });
-            this.value = false;
-            this.value1 = true;
-          } else {
-            this.$message({
-              type: 'success',
-              message: '发布成功!'
-            });
-            this.value = true;
-          }
-        })
-      }
-    },
-    // 修改商户使用状态
-    editStatus(data, isUse) {
-      this.$confirm('确定将当前支付配置切换为商户号(' + data.mchntCd + ')吗?切换后实时生效!', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        data.isUse = isUse
-        editMerchant(data).then(response => {
-          this.getList();
-          this.$message({
-            type: 'success',
-            message: '支付通道切换成功,已实时切换为商户号(' + data.mchntCd + ')'
-          });
-        })
-      }).catch(() => {
-      });
-    },
-    // 获取商户列表信息
-    getList() {
-      listMerchant2({storeId: this.id}).then(response => {
-        this.merchantList = response.data;
-        this.merchantList.forEach(item => {
-          if (item.isOpenRule == "1") {
-            this.value1 = false;
-            this.value = true;
-          }
-        })
-      })
-      listRuleConfig({storeId: this.id}).then(response => {
-        this.tableData1 = response.data;
-      })
-    },
-    open() {
-      this.$confirm('此操作会发布件, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.value1 = false;
-        this.changeStatus1()
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消发布'
-        });
-      });
-    }
-  }
-
-
-}
-</script>
-
-<style scoped>
-.box-centenr {
-  width: 100%;
-  background: #f9f9f9;
-  box-sizing: border-box;
-  padding: 20px;
-}
-
-.new-box {
-  width: 100%;
-  background: #fff;
-  box-sizing: border-box;
-  padding: 20px;
-}
-
-.n-top-box {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 10px;
-}
-
-.d-s {
-  display: flex;
-  align-items: center;
-}
-
-.gang {
-  width: 2px;
-  height: 12px;
-  background: #FF770F;
-  margin-right: 5px;
-
-}
-
-.title_ {
-  font-weight: 600;
-  font-size: 14px;
-  color: #333333;
-  margin-right: 10px;
-}
-
-.size_ {
-  font-weight: 400;
-  font-size: 12px;
-  color: #666666;
-}
-
-.o-button {
-  box-sizing: border-box;
-  padding: 7px 5px;
-  background: linear-gradient(180deg, #FF8648 0%, #FFA360 100%);
-  border-radius: 4px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  color: #fff;
-  font-weight: 400;
-  font-size: 14px;
-  cursor: pointer;
-}
-
-.content-box {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 20px;
-}
-
-.box-card {
-  width: 24%;
-  margin-right: 15px;
-  margin-bottom: 15px;
-}
-
-.cont-box {
-  display: flex;
-  width: 100%;
-  justify-content: space-between;
-  margin: 20px 0px;
-}
-
-.hangbox {
-  width: 100%;
-  border-bottom: 1px solid #f4f5f6;
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  padding: 15px 0px;
-}
-
-.jiaong {
-  text-align: center;
-  box-sizing: border-box;
-  padding: 5px 20px;
-  background: #F2F6FC;
-  color: #409EFF;
-  font-weight: bold;
-  margin: 0px 5px;
-  border-radius: 4px;
-
-}
-
-.mingc {
-  margin: 0px 10px;
-  color: #999;
-}
-
-.hsize {
-  color: #999;
-}
-
-.xz_box {
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  color: #999999;
-  margin-right: 15px;
-  cursor: pointer;
-}
-
-.active {
-  color: #FF9655 !important;
-}
-
-.list-box {
-  border: 1px solid #D1D1D1;
-  border-radius: 8px;
-  padding: 20px;
-  box-sizing: border-box;
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/components/Service/peizhi.vue b/fuintAdmin_zt/src/views/components/Service/peizhi.vue
deleted file mode 100644
index 4da01cc98..000000000
--- a/fuintAdmin_zt/src/views/components/Service/peizhi.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-    <div>
-      <div style="width: 40%">
-        <el-alert
-          title="警告提示的文案"
-          type="error"
-          description="为了保证加油站商户日常在线支付业务的稳定性，油客里里目前支持多通道支付
-可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题
-加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务"
-          :closable="false"
-        >
-        </el-alert>
-      </div>
-      <div class="content-box">
-        <el-card class="box-card" shadow="hover" v-for="(item,index) in 10" :key="index">
-          <div slot="header" class="clearfix">
-            <span>卡片名称</span>
-            <el-button style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>
-          </div>
-        <div>商户编号:1861975</div>
-        </el-card>
-      </div>
-      <el-divider></el-divider>
-      <div class="cont-box">
-        <div style="width: 40%">
-          <el-alert
-            title="使用说明"
-            type="error"
-            description="添加/编辑对应的规则->规则配置正常->发布规则->规则生效
-注意:功能状态启用且通道规则发布生效后当前功能才有效,否则使用系统单商户号模式"
-            :closable="false"
-          >
-          </el-alert>
-        </div>
-
-        <div style="display: flex;align-items: center">
-          <div class="mingc">规则周期</div>
-          <el-radio-group v-model="labelPosition" size="small">
-            <el-radio-button label="left">永久</el-radio-button>
-            <el-radio-button label="right">单日</el-radio-button>
-          </el-radio-group>
-          <div class="mingc">功能状态</div>
-          <el-switch
-            v-model="value"
-            >
-          </el-switch>
-        </div>
-      </div>
-
-      <div class="cont-box" >
-        <div><el-button type="primary" icon="el-icon-plus" @click="dialogFormVisible = true">添加规则</el-button></div>
-        <div><el-button type="success" icon="el-icon-s-promotion" @click="open">发布规则</el-button></div>
-      </div>
-      <div class="hangbox" v-for="(item,index) in 3" :key="index">
-        <div>{{index + 1}}.通道</div>
-        <div class="jiaong"> 名称 </div>
-        <div> 商户号 </div>
-        <div class="jiaong"> 1231213213212</div>
-        <div> 交易满 </div>
-        <div class="jiaong"> 2 </div>
-        <div> 笔更换支付通道 参与次数  </div>
-        <div class="jiaong"> 不固定次数 </div>
-
-        <el-button type="primary" icon="el-icon-edit">编辑</el-button>
-        <el-button type="danger" icon="el-icon-close">删除</el-button>
-      </div>
-      <div class="hsize">注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效</div>
-
-      <el-dialog title="编辑通道规则" :visible.sync="dialogFormVisible">
-        <el-form :model="form">
-
-          <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
-            <el-select v-model="form.region" placeholder="请选择活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="商户号" :label-width="formLabelWidth">
-            <el-input v-model="form.name" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="消费满笔数" :label-width="formLabelWidth">
-            <el-input v-model="form.name" autocomplete="off"></el-input>
-            <div>消费笔数满足后切换到下一个支付通道</div>
-          </el-form-item>
-          <el-form-item label="参与次数" :label-width="formLabelWidth">
-            <el-radio-group v-model="form.resource" >
-              <el-radio label="不固定次数"></el-radio>
-              <el-radio label="固定次数"></el-radio>
-            </el-radio-group>
-            <div>是否限制当前配置在生效期间内的参与次数</div>
-          </el-form-item>
-
-          <el-form-item label="排序" :label-width="formLabelWidth">
-            <el-input-number v-model="form.num" controls-position="right"  :min="1" :max="100"></el-input-number>
-            <div>数值越大顺序越在前</div>
-          </el-form-item>
-
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-        </div>
-      </el-dialog>
-
-    </div>
-</template>
-
-<script>
-  export default {
-    name: 'peizhi',
-    data(){
-      return{
-        form: {
-          name: '',
-          region: '',
-          date1: '',
-          date2: '',
-          num: 1,
-          delivery: false,
-          type: [],
-          resource: '',
-          desc: ''
-        },
-        formLabelWidth: '120px',
-        dialogFormVisible:false,
-        value:'false',
-        labelPosition: 'right',
-      }
-    },
-    methods:{
-      open() {
-        this.$confirm('此操作会发布件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '发布成功!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消发布'
-          });
-        });
-      }
-    }
-
-
-  }
-</script>
-
-<style scoped>
-.content-box{
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 20px;
-}
-  .box-card{
-    width: 24%;
-    margin-right: 15px;
-    margin-bottom: 15px;
-  }
-  .cont-box{
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    margin: 20px 0px;
-  }
-  .hangbox{
-    width: 100%;
-    border-bottom: 1px solid #f4f5f6;
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
-    padding: 15px 0px;
-  }
-  .jiaong{
-    text-align: center;
-    box-sizing: border-box;
-    padding: 5px 20px;
-    background: #F2F6FC;
-    color: #409EFF;
-    font-weight: bold;
-    margin: 0px 5px;
-    border-radius: 4px;
-
-  }
-  .mingc{
-    margin: 0px 10px;
-    color: #999;
-  }
-  .hsize{
-    color: #999;
-  }
-
-
-</style>
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
deleted file mode 100644
index a631016ac..000000000
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ /dev/null
@@ -1,575 +0,0 @@
-<template>
-  <div class="app-containers">
-    <div class="bai-box"  style="margin-top: 20px" >
-     <div class="top-box">
-       <div class="d-s">
-         <el-input v-model="input" placeholder="请输入内容" style="width: 240px;margin-right: 15px"></el-input>
-         <el-select v-model="value" placeholder="请选择状态">
-           <el-option
-             v-for="item in options"
-             :key="item.value"
-             :label="item.label"
-             :value="item.value">
-           </el-option>
-         </el-select>
-       </div>
-       <div>
-         <el-button
-           type="primary"
-           icon="el-icon-search"
-           @click="handleQuery"
-         >搜索</el-button>
-         <el-button
-           icon="el-icon-refresh-right"
-           @click="resetQuery"
-         >重置</el-button>
-         <el-button
-           type="primary"
-           icon="el-icon-plus"
-           @click="handleAdd"
-         >新增员工</el-button>
-
-       </div>
-
-     </div>
-
-      <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-        <el-table-column
-          type="index"
-          align="center"
-          label="序号"
-          width="50">
-        </el-table-column>
-        <el-table-column label="用户姓名" width="140" align="center" prop="realName" />
-        <el-table-column label="用户角色"  width="140" align="center" prop="dutyName" >
-          <template slot-scope="scope">
-            <span>{{scope.row.dutyName || "--"}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="登录账号" align="center" prop="mobile" />
-        <el-table-column label="员工状态" align="center" width="80" prop="status">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              active-value="qy"
-              inactive-value="jy"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="一键加油" align="center" prop="isRefuel">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.display" :value="scope.row.isRefuel"/>
-          </template>
-        </el-table-column>
-<!--        <el-table-column label="收款通知" align="center" prop="notice">-->
-<!--          <template slot-scope="scope">-->
-<!--            <dict-tag :options="dict.type.notice" :value="scope.row.notice"/>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column label="创建时间" align="center" prop="createTime" >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-
-            <el-form-item label="姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" style="width: 270px"/>
-            </el-form-item>
-
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30" style="width: 270px"/>
-            </el-form-item>
-
-
-            <el-form-item label="角色组" prop="roleId">
-              <el-select v-model="form.roleId" placeholder="请选择角色" style="width: 270px">
-                <el-option
-                  v-for="item in roleList"
-                  :key="item.dutyId+''"
-                  :label="item.dutyName"
-                  :value="item.dutyId+''"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="账号状态" prop="status">
-              <el-select v-model="form.status"style="width: 270px">
-                <el-option
-                  v-for="dict in dict.type.zhzt"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-              <br/>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                placement="bottom">
-                <div slot="content"> 状态禁用后,当前账号则无法进行<br/>登录和操作</div>
-                <span>状态禁用后,当前账号则无法进行登...</span>
-              </el-tooltip>
-            </el-form-item>
-
-
-            <el-form-item label="一键加油" prop="isRefuel">
-              <el-select v-model="form.isRefuel" style="width: 270px">
-                <el-option
-                  v-for="dict in dict.type.display"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-              <br/>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                placement="bottom">
-                <div slot="content">加油时选择加油员场景使用,选择不显示加油员将无法被指定<br/>(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)</div>
-                <span>加油时选择加油员场景使用,选择...</span>
-              </el-tooltip>
-            </el-form-item>
-
-            <el-form-item label="收款通知" prop="notice">
-              <el-select v-model="form.notice" style="width: 270px">
-                <el-option
-                  v-for="dict in dict.type.notice"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-              <br/>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                placement="bottom">
-                <div slot="content"> 收款成功接收的公众号模板消息通知,需<br/>关注公众号,且本站小程序中会员手机号<br/>信息与当前员工手机号一致 </div>
-                <span>收款成功接收的公众号模板消息...</span>
-              </el-tooltip>
-            </el-form-item>
-
-
-
-<!--        </el-row>-->
-<!--        <el-row>-->
-
-            <el-form-item label="备注信息">
-              <el-input style="width: 270px" v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import {getName} from "../../../utils/fuint";
-  import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
-  import {dutyList} from "@/api/duty/duty";
-  // import {getDuty, listDuty} from "@/api/staff/duty";
-
-  export default {
-    name: "StaffList",
-    dicts: ['ywqx','write_off','display','zhzt','transaction','time_frame','handover','handover_quit',
-      'jbjl','official','notice','special_prem','role'],
-      props: ["id"],
-
-    data() {
-      return {
-        options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-        value: '',
-        input: '',
-        drawer: false,
-        // 标题
-        title: "",
-        // 遮罩层
-        loading: false,
-        // 选中数组
-        ids: [],
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        categoryOptions: [],
-        storeOptions: [],
-        // role:[],
-        posPrem:'',
-        posOptions:[
-          {value: '首页权限',label: '首页权限',children:[{value: '禁用普通收款权限', label: '禁用普通收款权限' },]},
-          {value: '会员储值',label: '会员储值'},
-          {value: '会员实体卡',label: '会员实体卡'},
-          {value: '会员积分',label: '会员积分'},
-          {value: '加油金变动',label: '加油金变动'},
-          {value: '会员卡券',label: '会员卡券'},
-          {value: '会员成长值',label: '会员成长值'},
-        ],
-        props: { multiple: true },
-        appletPrem:'',
-        appletOptions:[
-          {value: '首页权限',label: '首页权限',children:[{value: '女装', label: '女装' },]},
-          {value: '会员储值',label: '会员储值'},
-          {value: '会员实体卡',label: '会员实体卡'},
-        ],
-        writeOff:[],
-        write:[],
-        specialPrem:[],
-        special:[],
-        // 总条数
-        total: 0,
-        // 表格数据
-        list: [],
-        // 是否显示弹出层
-        open: false,
-        // 日期范围
-        dateRange: [],
-        // 默认排序
-        defaultSort: {prop: 'createTime', order: 'descending'},
-        // 角色列表
-        roleList:[],
-        // 表单参数
-        form: {
-          id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'',
-          auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
-          merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
-          transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
-        },
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          realName: '',
-          mobile: '',
-          status: ''
-        },
-        // 表单校验
-        rules: {
-          realName: [
-            { required: true, message: "姓名不能为空", trigger: "blur" },
-            { min: 2, max: 30, message: '姓名长度必须介于 2 和 20 之间', trigger: 'blur' }
-          ],
-          mobile: [
-            { required: true, message: "手机号不能为空", trigger: "blur" },
-            { min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur' }
-          ],
-          roleId: [
-            { required: true, message: "请选择员工角色", trigger: "blur" }
-          ],
-          isRefuel: [
-            { required: true, message: "请选择加油状态", trigger: "blur" }
-          ],
-          pos: [
-            { required: true, message: "请选择员状态", trigger: "blur" }
-          ],
-          transaction: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          notice: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          timeFrame: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          handoverMode: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          handoverPrem: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          handoverOut: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          record: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          merchantStatus: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          screen: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ],
-          status: [
-            { required: true, message: "请选择", trigger: "blur" }
-          ]
-        }
-      };
-    },
-    created() {
-      this.getList();
-      // this.getDuty();
-      // this.getStoreList();
-    },
-    methods: {
-      showDesc(){
-        this.drawer = true;
-      },
-      handleNodeClick1(data) {
-        this.form.posPrem = JSON.stringify(data);
-      },
-      handleNodeClick2(data) {
-        this.form.appletPrem = JSON.stringify(data);
-      },
-      getCheckbox(){
-        this.form.writeOff = this.writeOff.toString();
-        this.form.specialPrem = this.specialPrem.toString();
-      },
-      // 页面跳转
-      toTarget(url) {
-        this.$router.push( { path: url } );
-      },
-      getName,
-      // 查询列表
-      getList() {
-        this.loading = true;
-        this.queryParams.storeId = this.id
-        listStaff(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            this.list = response.data.records;
-            this.total = response.data.total;
-            console.log(response)
-            // response.data.records.forEach(item=>{
-            //   this.categoryOptions.push(item.category)
-            // })
-            this.loading = false;
-          }
-        );
-        // getStaffList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-        //     this.list = response.data.paginationResponse.content;
-        //     this.total = response.data.paginationResponse.totalElements;
-        //     this.categoryOptions = response.data.categoryList;
-        //     this.loading = false;
-        //   }
-        // );
-      },
-      // 查询角色列表
-      getDuty(){
-        listDuty().then(response => {
-          this.role = response.data
-        })
-      },
-      // 店铺列表
-      getStoreList() {
-        listStaff().then(response => {
-            this.storeOptions = response.data.records;
-          }
-        );
-        // searchStore().then(response => {
-        //     this.storeOptions = response.data.storeList;
-        //   }
-        // );
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-        this.handleQuery();
-      },
-      // 状态修改
-      handleStatusChange(row) {
-        let text = row.auditedStatus == "A" ? "启用" : "禁用";
-        this.$modal.confirm('确认要' + text + '"' + row.realName + '"吗？').then(function() {
-          // return updateStaffStatus(row.id, row.auditedStatus);
-          return updateStaff({id:row.id, auditedStatus:row.auditedStatus})
-        }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.auditedStatus = row.auditedStatus === "A" ? "A" : "N";
-        });
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.operId)
-        this.multiple = !selection.length
-      },
-      // 排序触发事件
-      handleSortChange(column, prop, order) {
-        this.queryParams.orderByColumn = column.prop;
-        this.queryParams.isAsc = column.order;
-        this.getList();
-      },
-      // 新增按钮操作
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "新增员工";
-        this.getRoleList1()
-      },
-      // 获取角色信息
-      getRoleList1() {
-        let data = {
-          page:1,
-          pageSize:10000,
-          dutyType:3
-        }
-        dutyList(data).then(res => {
-          this.roleList = res.data.records
-        })
-      },
-      // 表单重置
-      reset() {
-        this.posPrem = '';
-        this.appletPrem = '';
-        this.writeOff = []
-        this.form = {
-          id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'A',
-          auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
-          merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
-          transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
-        };
-        this.resetForm("form");
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 提交按钮
-      submitForm: function() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.form.storeId = this.id;
-            if (!this.form.id) {
-              this.form.posPrem = JSON.stringify(this.form.posPrem);
-              this.form.appletPrem = JSON.stringify(this.form.appletPrem);
-              addStaff(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              updateStaff(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      // 修改按钮操作
-      handleUpdate(row) {
-        this.reset();
-        this.open = true;
-        const id = row.id || this.ids;
-        getStaff(id).then(response => {
-          this.form = response.data;
-          // this.form.category = response.data.staffInfo.category + '';
-          this.open = true;
-          this.title = "编辑员工信息";
-          this.writeOff = this.form.writeOff.split(",");
-          this.specialPrem = this.form.specialPrem.split(",");
-          this.posPrem = JSON.parse(this.form.posPrem);
-          this.appletPrem = JSON.parse(this.form.appletPrem);
-          this.getRoleList1()
-        });
-      },
-      // 删除按钮操作
-      handleDelete(row) {
-        const name = row.realName || this.id;
-        this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-          return delStaff(row.id);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      }
-    }
-  };
-</script>
-
-<style scoped>
-  .app-containers{
-    width: 98%;
-    height: 100%;
-    /* height: 100vh; */
-    background: #f9f9f9;
-    margin: 20px auto;
-  }
-  .bai-box{
-    background: #fff;
-    box-sizing: border-box;
-    padding: 20px;
-  }
-  .pagin-box{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-  }
-  .baoguo{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-    margin-bottom: 20px;
-  }
-  .top-box{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 15px;
-  }
-  .d-s{
-    display: flex;
-    align-items: center;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/components/Service/way.vue b/fuintAdmin_zt/src/views/components/Service/way.vue
deleted file mode 100644
index 524fef8a7..000000000
--- a/fuintAdmin_zt/src/views/components/Service/way.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<script >
-import {getPidInfo, Userlist} from "@/api/system/Site/site";
-import Yearff from "@/views/Site/components/yearff.vue";
-import Beforeff from "@/views/Site/components/before.vue";
-import Afterff from "@/views/Site/components/afterff.vue";
-
-export default {
-  components: {Afterff, Beforeff, Yearff},
-  props:['deptId','id'],
-  data() {
-    return {
-      value: true,
-      storeDeptInfo:{},
-      tableData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1517 弄'
-      }, {
-        date: '2016-05-01',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1519 弄'
-      }, {
-        date: '2016-05-03',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1516 弄'
-      }]
-    }
-  },
-  created() {
-    this.getInfo()
-  },
-  methods:{
-    getInfo(){
-      getPidInfo(this.deptId).then(res => {
-        this.storeDeptInfo = res.data
-      })
-    },
-  }
-}
-</script>
-
-<template>
-    <div class="container-app">
-      <div class="d-s">
-        <div class="left-size">机构名称：</div>
-        <div>{{ storeDeptInfo.deptName || "--" }}</div>
-      </div>
-      <div class="d-s">
-        <div class="left-size">负责人姓名：</div>
-        <div>{{ storeDeptInfo.leaderName || "--" }}</div>
-      </div>
-      <div class="d-s">
-        <div class="left-size">负责人电话：</div>
-        <div>{{ storeDeptInfo.leaderPhone || "--" }}</div>
-      </div>
-      <div class="d-s">
-        <div class="left-size">机构类型：</div>
-        <div v-if="storeDeptInfo.deptType==1">代理商</div>
-        <div v-if="storeDeptInfo.deptType==2">连锁店</div>
-        <div v-if="storeDeptInfo.deptType==3">基本门店</div>
-        <div v-if="storeDeptInfo.deptType==4">三方机构</div>
-      </div>
-      <div class="d-s">
-        <div class="left-size">计费方式：</div>
-        <div v-if="storeDeptInfo.turnoverType==1">无限制</div>
-        <div v-if="storeDeptInfo.turnoverType==2">时间限制</div>
-        <div v-if="storeDeptInfo.turnoverType==3">预付费</div>
-        <div v-if="storeDeptInfo.turnoverType==4">后付费</div>
-        <div v-if="storeDeptInfo.turnoverType==5">年付费</div>
-        <div v-if="storeDeptInfo.turnoverType==6">可创建油站站点数量</div>
-      </div>
-<!--   年付费   -->
-      <yearff v-if="storeDeptInfo.turnoverType==5" :deptId="this.deptId"></yearff>
-<!--    预付费  -->
-      <beforeff v-if="storeDeptInfo.turnoverType==3" :deptId="this.deptId"></beforeff>
-<!--    后付费  -->
-      <afterff v-if="storeDeptInfo.turnoverType==4" :deptId="this.deptId"></afterff>
-<!--    时间限制限制  -->
-      <div class="d-s" v-if="storeDeptInfo.turnoverType==2">
-        <div class="left-size">开始时间：</div>
-        <div>{{ storeDeptInfo.turnoverStartTime }}</div>
-        <div class="left-size">结束时间：</div>
-        <div>{{ storeDeptInfo.turnoverEndTime }}</div>
-      </div>
-<!--    可创建油站站点数量  -->
-      <div class="d-s" v-if="storeDeptInfo.turnoverType==6">
-        <div class="left-size">可创建油站站点数量：</div>
-        <div>{{ storeDeptInfo.storeNum }}</div>
-      </div>
-      <div class="d-s" style="margin-top: 15px">
-        <div class="left-size">机构状态：</div>
-        <div>
-          <el-switch
-            v-model="storeDeptInfo.status"
-            active-value="qy"
-            inactive-value="jy"
-            active-color="#13ce66"
-            inactive-color="#ff4949">
-          </el-switch>
-        </div>
-      </div>
-      <div class="d-s">
-        <div class="left-size">备注：</div>
-        <div>--</div>
-      </div>
-    </div>
-</template>
-
-<style scoped lang="scss">
-.container-app{
-  background: #fff;
-  box-sizing: border-box;
-  padding: 20px;
-  width: 98%;
-  margin: 20px auto;
-}
-.d-s{
-  display: flex;
-  align-items: center;
-  margin-bottom: 25px;
-  font-weight: 600;
-  font-size: 14px;
-  color: #333333;
-}
-.left-size{
-  width: 100px;
-  text-align: right;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/components/charts/chartstwo.vue b/fuintAdmin_zt/src/views/components/charts/chartstwo.vue
deleted file mode 100644
index 1823607d4..000000000
--- a/fuintAdmin_zt/src/views/components/charts/chartstwo.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <div id="chart" style="width: 600px; height: 400px;"></div>
-</template>
-
-<script>
-  import echarts from 'echarts'
-
-  export default {
-    name: 'Chart',
-    mounted() {
-      this.initChart()
-    },
-    methods: {
-      initChart() {
-        const chart = echarts.init(document.getElementById('chart'))
-
-        const option = {
-          title: {
-            text: 'ECharts 示例'
-          },
-          tooltip: {
-            trigger: 'axis'
-          },
-          legend: {
-            data: ['销量']
-          },
-          xAxis: {
-            type: 'category',
-            data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
-          },
-          yAxis: {
-            type: 'value'
-          },
-          series: [
-            {
-              name: '销量',
-              type: 'bar',
-              data: [5, 20, 36, 10, 10, 20]
-            }
-          ]
-        }
-
-        chart.setOption(option)
-      }
-    }
-  }
-</script>
diff --git a/fuintAdmin_zt/src/views/components/charts/index.vue b/fuintAdmin_zt/src/views/components/charts/index.vue
deleted file mode 100644
index a3a7a2264..000000000
--- a/fuintAdmin_zt/src/views/components/charts/index.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-  <div :id="id" :chartType="chartType" :headList="headList" :dataList="dataList" :style="{height:height, width:width}" />
-</template>
-
-<script>
-const serieDataItem = {
-    name: '',
-    type: '',
-    barMaxWidth: 50,
-    barGap: '10%',
-    itemStyle: {
-      borderWidth: 1,
-      borderColor: "#8fa1e6",
-      areaColor: "#b0defa",
-      normal: {
-        color: '#59aff2',
-        label: {
-          show: true,
-          textStyle: {
-            color: '#666666'
-          },
-          position: 'top',
-          formatter(p) {
-            return p.value > 0 ? p.value : ''
-          }
-        }
-      }
-    },
-    data: []
-}
-import * as echarts from 'echarts'
-import resize from './mixins/resize'
-
-export default {
-  mixins: [resize],
-  props: {
-    id: {
-      type: String,
-      default: 'chart'
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    color: {
-      type: String,
-      default: '#00acac'
-    },
-    chartType: {
-      type: String,
-      default: 'bar'
-    },
-    headList: {
-      type: [Array],
-      default: () => []
-    },
-    dataList: {
-      type: [Array],
-      default: () => []
-    },
-    width: {
-      type: String,
-      default: '200px'
-    },
-    height: {
-      type: String,
-      default: '200px'
-    }
-  },
-  data() {
-    return {
-      chart: null,
-      yName: ''
-    }
-  },
-  mounted() {
-    this.initChart()
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  watch: {
-    chartType() {
-      this.initChart()
-    },
-    headList() {
-      this.initChart()
-    }
-  },
-  methods: {
-    initChart() {
-      const app = this
-      this.chart = null
-      this.chart = echarts.init(document.getElementById(this.id))
-      const xData = []
-      if (app.dataList && app.dataList.length > 0) {
-          app.dataList.forEach(function(item) {
-            xData.push(item.name)
-          })
-      }
-      const series = []
-      if (app.headList && app.headList.length > 0) {
-          app.headList.forEach(function(header, index) {
-              const serie = JSON.parse(JSON.stringify(serieDataItem))
-              serie.name = header
-              serie.type = app.chartType
-              serie.itemStyle.normal.color = app.color
-              serie.data = []
-              const valueList = []
-              app.dataList.forEach(function(value) {
-                  valueList.push(value['value' + index])
-              })
-              serie.data = valueList
-              series.push(serie)
-          })
-      }
-
-      app.chart.setOption({
-        backgroundColor: '#FFFFFF',
-        title: {
-          text: app.title,
-          x: 'center',
-          top: '20',
-          textStyle: {
-            color: '#333333',
-            fontSize: '14'
-          },
-          subtextStyle: {
-            color: '#666666',
-            fontSize: '16'
-          }
-        },
-        tooltip: {
-          show: true,
-          trigger: 'axis',
-          axisPointer: {
-            type: 'none',
-            snap: false,
-            label: {
-              margin: 10
-            },
-            textStyle: {
-              color: '#666666'
-            }
-          },
-          triggerOn: 'mousemove',
-          showContent: true,
-          alwaysShowContent: false,
-          borderWidth: 0,
-          confine: false,
-          formatter(p) {
-            return p[0].name + ' : ' + p[0].value
-          }
-        },
-        grid: {
-          left: '5%',
-          right: '5%',
-          borderWidth: 0,
-          top: 60,
-          bottom: 50,
-          textStyle: {
-            color: '#666666'
-          }
-        },
-        legend: {
-          x: 'center',
-          bottom: 'bottom',
-          textStyle: {
-            color: '#666666'
-          },
-          data: this.headList
-        },
-        calculable: true,
-        xAxis: [{
-          type: 'category',
-          axisLine: {
-            lineStyle: {
-              color: '#666666'
-            }
-          },
-          splitLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          splitArea: {
-            show: false
-          },
-          axisLabel: {
-            interval: 0
-          },
-          data: xData
-        }],
-        yAxis: [{
-          type: 'value',
-          name: app.yName,
-          splitLine: {
-            lineStyle: {
-              type: 'dashed'
-            },
-            show: true
-          },
-          axisLine: {
-            lineStyle: {
-              color: '#666666'
-            }
-          },
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            interval: 0
-          },
-          splitArea: {
-            show: false
-          }
-        }],
-        series: series
-      }, true)
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/components/charts/mixins/resize.js b/fuintAdmin_zt/src/views/components/charts/mixins/resize.js
deleted file mode 100644
index b1e76e947..000000000
--- a/fuintAdmin_zt/src/views/components/charts/mixins/resize.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { debounce } from '@/utils'
-
-export default {
-  data() {
-    return {
-      $_sidebarElm: null,
-      $_resizeHandler: null
-    }
-  },
-  mounted() {
-    this.initListener()
-  },
-  activated() {
-    if (!this.$_resizeHandler) {
-      // avoid duplication init
-      this.initListener()
-    }
-
-    // when keep-alive chart activated, auto resize
-    this.resize()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  },
-  deactivated() {
-    this.destroyListener()
-  },
-  methods: {
-    // use $_ for mixins properties
-    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
-    $_sidebarResizeHandler(e) {
-      if (e.propertyName === 'width') {
-        this.$_resizeHandler()
-      }
-    },
-    initListener() {
-      this.$_resizeHandler = debounce(() => {
-        this.resize()
-      }, 100)
-      window.addEventListener('resize', this.$_resizeHandler)
-
-      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    destroyListener() {
-      window.removeEventListener('resize', this.$_resizeHandler)
-      this.$_resizeHandler = null
-
-      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    resize() {
-      const { chart } = this
-      chart && chart.resize()
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/views/components/icons/element-icons.js b/fuintAdmin_zt/src/views/components/icons/element-icons.js
deleted file mode 100644
index 9ea4d63fd..000000000
--- a/fuintAdmin_zt/src/views/components/icons/element-icons.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const elementIcons = ['platform-eleme', 'eleme', 'delete-solid', 'delete', 's-tools', 'setting', 'user-solid', 'user', 'phone', 'phone-outline', 'more', 'more-outline', 'star-on', 'star-off', 's-goods', 'goods', 'warning', 'warning-outline', 'question', 'info', 'remove', 'circle-plus', 'success', 'error', 'zoom-in', 'zoom-out', 'remove-outline', 'circle-plus-outline', 'circle-check', 'circle-close', 's-help', 'help', 'minus', 'plus', 'check', 'close', 'picture', 'picture-outline', 'picture-outline-round', 'upload', 'upload2', 'download', 'camera-solid', 'camera', 'video-camera-solid', 'video-camera', 'message-solid', 'bell', 's-cooperation', 's-order', 's-platform', 's-fold', 's-unfold', 's-operation', 's-promotion', 's-home', 's-release', 's-ticket', 's-management', 's-open', 's-shop', 's-marketing', 's-flag', 's-comment', 's-finance', 's-claim', 's-custom', 's-opportunity', 's-data', 's-check', 's-grid', 'menu', 'share', 'd-caret', 'caret-left', 'caret-right', 'caret-bottom', 'caret-top', 'bottom-left', 'bottom-right', 'back', 'right', 'bottom', 'top', 'top-left', 'top-right', 'arrow-left', 'arrow-right', 'arrow-down', 'arrow-up', 'd-arrow-left', 'd-arrow-right', 'video-pause', 'video-play', 'refresh', 'refresh-right', 'refresh-left', 'finished', 'sort', 'sort-up', 'sort-down', 'rank', 'loading', 'view', 'c-scale-to-original', 'date', 'edit', 'edit-outline', 'folder', 'folder-opened', 'folder-add', 'folder-remove', 'folder-delete', 'folder-checked', 'tickets', 'document-remove', 'document-delete', 'document-copy', 'document-checked', 'document', 'document-add', 'printer', 'paperclip', 'takeaway-box', 'search', 'monitor', 'attract', 'mobile', 'scissors', 'umbrella', 'headset', 'brush', 'mouse', 'coordinate', 'magic-stick', 'reading', 'data-line', 'data-board', 'pie-chart', 'data-analysis', 'collection-tag', 'film', 'suitcase', 'suitcase-1', 'receiving', 'collection', 'files', 'notebook-1', 'notebook-2', 'toilet-paper', 'office-building', 'school', 'table-lamp', 'house', 'no-smoking', 'smoking', 'shopping-cart-full', 'shopping-cart-1', 'shopping-cart-2', 'shopping-bag-1', 'shopping-bag-2', 'sold-out', 'sell', 'present', 'box', 'bank-card', 'money', 'coin', 'wallet', 'discount', 'price-tag', 'news', 'guide', 'male', 'female', 'thumb', 'cpu', 'link', 'connection', 'open', 'turn-off', 'set-up', 'chat-round', 'chat-line-round', 'chat-square', 'chat-dot-round', 'chat-dot-square', 'chat-line-square', 'message', 'postcard', 'position', 'turn-off-microphone', 'microphone', 'close-notification', 'bangzhu', 'time', 'odometer', 'crop', 'aim', 'switch-button', 'full-screen', 'copy-document', 'mic', 'stopwatch', 'medal-1', 'medal', 'trophy', 'trophy-1', 'first-aid-kit', 'discover', 'place', 'location', 'location-outline', 'location-information', 'add-location', 'delete-location', 'map-location', 'alarm-clock', 'timer', 'watch-1', 'watch', 'lock', 'unlock', 'key', 'service', 'mobile-phone', 'bicycle', 'truck', 'ship', 'basketball', 'football', 'soccer', 'baseball', 'wind-power', 'light-rain', 'lightning', 'heavy-rain', 'sunrise', 'sunrise-1', 'sunset', 'sunny', 'cloudy', 'partly-cloudy', 'cloudy-and-sunny', 'moon', 'moon-night', 'dish', 'dish-1', 'food', 'chicken', 'fork-spoon', 'knife-fork', 'burger', 'tableware', 'sugar', 'dessert', 'ice-cream', 'hot-water', 'water-cup', 'coffee-cup', 'cold-drink', 'goblet', 'goblet-full', 'goblet-square', 'goblet-square-full', 'refrigerator', 'grape', 'watermelon', 'cherry', 'apple', 'pear', 'orange', 'coffee', 'ice-tea', 'ice-drink', 'milk-tea', 'potato-strips', 'lollipop', 'ice-cream-square', 'ice-cream-round']
-
-export default elementIcons
diff --git a/fuintAdmin_zt/src/views/components/icons/index.vue b/fuintAdmin_zt/src/views/components/icons/index.vue
deleted file mode 100644
index d3c9a7190..000000000
--- a/fuintAdmin_zt/src/views/components/icons/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div class="icons-container">
-    <aside>
-      <a href="#" target="_blank">Add and use
-      </a>
-    </aside>
-    <el-tabs type="border-card">
-      <el-tab-pane label="Icons">
-        <div v-for="item of svgIcons" :key="item">
-          <el-tooltip placement="top">
-            <div slot="content">
-              {{ generateIconCode(item) }}
-            </div>
-            <div class="icon-item">
-              <svg-icon :icon-class="item" class-name="disabled" />
-              <span>{{ item }}</span>
-            </div>
-          </el-tooltip>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="Element-UI Icons">
-        <div v-for="item of elementIcons" :key="item">
-          <el-tooltip placement="top">
-            <div slot="content">
-              {{ generateElementIconCode(item) }}
-            </div>
-            <div class="icon-item">
-              <i :class="'el-icon-' + item" />
-              <span>{{ item }}</span>
-            </div>
-          </el-tooltip>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import svgIcons from './svg-icons'
-import elementIcons from './element-icons'
-
-export default {
-  name: 'Icons',
-  data() {
-    return {
-      svgIcons,
-      elementIcons
-    }
-  },
-  methods: {
-    generateIconCode(symbol) {
-      return `<svg-icon icon-class="${symbol}" />`
-    },
-    generateElementIconCode(symbol) {
-      return `<i class="el-icon-${symbol}" />`
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.icons-container {
-  margin: 10px 20px 0;
-  overflow: hidden;
-
-  .icon-item {
-    margin: 20px;
-    height: 85px;
-    text-align: center;
-    width: 100px;
-    float: left;
-    font-size: 30px;
-    color: #24292e;
-    cursor: pointer;
-  }
-
-  span {
-    display: block;
-    font-size: 16px;
-    margin-top: 10px;
-  }
-
-  .disabled {
-    pointer-events: none;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/components/icons/svg-icons.js b/fuintAdmin_zt/src/views/components/icons/svg-icons.js
deleted file mode 100644
index 724cd8e9d..000000000
--- a/fuintAdmin_zt/src/views/components/icons/svg-icons.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const req = require.context('../../../assets/icons/svg', false, /\.svg$/)
-const requireAll = requireContext => requireContext.keys()
-
-const re = /\.\/(.*)\.svg/
-
-const svgIcons = requireAll(req).map(i => {
-  return i.match(re)[1]
-})
-
-export default svgIcons
diff --git a/fuintAdmin_zt/src/views/content/article/index.vue b/fuintAdmin_zt/src/views/content/article/index.vue
deleted file mode 100644
index e4da2526b..000000000
--- a/fuintAdmin_zt/src/views/content/article/index.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" label-width="68px">
-      <el-form-item label="文章标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入文章标题"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['content:article:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="articleList" @selection-change="handleSelectionChange">
-      <el-table-column label="ID" prop="id" width="60"/>
-      <el-table-column label="图片" align="center" width="200">
-        <template slot-scope="scope">
-          <img class="list-img" :src="scope.row.image">
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文章标题"
-        align="left"
-        prop="title"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="点击数" prop="click" align="center" width="60"/>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建者" align="center" prop="operator" width="100" />
-      <el-table-column label="创建时间" align="center" width="160" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['content:article:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['content:article:edit']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改文章对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="标题" prop="title">
-                <el-input v-model="form.title" placeholder="请输入文章标题" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="简介">
-                <el-input v-model="form.brief" type="textarea" placeholder="请输入简介"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="9">
-              <el-form-item label="图片" prop="image">
-                <el-upload
-                  :action="uploadAction"
-                  list-type="picture-card"
-                  :class="{hide:hideUpload}"
-                  :file-list="uploadFiles"
-                  :auto-upload="true"
-                  :show-file-list="false"
-                  :headers="uploadHeader"
-                  :on-success="handleUploadSuccess">
-                  <img
-                    v-if="this.form.image"
-                    :src="imagePath + this.form.image"
-                    class="list-img"
-                  />
-                  <i v-if="!this.form.image" class="el-icon-plus"></i>
-                </el-upload>
-              </el-form-item>
-            </el-col>
-            <p class="form-tips">（提示：点击图片修改，建议尺寸：640 x 350）</p>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="所属店铺" prop="storeId">
-                <el-select
-                  v-model="form.storeId"
-                  style="width: 260px"
-                  placeholder="所属店铺，空则为公共所有"
-                >
-                  <el-option :key="0" label="公共所有" v-if="!this.$store.getters.storeId" :value="0"/>
-                  <el-option v-for="storeInfo in storeList" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="14">
-              <el-form-item label="排序" prop="sort">
-                <el-input v-model="form.sort" placeholder="请输入排序数字，越小越靠前" maxlength="10"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="内容">
-                <editor v-model="form.description" :min-height="300"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="状态">
-                <el-radio-group v-model="form.status">
-                  <el-radio key="A" label="A" value="A">启用</el-radio>
-                  <el-radio key="N" label="N" value="N">禁用</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getArticleList, getArticle, updateStatus, saveArticle } from "@/api/article";
-import { getToken } from '@/utils/auth';
-export default {
-  name: "Article",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 图片根目录
-      imagePath: "",
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 文章列表
-      articleList: [],
-      // 店铺列表
-      storeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        title: '',
-        status: ''
-      },
-      // 表单参数
-      form: {
-        id: '',
-        title: '',
-        description: '',
-        storeId: 0,
-        image: '',
-        brief: "",
-        sort: 0,
-        status: "A"
-      },
-      // 表单校验
-      rules: {
-        title: [
-          { required: true, message: "文章标题不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询文章列表
-    getList() {
-      this.loading = true;
-      getArticleList(this.queryParams).then(response => {
-        this.articleList = response.data.dataList.content;
-        this.total = response.data.dataList.totalElements;
-        this.imagePath = response.data.imagePath
-        this.storeList = response.data.storeList;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: '',
-        title: '',
-        description: '',
-        storeId: 0,
-        image: '',
-        brief: "",
-        sort: 0,
-        status: "A"
-      };
-      this.resetForm("form");
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.articleId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.title + '"吗？').then(function() {
-        return updateStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 图片上传成功
-    handleUploadSuccess(file) {
-      this.form.image = file.data.fileName
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增文章";
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const articleId = row.id || this.ids
-      getArticle(articleId).then(response => {
-        this.form = response.data.articleInfo;
-        this.open = true;
-        this.title = "修改文章";
-      });
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.image.length < 1) {
-              this.form.image = '/static/defaultImage/none.png';
-          }
-          if (this.form.articleId != undefined) {
-              saveArticle(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveArticle(this.form).then(response => {
-                  this.$modal.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const articleId = row.id;
-      this.$modal.confirm('是否确认删除文章ID为"' + articleId + '"的数据项？').then(function() {
-        return updateStatus(articleId, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-<style scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/content/banner/list.vue b/fuintAdmin_zt/src/views/content/banner/list.vue
deleted file mode 100644
index 833c38365..000000000
--- a/fuintAdmin_zt/src/views/content/banner/list.vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-          clearable
-          style="width: 200px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="store">
-        <el-select
-          v-model="queryParams.storeId"
-          placeholder="所属店铺"
-          clearable
-          style="width: 180px"
-        >
-          <el-option :key="0" label="公共所有" v-if="!this.$store.getters.storeId" :value="0"/>
-          <el-option v-for="storeInfo in storeList" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 100px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['content:banner:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="55"/>
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="所属店铺" align="center" prop="store">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeId && scope.row.storeId > 0">
-              <span>{{ getName(storeList, scope.row.storeId) }}</span>
-          </span>
-          <span v-else>公共所有</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="图片" align="center" width="200">
-        <template slot-scope="scope">
-            <img class="list-img" :src="imagePath + scope.row.image">
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="排序" align="center" prop="sort" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['content:banner:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['content:banner:edit']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="标题" prop="title">
-              <el-input v-model="form.title" placeholder="请输入标题" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属店铺" prop="storeId">
-              <el-select
-                v-model="form.storeId"
-                style="width: 260px"
-                placeholder="所属店铺，空则为公共所有"
-              >
-                <el-option :key="0" label="公共所有" v-if="!this.$store.getters.storeId" :value="0"/>
-                <el-option v-for="storeInfo in storeList" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="链接" prop="url">
-              <el-input v-model="form.url" placeholder="请输入链接，如：pages/user/index" maxlength="200"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="9">
-            <el-form-item label="图片" prop="image">
-              <el-upload
-                   :action="uploadAction"
-                   list-type="picture-card"
-                   :class="{hide:hideUpload}"
-                   :file-list="uploadFiles"
-                   :auto-upload="true"
-                   :show-file-list="false"
-                   :headers="uploadHeader"
-                   :on-success="handleUploadSuccess">
-                <img
-                  v-if="this.form.image"
-                  :src="imagePath + this.form.image"
-                  class="list-img"
-                />
-                <i v-if="!this.form.image" class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改，建议尺寸：640 x 350）</p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="排序" prop="sort">
-              <el-input v-model="form.sort" placeholder="请输入排序数字，越小越靠前" maxlength="10"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { getBannerList, updateBannerStatus, getBannerInfo, saveBanner } from "@/api/banner";
-export default {
-  name: "BannerList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 图片根目录
-      imagePath: "",
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'sort', order: 'ascending'},
-      // 表单参数
-      form: { id: '', title: '', storeId: 0,  status: "A", sort: 0 },
-      // 店铺列表
-      storeList: [],
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        title: '',
-        storeId: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" },
-          { min: 2, max: 200, message: '标题长度必须介于2 和 200 之间', trigger: 'blur' }
-        ],
-        image: [{ required: true, message: "请上传图片", trigger: "blur" }]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getBannerList(this.queryParams).then( response => {
-          this.list = response.data.dataList.content;
-          this.total = response.data.dataList.totalElements;
-          this.imagePath = response.data.imagePath;
-          this.storeList = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.title + '"吗？').then(function() {
-        return updateBannerStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增轮播图";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        title: "",
-        status: "A",
-        image: "",
-        description: ""
-      };
-      this.uploadFiles = []
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveBanner(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveBanner(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getBannerInfo(id).then(response => {
-        this.form = response.data.bannerInfo;
-        this.uploadFiles = [{ url: response.data.imagePath + this.form.image, status: 'finished'}]
-        this.open = true;
-        this.title = "编辑轮播图";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.title
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return updateBannerStatus(row.id, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleUploadSuccess(file) {
-      this.form.image = file.data.fileName
-    }
-  }
-};
-</script>
-<style scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/coupon/confirm/index.vue b/fuintAdmin_zt/src/views/coupon/confirm/index.vue
deleted file mode 100644
index 3c35d9c8c..000000000
--- a/fuintAdmin_zt/src/views/coupon/confirm/index.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-      <el-form class="form" ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item class="form-item" label="核销码" prop="code">
-                <el-input class="input-item" v-model="form.code" placeholder="请使用扫码枪扫描卡券二维码，或手工输入核销码" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="action">
-        <el-button type="primary" style="height: 50px;" @click="submitConfirm">确定核销</el-button>
-        <el-button @click="cancel" style="height: 50px;">返回列表</el-button>
-      </div>
-    </div>
-
-    <!--核销对话框 start-->
-    <el-dialog title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="confirmForm" :model="confirmForm" :rules="confirmRules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券类型：">
-              <span class="coupon-type">[{{ getName(typeList, couponInfo.type) }}]</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券名称：">
-              <el-input style="width: 420px;" v-model="couponInfo.name" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="userInfo">
-          <el-col :span="24">
-            <el-form-item label="会员名称：">
-              <el-input style="width: 420px;" v-model="userInfo.name" disabled></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="有效期：">
-              <el-input style="width: 420px;" v-model="couponInfo.effectiveDate" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="couponInfo.amount">
-          <el-col :span="24">
-            <el-form-item label="卡券面额：">
-              <el-input style="width: 200px;" v-model="couponInfo.amount.toFixed(2)" disabled></el-input>
-              <span class="unit">元</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="couponInfo.type=='P'">
-          <el-col :span="24">
-            <el-form-item label="卡券余额：" prop="balance">
-              <el-input v-model="couponInfo.balance.toFixed(2)" style="width: 200px;" disabled></el-input>
-              <span class="unit">元</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="couponInfo.type=='P'">
-          <el-col :span="24">
-            <el-form-item label="核销金额：" prop="amount">
-              <el-input v-model="confirmForm.amount" style="width: 200px;" placeholder="请输入核销金额"></el-input>
-              <span class="unit">元</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row v-if="couponInfo.type=='T'">
-          <el-col :span="24">
-            <el-form-item label="核销次数：" prop="useRule">
-              <span class="info">总共<b style="color:green;">{{ couponInfo.useRule }}</b>次，已核销<b style="color:red;"> {{ couponInfo.confirmCount }}</b>次</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="核销备注：">
-              <el-input v-model="confirmForm.remark" type="textarea" rows="2" placeholder="请输入核销备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券说明：">
-              <el-input v-model="couponInfo.description" type="textarea" rows="3" disabled></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="doSubmitConfirm">确定核销</el-button>
-        <el-button @click="cancelConfirm">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--核销对话框 end-->
-  </div>
-</template>
-
-<script>
-import { getConfirmInfo, doConfirm } from "@/api/coupon/coupon";
-export default {
-  name: "ConfirmIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 核销弹框
-      open: false,
-      form: { id: '', code: '' },
-      confirmForm: { userCouponId: '', amount: '', remark: '' },
-      couponInfo: {},
-      userInfo: {},
-      typeList: [],
-      // 表单校验
-      rules: {
-        code: [
-          { required: true, message: "核销码不能为空", trigger: "blur" },
-          { min: 2, max: 100, message: '核销码长度必须介于2和100之间', trigger: 'blur' }
-        ]
-      },
-      confirmRules: {
-        amount: [
-          { required: true, message: "核销金额不能为空", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.form.code = this.$route.query.code
-  },
-  activated () {
-    this.form.code = this.$route.query.code
-  },
-  methods: {
-    // 取消按钮
-    cancel() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push( { path: '/coupon/userCoupon/index' } );
-    },
-    // 确定核销
-    submitConfirm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            getConfirmInfo(this.form).then(response => {
-               this.couponInfo = response.data.couponInfo;
-               this.confirmForm.userCouponId = this.couponInfo.id
-               this.userInfo = response.data.userInfo ? response.data.userInfo : null;
-               this.typeList = response.data.typeList;
-               this.open = true
-            });
-        }
-      });
-    },
-    // 执行核销
-    doSubmitConfirm: function() {
-      this.$refs["confirmForm"].validate(valid => {
-        if (valid) {
-            doConfirm(this.confirmForm).then(response => {
-              if (response.data) {
-                this.open = false
-                this.$modal.msgSuccess("卡券核销成功");
-                this.confirmForm.remark = ''
-              }
-            });
-        }
-      });
-    },
-    cancelConfirm: function() {
-       this.open = false
-    }
-  }
-};
-</script>
-<style scoped>
-.main-panel {
-   margin-top: 10px;
-   display: flex;
-   border: solid 1px #cccccc;
-   padding: 60px 0px 40px 0px;
-   border-radius: 2px;
-   background: #f4f4f4;
-   min-width: 950px;
-}
-.main-panel .action {
-   margin-left: 10px;
-   min-width: 200px;
-}
-.main-panel .el-input {
-  min-width: 580px;
-}
-.input-item >>> .el-input__inner {
-   border: #00acac solid 2px;
-   line-height: 50px;
-   height: 50px;
-}
-.form-item >>> .el-form-item__label {
-   line-height: 50px;
-   height: 50px;
-}
-.coupon-type {
-  font-weight: bold;
-  color: #ff5b57;
-}
-.unit {
-  margin-left: 5px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/coupon/confirmLog/index.vue b/fuintAdmin_zt/src/views/coupon/confirmLog/index.vue
deleted file mode 100644
index 40289b9e8..000000000
--- a/fuintAdmin_zt/src/views/coupon/confirmLog/index.vue
+++ /dev/null
@@ -1,216 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="卡券ID" prop="couponId">
-        <el-input
-          v-model="queryParams.couponId"
-          placeholder="请输入卡券ID"
-          clearable
-          style="width: 180px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          style="width: 100px"
-          clearable
-        >
-          <el-option key="A" label="正常" value="A"/>
-          <el-option key="D" label="撤销" value="D"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="流水号" align="center" prop="code" width="200"/>
-      <el-table-column label="会员ID" align="center" prop="userInfo.id" />
-      <el-table-column label="手机号" align="center" width="120" prop="userInfo.mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.mobile">{{ scope.row.userInfo.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="userInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.name">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券类型" align="center" prop="couponInfo.type">
-        <template slot-scope="scope">
-          <span v-if="scope.row.couponInfo">{{ getName(typeList, scope.row.couponInfo.type) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券名称" align="center" prop="couponInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.couponInfo">{{ scope.row.couponInfo.name }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="所属店铺" align="center" prop="storeInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeInfo">{{ scope.row.storeInfo.name }}</span>
-          <span v-else>暂无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="核销金额" align="center" prop="amount">
-         <template slot-scope="scope">
-             <span v-if="scope.row.amount" style="color:red">{{ scope.row.amount }}元</span>
-             <span v-else>-</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-        <template slot-scope="scope">
-          <span>{{ scope.row.remark }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="核销人" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.operator">{{scope.row.operator }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="核销时间" align="center" width="150" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 'A'">正常</span>
-          <span v-else>撤销</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="68">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status == 'A'"
-            icon="el-icon-delete"
-            v-hasPermi="['coupon:confirm:index']"
-            @click="handleDelete(scope.row)"
-          >撤销</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getConfirmLogList, rollbackUserCoupon } from "@/api/coupon/confirmLog";
-export default {
-  name: "ConfirmLogIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 卡券类型
-      typeList: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        couponId: '',
-        status: ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getConfirmLogList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.typeList = response.data.typeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 撤销按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认撤销ID等于' + row.id + '的数据项？').then(function() {
-        return rollbackUserCoupon(row.id, row.userCouponId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("撤销成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/coupon/coupon/index.vue b/fuintAdmin_zt/src/views/coupon/coupon/index.vue
deleted file mode 100644
index 5bd1be0fc..000000000
--- a/fuintAdmin_zt/src/views/coupon/coupon/index.vue
+++ /dev/null
@@ -1,861 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="卡券ID" prop="couponId">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入卡券ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分组ID" prop="groupId">
-        <el-input
-          v-model="queryParams.groupId"
-          placeholder="请输入卡券分组ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入卡券名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          clearable
-          placeholder="卡券类型"
-        >
-          <el-option v-for="typeInfo in typeList" :key="typeInfo.key" :label="typeInfo.name" :value="typeInfo.key"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option v-for="statusInfo in statusList" :key="statusInfo.key" :label="statusInfo.name" :value="statusInfo.key"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['coupon:coupon:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="卡券ID" prop="id" width="66"/>
-      <el-table-column label="图标" align="center" width="150">
-        <template slot-scope="scope">
-          <img class="list-img" :src="imagePath + scope.row.image">
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券名称" align="center" prop="name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.name">{{ scope.row.name }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="分组" align="center" prop="groupName">
-        <template slot-scope="scope">
-          <span v-if="scope.row.groupId">
-              <span>{{ getName(groupList, scope.row.groupId) }}</span>
-          </span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型" align="center" prop="type">
-        <template slot-scope="scope">
-          <span v-if="scope.row.type">
-            <span>{{ getName(typeList, scope.row.type) }}</span>
-          </span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="有效期" align="center" width="180" prop="updateTime">
-        <template slot-scope="scope">
-          <p v-if="scope.row.expireType == 'fix'">{{ parseTime(scope.row.beginTime) }}</p>
-          <p v-if="scope.row.expireType == 'fix'">{{ parseTime(scope.row.endTime) }}</p>
-          <p v-if="scope.row.expireType == 'flex'">领取后{{ scope.row.expireTime }}天</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" width="160" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span>{{ getName(statusList, scope.row.status) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            v-hasPermi="['coupon:coupon:edit']"
-            @click="handleSend(scope.row)"
-          >发券</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['coupon:coupon:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['coupon:coupon:edit']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改卡券对话框 start-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券类型" prop="type">
-              <el-select
-                v-if="form.id"
-                v-model="form.type"
-                style="width: 260px"
-                placeholder="卡券类型"
-                disabled
-              >
-                <el-option v-for="typeInfo in typeList" :key="typeInfo.key" :label="typeInfo.name" :value="typeInfo.key"/>
-              </el-select>
-              <el-select
-                v-if="!form.id"
-                v-model="form.type"
-                style="width: 260px"
-                placeholder="卡券类型"
-              >
-                <el-option v-for="typeInfo in typeList" :key="typeInfo.key" :label="typeInfo.name" :value="typeInfo.key"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券分组" prop="groupId">
-              <el-select
-                v-model="form.groupId"
-                style="width: 260px"
-                placeholder="请选择卡券分组"
-                clearable
-                filterable
-              >
-                <el-option v-for="group in groupOptions" :key="group.id" :label="group.name" :value="group.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券名称" prop="name">
-              <el-input v-model="form.name" style="width: 300px" placeholder="请输入卡券名称" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="过期类型" prop="expireType">
-              <el-radio-group v-model="form.expireType">
-                <el-radio key="fix" label="fix" value="fix">固定时间</el-radio>
-                <el-radio key="flex" label="flex" value="flex">领取后生效</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="form.expireType == 'fix'">
-          <el-col :span="24">
-            <el-form-item label="有效时间" prop="beginTime">
-              <el-date-picker
-                v-model="form.beginTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime"
-                placeholder="开始时间"
-              ></el-date-picker>
-              <span class="sp"> 至 </span>
-              <el-date-picker
-                v-model="form.endTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime"
-                placeholder="结束时间"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="form.expireType == 'flex'">
-          <el-col :span="24">
-            <el-form-item label="有效天数" prop="expireTime">
-              <el-input v-model="form.expireTime" style="width: 150px" placeholder="请输入有效天数" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- 优惠券特有属性 start -->
-        <div v-if="form.type == 'C'">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="卡券面额" prop="amount">
-                <el-input v-model="form.amount" style="width: 240px" placeholder="请输入卡券面额，单位：元" maxlength="10" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="发放方式" prop="sendWay">
-                <el-radio-group v-model="form.sendWay">
-                  <el-radio key="backend" label="backend" value="backend">后台发放</el-radio>
-                  <el-radio key="front" label="front" value="front">前台领取</el-radio>
-                  <el-radio key="offline" label="offline" value="offline">线下发放</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="发行总数量" prop="total">
-                <el-input v-model="form.total" style="width: 300px" placeholder="请输入发行总数量，单位：套"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="满多少可用" prop="outRule">
-                <el-input v-model="form.outRule" style="width: 300px" placeholder="单位：元，输入0表示无门槛"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="允许转赠好友" prop="isGive">
-                <el-radio-group v-model="form.isGive">
-                  <el-radio key="0" label="0" value="0">不允许</el-radio>
-                  <el-radio key="1" label="1" value="1">允许</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="适用商品" prop="applyGoods">
-                <el-radio-group v-model="form.applyGoods">
-                  <el-radio key="allGoods" label="allGoods" value="allGoods">全场通用</el-radio>
-                  <el-radio key="parkGoods" label="parkGoods" value="parkGoods">指定商品</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24" v-if="form.applyGoods == 'parkGoods'">
-              <el-form-item label="适用商品ID" prop="goodsIds">
-                <el-input v-model="goodsIds" rows="2" type="textarea" placeholder="英文逗号分隔，如：19932,938423,324234"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="每人最多拥有数量" prop="limitNum">
-                <el-input v-model="form.limitNum" style="width: 300px" placeholder="请输入每人最多拥有数量，单位：张"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="领取所需积分" prop="point">
-                <el-input v-model="form.point" style="width: 300px" placeholder="输入0或为空表示不需要积分领取"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="领取码" prop="receiveCode">
-                <el-input v-model="form.receiveCode" style="width: 300px" placeholder="为空表示不需要领取码"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="会员等级" prop="gradeIds">
-                <el-select
-                  v-model="form.gradeIds"
-                  style="width: 260px"
-                  placeholder="适用会员等级"
-                  clearable
-                  filterable
-                  multiple
-                >
-                  <el-option v-for="grade in gradeOptions" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="使用专项" prop="useFor">
-                <el-radio-group v-model="form.useFor">
-                  <el-select
-                    v-model="form.useFor"
-                    style="width: 260px"
-                    placeholder="请选择使用专项，不选则为通用"
-                    clearable
-                  >
-                    <el-option v-for="useForItem in couponUseForList" :key="useForItem.key+''" :label="useForItem.name" :value="useForItem.key+''"/>
-                  </el-select>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <!-- 优惠券特有属性 end -->
-        <!-- 储值卡特有属性 start -->
-        <div v-if="form.type == 'P'">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="预存规则" prop="storeItem">
-                <div class="add-item"><el-button type="danger" size="mini" icon="el-icon-plus" @click="addStoreItem()">添加</el-button></div>
-                <div class="store-item" v-for="(item, index) in storeItem">
-                    <el-input v-model="item.storeAmount" style="width: 180px" placeholder="请输入实际支付金额" maxlength="100" />
-                    <span class="sp"> 到账 </span>
-                    <el-input v-model="item.giveAmount" style="width: 180px" placeholder="请输入实际到账金额" maxlength="100" />
-                    <span class="remove-item el-icon-remove" @click="removeStoreItem(index)"></span>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <!-- 储值卡特有属性 end -->
-        <!-- 计次卡特有属性 start -->
-        <div v-if="form.type == 'T'">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="计次次数" prop="outRule">
-                <el-input v-model="form.outRule" style="width: 260px" placeholder="请输入计次次数" maxlength="10" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="领取所需积分" prop="point">
-                <el-input v-model="form.point" style="width: 300px" placeholder="输入0或为空表示不需要积分领取"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="领取码" prop="receiveCode">
-                <el-input v-model="form.receiveCode" style="width: 300px" placeholder="为空表示不需要领取码"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <!-- 计次卡特有属性 end -->
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="适用店铺" prop="storeIds">
-              <el-select
-                v-model="form.storeIds"
-                style="width: 260px"
-                placeholder="适用店铺"
-                multiple
-              >
-                <el-option v-for="storeInfo in storeList" :key="storeInfo.id+''" :label="storeInfo.name" :value="storeInfo.id+''"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="图标" prop="image">
-              <el-upload
-                 :action="uploadAction"
-                 list-type="picture-card"
-                 :file-list="uploadFiles"
-                 :auto-upload="true"
-                 :on-success="handleUploadSuccess"
-                 :headers="uploadHeader"
-                 :show-file-list="false">
-                <img
-                  v-if="this.form.image"
-                  :src="imagePath + this.form.image"
-                  class="list-img"
-                />
-                 <i class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改，建议尺寸：300 x 240）</p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="描述信息">
-              <el-input v-model="form.description" rows="5" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="后台备注">
-              <el-input v-model="form.remarks" rows="2" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 添加或修改卡券对话框 end-->
-
-    <!--发券对话框 start-->
-    <el-dialog title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="sendForm" :model="sendForm" :rules="sendFormRules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券名称：" prop="couponName">
-              <el-input style="width: 420px;" v-model="sendForm.couponName" disabled maxlength="100"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="手机号码：" prop="mobile">
-              <el-input style="width: 420px;" v-model="sendForm.mobile"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="发放数量：" prop="num">
-              <el-input style="width: 420px;" v-model="sendForm.num"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息：" prop="remark">
-              <el-input v-model="sendForm.remark" type="textarea" rows="2" placeholder="请输入备注信息"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="doSendCoupon">确定发放</el-button>
-        <el-button @click="cancelSend">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--发券对话框 end-->
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { getCouponList, updateCouponStatus, getCouponInfo, saveCoupon, deleteCoupon, sendCoupon } from "@/api/coupon/coupon";
-import { getAllGroupList } from "@/api/coupon/group";
-import { parseTime } from "@/utils/fuint";
-
-// 初始表单
-const initForm = { id: '', type: 'C', groupId: '', gradeIds: '', name: '', expireType: 'fix', expireTime: '', beginTime: '', endTime: '', applyGoods: 'allGoods', isGive: '0', amount: '', goodsIds: '',
-                   outRule: '', inRule: '', inRuleForPreStore: '', sendNum: '1', total: '', limitNum: '', sendWay: 'backend', point: '', receiveCode: '',
-                   useFor: '', storeIds: '', image: '/static/defaultImage/coupon.png', description: '', remarks: '', outRuleForTimer: '', status: "A" };
-
-export default {
-  name: "CouponIndex",
-  data() {
-    const storeItemValid = (rule, value, callback) => {
-      // 储值卡验证
-      if (this.form.type == 'P') {
-        if (this.storeItem.length > 0) {
-            let validCount = 0;
-            this.storeItem.forEach(function(item) {
-              if (item.storeAmount == '' || isNaN(parseFloat(item.storeAmount)) || item.giveAmount == '' || isNaN(parseFloat(item.giveAmount))) {
-                  validCount++;
-              }
-            })
-            if (validCount > 0) {
-                callback(new Error("请输入预存规则"));
-            } else {
-                callback();
-            }
-        } else {
-             callback(new Error("请添加预存规则"));
-        }
-      }
-    };
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 图片根目录
-      imagePath: "",
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 卡券类别列表
-      typeList: [],
-      // 分组列表
-      groupList: [],
-      // 分组选项
-      groupOptions: [],
-      // 等级选项
-      gradeOptions: [],
-      // 店铺列表
-      storeList: [],
-      // 状态列表
-      statusList: [],
-      // 卡券使用专项列表
-      couponUseForList: [],
-      // 是否显示弹出层
-      open: false,
-      // 显示发券对话框
-      openSendCouponDialog: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: initForm,
-      goodsIds: '',
-      // 预存规则
-      storeItem: [ { storeAmount: '', giveAmount: '' }],
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 上传文件列表
-      uploadFiles: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        id: '',
-        groupId: '',
-        name: '',
-        type: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        type: [
-          { required: true, message: "请选择卡券类型", trigger: "blur" },
-        ],
-        name: [
-          { required: true, message: "卡券名称不能为空", trigger: "blur" },
-        ],
-        groupId: [
-          { required: true, message: "请选择卡券分组", trigger: "blur" },
-        ],
-        expireType: [
-          { required: true, message: "过期类型不能为空", trigger: "blur" },
-        ],
-        expireTime: [
-          { required: true, message: "有效天数不能为空", trigger: "blur" },
-          { pattern: /^[0-9]{1,10}$/, message: `请输入1-10位数字`, trigger: 'blur' }
-        ],
-        beginTime: [
-          { required: true, message: "请选择开始时间", trigger: "blur" },
-        ],
-        endTime: [
-          { required: true, message: "请选择结束时间", trigger: "blur" },
-        ],
-        amount: [
-          { required: true, message: "请输入面额", trigger: "blur" },
-        ],
-        total: [
-          { required: true, message: "请输入发行总数", trigger: "blur" },
-          { pattern: /^[0-9]{1,10}$/, message: `请输入1-10位数字`, trigger: 'blur' }
-        ],
-        sendWay: [
-          { required: true, message: "请选择发放方式", trigger: "blur" },
-        ],
-        outRule: [
-          { required: true, message: "请输入该项", trigger: "blur" },
-        ],
-        storeItem: [
-          { required: true, validator: storeItemValid, trigger: 'change' },
-        ]
-      },
-      sendForm: { couponId: '', couponName: '', num: '', mobile: '', remark: '' },
-      sendFormRules: {
-        mobile: [
-            { required: true, message: "请输入会员手机号码", trigger: "blur" },
-        ],
-        num: [
-            { required: true, message: "请输入发放数量", trigger: "blur" },
-            { pattern: /^[0-9]{1,10}$/, message: `请输入1-10位数字`, trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getGroupList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getCouponList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.groupList = response.data.groupList;
-          this.storeList = response.data.storeList;
-          this.imagePath = response.data.imagePath;
-          this.typeList = response.data.typeList;
-          this.statusList = response.data.statusList;
-          this.gradeOptions = response.data.gradeList;
-          this.couponUseForList = response.data.couponUseForList;
-          this.loading = false;
-        }
-      );
-    },
-    // 获取分组列表
-    getGroupList() {
-      this.loading = true;
-      getAllGroupList().then( response => {
-          this.groupOptions = response.data.groupList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + 'ID等于' + row.id + '的数据项吗？').then(function() {
-        return updateCouponStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增卡券";
-    },
-    // 表单重置
-    reset() {
-      this.resetForm("form");
-      this.form = initForm;
-      this.goodsIds = '';
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      const app = this;
-      app.$refs["form"].validate(valid => {
-        if (valid) {
-          app.form.storeIds = app.form.storeIds ? app.form.storeIds.join(",") : '';
-          app.form.gradeIds = app.form.gradeIds ? app.form.gradeIds.join(",") : '';
-          app.form.goodsIds = app.goodsIds;
-          // 预存规则
-          if (app.form.type == 'P') {
-              app.form.inRule = '';
-              app.storeItem.forEach(function(rule){
-                 if (app.form.inRule) {
-                     app.form.inRule = app.form.inRule + ',' + rule.storeAmount + '_' + rule.giveAmount;
-                 } else {
-                     app.form.inRule = rule.storeAmount + '_' + rule.giveAmount;
-                 }
-              })
-          }
-          if (parseInt(app.form.id) > 0) {
-              saveCoupon(app.form).then(response => {
-                app.$modal.msgSuccess("修改成功");
-                app.open = false;
-                app.getList();
-              });
-          } else {
-              saveCoupon(app.form).then(response => {
-                app.$modal.msgSuccess("新增成功");
-                app.open = false;
-                app.getList();
-              });
-          }
-        } else {
-            app.$modal.msgError("请先完善表单数据项");
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      const app = this;
-      app.reset();
-      const id = row.id || this.ids;
-      getCouponInfo(id).then(response => {
-        app.form = response.data.couponInfo;
-        app.form.isGive = app.form.isGive == true ? '1' : '0';
-        app.form.beginTime = parseTime(app.form.beginTime);
-        app.form.endTime = parseTime(app.form.endTime);
-        app.goodsIds = response.data.goodsIds;
-        if (app.form.storeIds && app.form.storeIds.length > 0) {
-            app.form.storeIds = app.form.storeIds.split(",");
-        }
-        if (app.form.gradeIds && app.form.gradeIds.length > 0) {
-            app.form.gradeIds = app.form.gradeIds.split(",");
-        }
-        if (app.form.type == 'P' && app.form.inRule) {
-           const storeRules = app.form.inRule.split(",");
-           app.storeItem = [];
-           if (storeRules.length > 0) {
-               storeRules.forEach(function(rule){
-                   const ruleItem = rule.split("_");
-                   if (ruleItem.length == 2) {
-                       app.storeItem.push( { storeAmount: ruleItem[0], giveAmount: ruleItem[1] } );
-                   }
-               })
-           }
-        }
-        app.open = true;
-        app.title = "编辑卡券";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除ID等于' + row.id + '的数据项？').then(function() {
-         return deleteCoupon(row.id);
-      }).then(() => {
-         this.getList();
-         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    // 发券
-    handleSend(row) {
-       this.openSendCouponDialog = true;
-       this.sendForm.couponName = row.name;
-       this.sendForm.couponId = row.id;
-       this.sendForm.num = row.sendNum ? parseInt(row.sendNum): '';
-       this.sendForm.mobile = '';
-       this.sendForm.remark = '';
-    },
-    // 取消发券
-    cancelSend() {
-       this.openSendCouponDialog = false;
-    },
-    // 确定发券
-    doSendCoupon() {
-      const app = this;
-      app.$refs["sendForm"].validate(valid => {
-        if (valid) {
-            sendCoupon(app.sendForm).then(response => {
-              if (response.data) {
-                  app.openSendCouponDialog = false
-                  app.$modal.msgSuccess("卡券发放成功");
-              }
-            });
-        }
-      })
-    },
-    // 添加预存规则
-    addStoreItem() {
-      this.storeItem.push( { storeAmount: '', giveAmount: '' } );
-    },
-    // 删除预存规则
-    removeStoreItem(index) {
-      const newStoreItem = [];
-      this.storeItem.forEach(function(item, i){
-        if (index !== i) {
-            newStoreItem.push(item);
-        }
-      });
-      this.storeItem = newStoreItem;
-    },
-    // 上传成功
-    handleUploadSuccess(file) {
-      this.form.image = file.data.fileName
-    },
-    handleRemove(file, fileList) {
-      setTimeout(() => {
-        this.hideUpload = fileList.length > 0
-      }, 520)
-    }
-  }
-};
-</script>
-<style scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-.sp {
-  font-size: 12px;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.store-item {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-.remove-item {
-  color: red;
-  cursor: pointer;
-  margin-left: 10px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/coupon/give/index.vue b/fuintAdmin_zt/src/views/coupon/give/index.vue
deleted file mode 100644
index f1065a97b..000000000
--- a/fuintAdmin_zt/src/views/coupon/give/index.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="卡券ID" prop="couponId">
-        <el-input
-          v-model="queryParams.couponId"
-          placeholder="请输入卡券ID"
-          clearable
-          style="width: 180px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          style="width: 100px"
-          clearable
-        >
-          <el-option key="A" label="正常" value="A"/>
-          <el-option key="D" label="撤销" value="D"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" align="center" prop="id" width="60"/>
-      <el-table-column label="会员ID" align="center" prop="userId" />
-      <el-table-column label="手机号" align="center" width="120" prop="mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.mobile">{{ scope.row.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券名称" align="center" prop="couponNames">
-        <template slot-scope="scope">
-          <span v-if="scope.row.couponNames">{{ scope.row.couponNames }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="转赠手机号" align="center" prop="userMobile">
-         <template slot-scope="scope">
-             <span v-if="scope.row.userMobile">{{ scope.row.userMobile }}</span>
-             <span v-else>-</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="转赠数量" align="center" prop="num">
-        <template slot-scope="scope">
-          <span>{{ scope.row.num }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="总金额(元)" align="center" prop="money">
-        <template slot-scope="scope">
-          <span v-if="scope.row.money">{{scope.row.money }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="转赠时间" align="center" width="180" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ scope.row.createTime }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 'A'">正常</span>
-          <span v-else>撤销</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="68">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status == 'A'"
-            icon="el-icon-view"
-            v-hasPermi="['coupon:give:index']"
-            @click="handleDetail(scope.row)"
-          >查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <el-dialog title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
-      <el-table ref="tables" v-loading="loading" :data="itemList">
-        <el-table-column label="ID" align="center" prop="id" width="60"/>
-        <el-table-column label="手机号" align="center" width="120" prop="mobile"/>
-        <el-table-column label="赠予手机号" align="center" width="120" prop="userMobile"/>
-        <el-table-column label="卡券名称" align="center" prop="couponName" />
-        <el-table-column label="总金额" align="center" prop="money" />
-        <el-table-column label="赠送时间" align="center" prop="createTime">
-          <template slot-scope="scope">
-            {{ parseTime(scope.row.createTime) }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import { getGiveLogList, getGiveItem } from "@/api/coupon/give";
-export default {
-  name: "GiveIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 弹框开关
-      open: false,
-      // 明细列表
-      itemList: [],
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 卡券类型
-      typeList: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        couponId: '',
-        status: ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getGiveLogList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.typeList = response.data.typeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 撤销按钮操作
-    handleDetail(row) {
-      this.loading = true;
-      getGiveItem(row.id).then( response => {
-          this.itemList = response.data.itemList;
-          this.open = true
-          this.loading = false;
-        }
-      );
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/coupon/group/index.vue b/fuintAdmin_zt/src/views/coupon/group/index.vue
deleted file mode 100644
index 213bd3fef..000000000
--- a/fuintAdmin_zt/src/views/coupon/group/index.vue
+++ /dev/null
@@ -1,294 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="分组ID" prop="couponId">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入分组ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分组名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入分组名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['coupon:group:edit']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="分组ID" prop="id" width="60"/>
-      <el-table-column label="分组名称" align="center" prop="name" />
-      <el-table-column label="卡券数量" align="center" width="100" prop="num">
-        <template slot-scope="scope">
-           <span>{{ scope.row.num }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['coupon:group:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['coupon:group:edit']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="分组名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入分组名称" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息" prop="description">
-              <el-input v-model="form.description" placeholder="请输入备注信息" type="textarea" rows="5" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item class="recharge-status" label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getGroupList, updateGroupStatus, getGroupInfo, saveGroup, deleteGroup } from "@/api/coupon/group";
-export default {
-  name: "CouponGroupIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 会员等级列表
-      userGradeList: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', name: '', description: '', status: 'A' },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        id: '',
-        name: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "分组名称不能为空", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getGroupList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.userGradeList = response.data.userGradeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + 'ID等于' + row.id + '的数据项吗？').then(function() {
-        return updateGroupStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增卡券分组";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        name: "",
-        description: "",
-        status: "A"
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveGroup(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveGroup(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getGroupInfo(id).then(response => {
-        this.form = response.data.groupInfo;
-        this.open = true;
-        this.title = "编辑卡券分组";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除ID等于' + row.id + '的数据项？').then(function() {
-        return deleteGroup(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/coupon/sendLog/index.vue b/fuintAdmin_zt/src/views/coupon/sendLog/index.vue
deleted file mode 100644
index 0bf9a8852..000000000
--- a/fuintAdmin_zt/src/views/coupon/sendLog/index.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="卡券ID" prop="couponId">
-        <el-input
-          v-model="queryParams.couponId"
-          placeholder="请输入卡券ID"
-          clearable
-          style="width: 180px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          style="width: 100px"
-          clearable
-        >
-          <el-option key="A" label="正常" value="A"/>
-          <el-option key="D" label="撤销" value="D"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" align="center" prop="id" width="60"/>
-      <el-table-column label="会员ID" align="center" prop="userId"/>
-      <el-table-column label="手机号" align="center" width="120">
-        <template slot-scope="scope">
-          <span v-if="scope.row.mobile">{{ scope.row.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券ID" align="center" prop="couponId">
-        <template slot-scope="scope">
-          <span>{{ scope.row.couponId }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 'A'">正常</span>
-          <span v-else>撤销</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发放时间" align="center" width="150" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.operator">{{scope.row.operator }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="68">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.status == 'A'"
-            icon="el-icon-delete"
-            v-hasPermi="['coupon:sendLog:index']"
-            @click="handleDelete(scope.row)"
-          >撤销</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getSendLogList, removeUserCoupon } from "@/api/coupon/sendLog";
-export default {
-  name: "ConfirmLogIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 卡券类型
-      typeList: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        couponId: '',
-        status: ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getSendLogList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.typeList = response.data.typeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 撤销按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认撤销ID等于' + row.id + '的数据项？').then(function() {
-        return removeUserCoupon(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("撤销成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/coupon/userCoupon/index.vue b/fuintAdmin_zt/src/views/coupon/userCoupon/index.vue
deleted file mode 100644
index b2c5983dd..000000000
--- a/fuintAdmin_zt/src/views/coupon/userCoupon/index.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="ID" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入ID"
-          clearable
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="卡券ID" prop="couponId">
-        <el-input
-          v-model="queryParams.couponId"
-          placeholder="请输入卡券ID"
-          clearable
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="核销码" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入核销二维码"
-          clearable
-          style="width: 180px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          style="width: 100px"
-          clearable
-        >
-          <el-option v-for="statusInfo in statusList" :key="statusInfo.key" :label="statusInfo.name" :value="statusInfo.key"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery(false)">搜索</el-button>
-        <el-button type="danger" icon="el-icon-download" size="mini" @click="handleQuery(true)">导出</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="60"/>
-      <el-table-column label="核销码" prop="code" width="150"/>
-      <el-table-column label="会员ID" align="center" prop="userInfo.id">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo">
-              <span>{{ scope.row.userInfo.id }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="手机号" align="center" width="120" prop="userInfo.mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo">{{ scope.row.userInfo.mobile ? scope.row.userInfo.mobile : '-' }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="userInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券类型" align="center" prop="type">
-        <template slot-scope="scope">
-          <span v-if="scope.row.type">{{ getName(typeList, scope.row.type) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券名称" align="center" prop="name"/>
-      <el-table-column label="所属店铺" align="center" prop="storeInfo">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeInfo">{{ scope.row.storeInfo.name }}</span>
-          <span v-else>暂无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="面额(元)" align="center" prop="amount">
-         <template slot-scope="scope">
-           <span style="color:red">{{ scope.row.amount }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="余额(元)" align="center" prop="balance">
-        <template slot-scope="scope">
-          <span v-if="scope.row.balance" style="color:forestgreen">{{ scope.row.balance }}</span>
-          <span v-else style="color:forestgreen">{{ scope.row.amount }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status">{{ getName(statusList, scope.row.status) }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="领取时间" align="center" width="150" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="120">
-        <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.status == 'A'"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['coupon:confirm:index']"
-            @click="handleConfirm(scope.row)"
-          >核销</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['coupon:userCoupon:delete']"
-            @click="handleDelete(scope.row)"
-          >作废</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getToken } from "@/utils/auth";
-import { getUserCouponList, deleteUserCoupon } from "@/api/coupon/userCoupon";
-export default {
-  name: "UserCouponIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 卡券类型
-      typeList: [],
-      // 状态列表
-      statusList: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        status: '',
-        id: '',
-        couponId: ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getUserCouponList(this.queryParams).then(response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.typeList = response.data.typeList;
-          this.statusList = response.data.statusList;
-          this.loading = false;
-        }
-      );
-    },
-    // 导出excel
-    exportExcel() {
-      this.download('/backendApi/userCoupon/exportList', {
-        ...this.queryParams
-      })
-    },
-    // 搜索按钮操作
-    handleQuery(isExport) {
-      this.queryParams.page = 1;
-      if (isExport) {
-          this.exportExcel();
-      } else {
-          this.getList();
-      }
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认作废ID等于' + row.id + '的数据项？').then(function() {
-        return deleteUserCoupon(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("作废成功");
-      }).catch(() => {});
-    },
-    // 核销按钮操作
-    handleConfirm(row) {
-      this.$router.push( { path:  '/coupon/confirm/index?code=' + row.code } );
-    },
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/dashboard/BarChart.vue b/fuintAdmin_zt/src/views/dashboard/BarChart.vue
deleted file mode 100644
index be0af34f8..000000000
--- a/fuintAdmin_zt/src/views/dashboard/BarChart.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import resize from './mixins/resize'
-
-const animationDuration = 6000
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '300px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        grid: {
-          top: 10,
-          left: '2%',
-          right: '2%',
-          bottom: '3%',
-          containLabel: true
-        },
-        xAxis: [{
-          type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          axisTick: {
-            alignWithLabel: true
-          }
-        }],
-        yAxis: [{
-          type: 'value',
-          axisTick: {
-            show: false
-          }
-        }],
-        series: [{
-          name: 'pageA',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [79, 52, 200, 334, 390, 330, 220],
-          animationDuration
-        }, {
-          name: 'pageB',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [80, 52, 200, 334, 390, 330, 220],
-          animationDuration
-        }, {
-          name: 'pageC',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [30, 52, 200, 334, 390, 330, 220],
-          animationDuration
-        }]
-      })
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/dashboard/LineChart.vue b/fuintAdmin_zt/src/views/dashboard/LineChart.vue
deleted file mode 100644
index e654168dd..000000000
--- a/fuintAdmin_zt/src/views/dashboard/LineChart.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import resize from './mixins/resize'
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '350px'
-    },
-    autoResize: {
-      type: Boolean,
-      default: true
-    },
-    chartData: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  watch: {
-    chartData: {
-      deep: true,
-      handler(val) {
-        this.setOptions(val)
-      }
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-      this.setOptions(this.chartData)
-    },
-    setOptions({ expectedData, actualData } = {}) {
-      this.chart.setOption({
-        xAxis: {
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          boundaryGap: false,
-          axisTick: {
-            show: false
-          }
-        },
-        grid: {
-          left: 10,
-          right: 10,
-          bottom: 20,
-          top: 30,
-          containLabel: true
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross'
-          },
-          padding: [5, 10]
-        },
-        yAxis: {
-          axisTick: {
-            show: false
-          }
-        },
-        legend: {
-          data: ['expected', 'actual']
-        },
-        series: [{
-          name: 'expected', itemStyle: {
-            normal: {
-              color: '#FF005A',
-              lineStyle: {
-                color: '#FF005A',
-                width: 2
-              }
-            }
-          },
-          smooth: true,
-          type: 'line',
-          data: expectedData,
-          animationDuration: 2800,
-          animationEasing: 'cubicInOut'
-        },
-        {
-          name: 'actual',
-          smooth: true,
-          type: 'line',
-          itemStyle: {
-            normal: {
-              color: '#3888fa',
-              lineStyle: {
-                color: '#3888fa',
-                width: 2
-              },
-              areaStyle: {
-                color: '#f3f8ff'
-              }
-            }
-          },
-          data: actualData,
-          animationDuration: 2800,
-          animationEasing: 'quadraticOut'
-        }]
-      })
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/dashboard/PanelGroup.vue b/fuintAdmin_zt/src/views/dashboard/PanelGroup.vue
deleted file mode 100644
index 1a1081fcb..000000000
--- a/fuintAdmin_zt/src/views/dashboard/PanelGroup.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            访客
-          </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            消息
-          </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            金额
-          </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
-        <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            订单
-          </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import CountTo from 'vue-count-to'
-
-export default {
-  components: {
-    CountTo
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.$emit('handleSetLineChartData', type)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.panel-group {
-  margin-top: 18px;
-
-  .card-panel-col {
-    margin-bottom: 32px;
-  }
-
-  .card-panel {
-    height: 108px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
-
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
-      }
-
-      .icon-people {
-        background: #40c9c6;
-      }
-
-      .icon-message {
-        background: #36a3f7;
-      }
-
-      .icon-money {
-        background: #f4516c;
-      }
-
-      .icon-shopping {
-        background: #34bfa3
-      }
-    }
-
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
-    }
-
-    .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
-      float: none !important;
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/dashboard/PieChart.vue b/fuintAdmin_zt/src/views/dashboard/PieChart.vue
deleted file mode 100644
index 4d2ef32a5..000000000
--- a/fuintAdmin_zt/src/views/dashboard/PieChart.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import resize from './mixins/resize'
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '300px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          left: 'center',
-          bottom: '10',
-          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
-        },
-        series: [
-          {
-            name: 'WEEKLY WRITE ARTICLES',
-            type: 'pie',
-            roseType: 'radius',
-            radius: [15, 95],
-            center: ['50%', '38%'],
-            data: [
-              { value: 320, name: 'Industries' },
-              { value: 240, name: 'Technology' },
-              { value: 149, name: 'Forex' },
-              { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
-            ],
-            animationEasing: 'cubicInOut',
-            animationDuration: 2600
-          }
-        ]
-      })
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/dashboard/RaddarChart.vue b/fuintAdmin_zt/src/views/dashboard/RaddarChart.vue
deleted file mode 100644
index 6823af318..000000000
--- a/fuintAdmin_zt/src/views/dashboard/RaddarChart.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import resize from './mixins/resize'
-
-const animationDuration = 3000
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '300px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        radar: {
-          radius: '66%',
-          center: ['50%', '42%'],
-          splitNumber: 8,
-          splitArea: {
-            areaStyle: {
-              color: 'rgba(127,95,132,.3)',
-              opacity: 1,
-              shadowBlur: 45,
-              shadowColor: 'rgba(0,0,0,.5)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 15
-            }
-          },
-          indicator: [
-            { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
-            { name: 'Development', max: 20000 },
-            { name: 'Marketing', max: 20000 }
-          ]
-        },
-        legend: {
-          left: 'center',
-          bottom: '10',
-          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
-        },
-        series: [{
-          type: 'radar',
-          symbolSize: 0,
-          areaStyle: {
-            normal: {
-              shadowBlur: 13,
-              shadowColor: 'rgba(0,0,0,.2)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 10,
-              opacity: 1
-            }
-          },
-          data: [
-            {
-              value: [5000, 7000, 12000, 11000, 15000, 14000],
-              name: 'Allocated Budget'
-            },
-            {
-              value: [4000, 9000, 15000, 15000, 13000, 11000],
-              name: 'Expected Spending'
-            },
-            {
-              value: [5500, 11000, 12000, 15000, 12000, 12000],
-              name: 'Actual Spending'
-            }
-          ],
-          animationDuration: animationDuration
-        }]
-      })
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/dashboard/mixins/resize.js b/fuintAdmin_zt/src/views/dashboard/mixins/resize.js
deleted file mode 100644
index b1e76e947..000000000
--- a/fuintAdmin_zt/src/views/dashboard/mixins/resize.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { debounce } from '@/utils'
-
-export default {
-  data() {
-    return {
-      $_sidebarElm: null,
-      $_resizeHandler: null
-    }
-  },
-  mounted() {
-    this.initListener()
-  },
-  activated() {
-    if (!this.$_resizeHandler) {
-      // avoid duplication init
-      this.initListener()
-    }
-
-    // when keep-alive chart activated, auto resize
-    this.resize()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  },
-  deactivated() {
-    this.destroyListener()
-  },
-  methods: {
-    // use $_ for mixins properties
-    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
-    $_sidebarResizeHandler(e) {
-      if (e.propertyName === 'width') {
-        this.$_resizeHandler()
-      }
-    },
-    initListener() {
-      this.$_resizeHandler = debounce(() => {
-        this.resize()
-      }, 100)
-      window.addEventListener('resize', this.$_resizeHandler)
-
-      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    destroyListener() {
-      window.removeEventListener('resize', this.$_resizeHandler)
-      this.$_resizeHandler = null
-
-      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    resize() {
-      const { chart } = this
-      chart && chart.resize()
-    }
-  }
-}
diff --git a/fuintAdmin_zt/src/views/error/401.vue b/fuintAdmin_zt/src/views/error/401.vue
deleted file mode 100644
index 448b6ecd6..000000000
--- a/fuintAdmin_zt/src/views/error/401.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-  <div class="errPage-container">
-    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
-      返回
-    </el-button>
-    <el-row>
-      <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">
-          401错误!
-        </h1>
-        <h2>您没有访问权限！</h2>
-        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
-        <ul class="list-unstyled">
-          <li class="link-type">
-            <router-link to="/">
-              回首页
-            </router-link>
-          </li>
-        </ul>
-      </el-col>
-      <el-col :span="12">
-        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import errGif from '@/assets/401_images/401.gif'
-
-export default {
-  name: 'Page401',
-  data() {
-    return {
-      errGif: errGif + '?' + +new Date()
-    }
-  },
-  methods: {
-    back() {
-      if (this.$route.query.noGoBack) {
-        this.$router.push({ path: '/' })
-      } else {
-        this.$router.go(-1)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .errPage-container {
-    width: 800px;
-    max-width: 100%;
-    margin: 100px auto;
-    .pan-back-btn {
-      background: #008489;
-      color: #fff;
-      border: none!important;
-    }
-    .pan-gif {
-      margin: 0 auto;
-      display: block;
-    }
-    .pan-img {
-      display: block;
-      margin: 0 auto;
-      width: 100%;
-    }
-    .text-jumbo {
-      font-size: 60px;
-      font-weight: 700;
-      color: #484848;
-    }
-    .list-unstyled {
-      font-size: 14px;
-      li {
-        padding-bottom: 5px;
-      }
-      a {
-        color: #008489;
-        text-decoration: none;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/error/404.vue b/fuintAdmin_zt/src/views/error/404.vue
deleted file mode 100644
index 96f075c17..000000000
--- a/fuintAdmin_zt/src/views/error/404.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <div class="wscn-http404-container">
-    <div class="wscn-http404">
-      <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
-      </div>
-      <div class="bullshit">
-        <div class="bullshit__oops">
-          404错误!
-        </div>
-        <div class="bullshit__headline">
-          {{ message }}
-        </div>
-        <div class="bullshit__info">
-          对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
-        </div>
-        <router-link to="/" class="bullshit__return-home">
-          返回首页
-        </router-link>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'Page404',
-  computed: {
-    message() {
-      return '找不到网页！'
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.wscn-http404-container{
-  transform: translate(-50%,-50%);
-  position: absolute;
-  top: 40%;
-  left: 50%;
-}
-.wscn-http404 {
-  position: relative;
-  width: 1200px;
-  padding: 0 50px;
-  overflow: hidden;
-  .pic-404 {
-    position: relative;
-    float: left;
-    width: 600px;
-    overflow: hidden;
-    &__parent {
-      width: 100%;
-    }
-    &__child {
-      position: absolute;
-      &.left {
-        width: 80px;
-        top: 17px;
-        left: 220px;
-        opacity: 0;
-        animation-name: cloudLeft;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      &.mid {
-        width: 46px;
-        top: 10px;
-        left: 420px;
-        opacity: 0;
-        animation-name: cloudMid;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1.2s;
-      }
-      &.right {
-        width: 62px;
-        top: 100px;
-        left: 500px;
-        opacity: 0;
-        animation-name: cloudRight;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      @keyframes cloudLeft {
-        0% {
-          top: 17px;
-          left: 220px;
-          opacity: 0;
-        }
-        20% {
-          top: 33px;
-          left: 188px;
-          opacity: 1;
-        }
-        80% {
-          top: 81px;
-          left: 92px;
-          opacity: 1;
-        }
-        100% {
-          top: 97px;
-          left: 60px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudMid {
-        0% {
-          top: 10px;
-          left: 420px;
-          opacity: 0;
-        }
-        20% {
-          top: 40px;
-          left: 360px;
-          opacity: 1;
-        }
-        70% {
-          top: 130px;
-          left: 180px;
-          opacity: 1;
-        }
-        100% {
-          top: 160px;
-          left: 120px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudRight {
-        0% {
-          top: 100px;
-          left: 500px;
-          opacity: 0;
-        }
-        20% {
-          top: 120px;
-          left: 460px;
-          opacity: 1;
-        }
-        80% {
-          top: 180px;
-          left: 340px;
-          opacity: 1;
-        }
-        100% {
-          top: 200px;
-          left: 300px;
-          opacity: 0;
-        }
-      }
-    }
-  }
-  .bullshit {
-    position: relative;
-    float: left;
-    width: 300px;
-    padding: 30px 0;
-    overflow: hidden;
-    &__oops {
-      font-size: 32px;
-      font-weight: bold;
-      line-height: 40px;
-      color: #1482f0;
-      opacity: 0;
-      margin-bottom: 20px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-fill-mode: forwards;
-    }
-    &__headline {
-      font-size: 20px;
-      line-height: 24px;
-      color: #222;
-      font-weight: bold;
-      opacity: 0;
-      margin-bottom: 10px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.1s;
-      animation-fill-mode: forwards;
-    }
-    &__info {
-      font-size: 13px;
-      line-height: 21px;
-      color: grey;
-      opacity: 0;
-      margin-bottom: 30px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.2s;
-      animation-fill-mode: forwards;
-    }
-    &__return-home {
-      display: block;
-      float: left;
-      width: 110px;
-      height: 36px;
-      background: #1482f0;
-      border-radius: 100px;
-      text-align: center;
-      color: #ffffff;
-      opacity: 0;
-      font-size: 14px;
-      line-height: 36px;
-      cursor: pointer;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.3s;
-      animation-fill-mode: forwards;
-    }
-    @keyframes slideUp {
-      0% {
-        transform: translateY(60px);
-        opacity: 0;
-      }
-      100% {
-        transform: translateY(0);
-        opacity: 1;
-      }
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k1.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k1.png
deleted file mode 100644
index f321d2580..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k1.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k2.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k2.png
deleted file mode 100644
index 120b063b2..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k2.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k3.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k3.png
deleted file mode 100644
index e21935627..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k3.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k4.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k4.png
deleted file mode 100644
index c2b1268b8..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k4.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k5.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k5.png
deleted file mode 100644
index a590ce1eb..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k5.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k6.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k6.png
deleted file mode 100644
index cc3467fe9..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k6.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k7.png b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k7.png
deleted file mode 100644
index 7013130ae..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/imgs/k7.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
deleted file mode 100644
index 90a6b4a3e..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <div class="app-center">
-    <div class="app-top">
-    <el-card :body-style="{ padding: '0px' }">
-      <div class="box">
-        <div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
-          <div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
-          <div class="heng-box" v-if="radio1 == '支付方式分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-
-        </div>
-        <div class="nbox"  :class="pointerClass" @click="updateRedio('支付通道分析')">
-          <div class="fount-box" :style="{ color: radio1 === '支付通道分析' ? '#FF770F' : '#999999' }">支付通道分析</div>
-          <div class="heng-box" v-if="radio1 == '支付通道分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-        </div>
-      </div>
-    </el-card>
-
-
-    </div>
-    <dai_yunyingfenxi-pay-type v-if="radio1 === '支付方式分析'"></dai_yunyingfenxi-pay-type>
-    <dai_yunyingfenxi-paym v-if="radio1 === '支付通道分析'"></dai_yunyingfenxi-paym>
-  </div>
-</template>
-
-<script>
-
-import Dai_yunyingfenxiPayType from "@/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue";
-import Dai_yunyingfenxiPaym from "@/views/financialStatement/dai_yunyingfenxi/tab/paym.vue";
-
-export default {
-  name: "yunyingfenxi-list1",
-  data(){
-    return{
-      radio1:'支付方式分析',
-      pointerClass() {
-        return 'pointer-cursor';
-      }
-    }
-  },
-  components:{
-    Dai_yunyingfenxiPaym,
-    Dai_yunyingfenxiPayType
-
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    updateRedio(data) {
-      console.log(this.radio1)
-      this.radio1 = data
-    }
-
-  }
-
-}
-</script>
-
-<style scoped>
-.app-center{
-  width: 100%;
-
-  box-sizing: border-box;
-  //padding: 10px;
-}
-.app-top{
-  width: 100%;
-  //margin-bottom: 20px;
-  height: 60px;
-  box-sizing: border-box;
-
-}
-.el-card__body, .el-main {
-  padding: 0px;
-}
-.box{
-  cursor: pointer;
-  margin-top: 10px ;
-  margin-left: 50px;
-  //height: 40px;
-  display: flex;
-background-color: #FFFFFF;
-  align-items: center;
-  //border: 1px solid #EBEEF5;
-}
-.nbox{
-  margin-left: 30px;
-}
-.fount-box{
-  font-size: 14px;
-  color: #999999
-}
-.fount-box2{
-  font-size: 14px;
-  color: #999999
-}
-.heng-box{
-  background-color: #FF770F;
-  width: 100%;
-  height: 2px;
-  margin-top: 10px;
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
deleted file mode 100644
index 0e7a6e942..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
+++ /dev/null
@@ -1,393 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px">
-    <el-card class="box-card" style="margin-top: 0px;">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
-        <div class="d-s" style="margin-bottom: 15px">
-          <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
-               :key="index" @click="editColor(index)">
-            {{ item }}
-          </div>
-          <el-date-picker
-            v-model="value2"
-            type="datetimerange"
-            style="height: 32px"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
-          </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
-            <el-form-item label="" prop="deptId" style="width: 180px">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="所属机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </div>
-        </div>
-      </el-form>
-      <div class="wrap-boxs">
-        <div class="k_" id="k_1">
-          <div class="size_" style="margin-bottom: 0px">交易金额汇总数（万元）/交易笔数</div>
-          <div class="title_">{{ orderStatistics.payMoney }}/{{ orderStatistics.count }}</div>
-        </div>
-        <div class="k_" id="k_2" v-for="item in orderStatistics.fenxiByDaili2ByData">
-          <div class="size_">{{ item.paymentChannel }}交易金额（万元）</div>
-          <div class="title_">{{ item.payMoneyChannel }}</div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
-          <el-table-column align="center" prop="parentName" label="所属机构"></el-table-column>
-          <el-table-column align="center" prop="payMoney" label="累计交易金额"></el-table-column>
-          <el-table-column align="center" prop="count" label="累计交易笔数"></el-table-column>
-          <el-table-column align="center" label="支付通道交易信息：金额（万元），笔数（万笔），占比（%）">
-            <template>
-              <el-table-column align="center" prop="fuYouAmount" label="富友交易金额">
-                <template slot-scope="scope">
-                  <span>{{scope.row.fuYouAmount || 0}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="laKaLaAmount" label="拉卡拉交易笔数">
-                <template slot-scope="scope">
-                  <span>{{scope.row.laKaLaAmount || 0}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="count92" label="拉卡拉交易占比">
-                <template slot-scope="scope">
-                  <span>{{scope.row.laKaLaAmount/(scope.row.fuYouAmount+scope.row.laKaLaAmount) || 0}}</span>
-                </template>
-              </el-table-column>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="date" label="统计日期">
-            <template>
-              <!--              {{this.beginTime}} -{{this.endTime}}-->
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi, getFenxiByDailiApi, getFenxiByDailiByDataApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialStatement/yunyingfenxi";
-import {parseTime} from "@/utils/fuint";
-
-export default {
-  name: "dai_yunyingfenxi-paym",
-  data() {
-    return {
-      radio1: "油号选错",
-      loading: false,
-      dialogVisible: false,
-      // 员工列表
-      staffList: [],
-      ordersInfo: {},
-      // 日期范围
-      dateRange: [],
-      beginTime: "",
-      endTime: "",
-      // 是否为当天时间
-      isSysDate: false,
-      // 收银台订单列表
-      orderList: [],
-      deptList: [],
-
-
-      timeList: [
-        "今日",
-        "近一周",
-        "近一月",
-        "近一年",
-      ],
-      timeIndex: 0,
-      value2: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        beginTime: "",
-        endTime: "",
-        orderNo: "",
-        status: "",
-        payType: "",
-        payChannel: "",
-        deptType: "3",
-        storeId: "",
-        deptId: "",
-      },
-      orderStatistics: {
-        count: '0',
-
-        payMoney: '0',
-        fenxiByDaili2ByData: []
-      },
-      total: 0,
-    }
-  },
-  created() {
-    let start = new Date();
-    start.setHours(0)
-    start.setMinutes(0)
-    start.setSeconds(0)
-    start.setMilliseconds(0)
-    this.dateRange = [start, new Date()];
-    this.beginTime = start
-    this.endTime = new Date()
-    this.isSysDate = true
-    let start1 = new Date();
-    start1.setHours(0)
-    start1.setMinutes(0)
-    start1.setSeconds(0)
-    start1.setMilliseconds(0)
-    this.value2 = [parseTime(start1), parseTime(new Date())];
-    this.getList();
-    this.getDeptList();
-
-  },
-  methods: {
-    editColor(index) {
-      this.timeIndex = index
-      if (this.timeList[index] == '今日') {
-        let start = new Date();
-        start.setHours(0)
-        start.setMinutes(0)
-        start.setSeconds(0)
-        start.setMilliseconds(0)
-        this.value2 = [start, new Date()];
-      } else if (this.timeList[index] == '近一周') {
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
-      } else if (this.timeList[index] == '近一月') {
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
-      } else if (this.timeList[index] == '近一年') {
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-        this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
-      }
-      this.handleQuery()
-    },
-    getDeptList() {
-      getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
-        this.deptList = response.data.records;
-      })
-    },
-    exportExcelCashier() {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
-        const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
-        this.$download.saveAs(blob, '交易明细统计.xLsx')
-      })
-    },
-    // 获取订单统计信息
-
-    getOrderStatistics() {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      getFenxiByDailiByDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
-        this.orderStatistics = res.data
-        console.log("res.data1111", res.data)
-      })
-    },
-
-
-    // 获取列表信息
-    getList(val) {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      getFenxiByDailiApi(this.addDateRange(this.queryParams, this.value2)).then(response => {
-        this.orderList = response.data.records;
-        this.total = response.data.total;
-        this.isSysDate = false
-      })
-      this.getOrderStatistics()
-    },
-    getOrdersInfo(data) {
-      this.dialogVisible = true;
-      this.ordersInfo = data
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-      }
-      this.beginTime = ""
-      this.endTime = ""
-      let start1 = new Date();
-      start1.setHours(0)
-      start1.setMinutes(0)
-      start1.setSeconds(0)
-      start1.setMilliseconds(0)
-      this.value2 = [parseTime(start1), parseTime(new Date())];
-      this.timeIndex = 0
-      this.handleQuery();
-    },
-  }
-}
-</script>
-
-<style scoped>
-.box-card {
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box {
-  width: 100%;
-}
-
-.wrap-boxs {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-}
-
-.k_ {
-  width: 200px;
-  height: 80px;
-  margin-right: 20px;
-  box-sizing: border-box;
-  padding: 15px 10px;
-  padding-top: 5px;
-  color: #333333;
-}
-
-.size_ {
-  font-weight: 400;
-  font-size: 14px;
-  color: #333333;
-  margin-bottom: 20px;
-}
-
-.title_ {
-  font-weight: 600;
-  font-size: 24px;
-  color: #333333;
-}
-
-#k_1 {
-  background: url("../imgs/k1.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_2 {
-  background: url("../imgs/k2.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_3 {
-  background: url("../imgs/k3.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_4 {
-  background: url("../imgs/k4.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_5 {
-  background: url("../imgs/k5.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_6 {
-  background: url("../imgs/k6.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_7 {
-  background: url("../imgs/k7.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-.d-s {
-  display: flex;
-  align-items: center;
-}
-
-.anniu-h {
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-
-.anniu-act {
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
deleted file mode 100644
index 63fdcd48b..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ /dev/null
@@ -1,388 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <div class="d-s">
-          <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
-               :key="index" @click="editColor(index)">
-            {{ item }}
-          </div>
-          <el-date-picker
-            v-model="value2"
-            type="datetimerange"
-            range-separator="至"
-            style="height: 32px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
-          </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
-            <el-form-item label="" prop="deptId" style="width: 180px">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="所属机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </div>
-        </div>
-
-      </el-form>
-
-      <!--    </el-card>-->
-      <!--    <el-card class="box-card">-->
-      <div class="wrap-boxs">
-        <div class="k_" id="k_1">
-          <div class="size_" style="margin-bottom: 0px">活跃油站汇总总数/合作油站汇总总数</div>
-          <div class="title_">{{ orderStatistics.sumnum }}/0</div>
-        </div>
-        <div class="k_" id="k_2">
-          <div class="size_" style="margin-bottom: 0px">交易金额汇总数（万元）/交易笔数</div>
-          <div class="title_">{{ orderStatistics.tongjMoney }}</div>
-        </div>
-        <div class="k_" id="k_3">
-          <div class="size_">退款金额（元）/退款笔数</div>
-          <div class="title_">{{ orderStatistics.tongjXfMoney }}</div>
-        </div>
-        <div class="k_" id="k_4">
-          <div class="size_">新增油站数（万元）</div>
-          <div class="title_">0</div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" align="center" label="机构名称"></el-table-column>
-          <el-table-column prop="parentName" align="center" label="所属机构"></el-table-column>
-          <el-table-column prop="payMoney" align="center" label="累计交易金额（万元）"></el-table-column>
-          <el-table-column prop="count" align="center" label="累计交易笔数"></el-table-column>
-          <el-table-column prop="storeName" align="center" label="交易金额">
-            <el-table-column prop="wechatMoney" align="center" label="微信"></el-table-column>
-            <el-table-column prop="alipayMoney" align="center" label="支付宝"></el-table-column>
-            <!--            <el-table-column prop="gradeName" align="center" label="云闪付" > </el-table-column>-->
-            <el-table-column prop="cashMoney" align="center" label="现金"></el-table-column>
-            <el-table-column prop="balanceMoney" align="center" label="其他"></el-table-column>
-          </el-table-column>
-          <el-table-column prop="refMoney" align="center" label="累计退款金额（元）"></el-table-column>
-          <el-table-column prop="refCount" align="center" label="累计退款笔数"></el-table-column>
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi, getFenxiByDailiTypeApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/financialStatement/yunyingfenxi";
-import {parseTime} from "@/utils/fuint";
-
-export default {
-  name: "dai_yunyingfenxi-payType",
-  data() {
-    return {
-      radio1: "油号选错",
-      loading: false,
-      dialogVisible: false,
-      // 员工列表
-      staffList: [],
-      ordersInfo: {},
-
-      timeList: [
-        "今日",
-        "近一周",
-        "近一月",
-        "近一年",
-      ],
-      timeIndex: 0,
-      value2: [],
-      // 日期范围
-      dateRange: [],
-      beginTime: "",
-      endTime: "",
-      // 是否为当天时间
-      isSysDate: false,
-      // 收银台订单列表
-      orderList: [],
-      deptList: [],
-
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        beginTime: "",
-        endTime: "",
-        orderNo: "",
-        status: "",
-        payType: "",
-        payChannel: "",
-        deptType: "3",
-        storeId: "",
-        deptId: "",
-      },
-      orderStatistics: {
-        sumnum: '', // 会员总数
-        balanceSum: '', // 会员余额
-        tongjMoney: '', // 累计冲纸
-        tongjXfMoney: '', // 总消费
-      },
-      total: 0,
-    }
-  },
-  created() {
-    let start = new Date();
-    start.setHours(0)
-    start.setMinutes(0)
-    start.setSeconds(0)
-    start.setMilliseconds(0)
-    this.dateRange = [start, new Date()];
-    this.beginTime = start
-    this.endTime = new Date()
-    this.isSysDate = true
-    let start1 = new Date();
-    start1.setHours(0)
-    start1.setMinutes(0)
-    start1.setSeconds(0)
-    start1.setMilliseconds(0)
-    this.value2 = [parseTime(start1), parseTime(new Date())];
-    this.getList();
-    this.getDeptList();
-
-  },
-  methods: {
-    editColor(index) {
-      this.timeIndex = index
-      if (this.timeList[index] == '今日') {
-        let start = new Date();
-        start.setHours(0)
-        start.setMinutes(0)
-        start.setSeconds(0)
-        start.setMilliseconds(0)
-        this.value2 = [start, new Date()];
-      } else if (this.timeList[index] == '近一周') {
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
-      } else if (this.timeList[index] == '近一月') {
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
-      } else if (this.timeList[index] == '近一年') {
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-        this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
-      }
-      this.handleQuery()
-    },
-    getDeptList() {
-      getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
-        this.deptList = response.data.records;
-      })
-    },
-    exportExcelCashier() {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
-        const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
-        this.$download.saveAs(blob, '交易明细统计.xLsx')
-      })
-    },
-    // 获取订单统计信息
-
-    getOrderStatistics() {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
-        this.orderStatistics = res.data
-        console.log("res.data1111", res.data)
-      })
-    },
-
-    // 获取列表信息
-    getList(val) {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      getFenxiByDailiTypeApi(this.addDateRange(this.queryParams, this.value2)).then(response => {
-        this.orderList = response.data.records;
-        this.total = response.data.total;
-        this.isSysDate = false
-      })
-      this.getOrderStatistics()
-    },
-    getOrdersInfo(data) {
-      this.dialogVisible = true;
-      this.ordersInfo = data
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-      }
-      this.beginTime = ""
-      this.endTime = ""
-      let start1 = new Date();
-      start1.setHours(0)
-      start1.setMinutes(0)
-      start1.setSeconds(0)
-      start1.setMilliseconds(0)
-      this.value2 = [parseTime(start1), parseTime(new Date())];
-      this.timeIndex = 0
-      this.handleQuery();
-    },
-  }
-}
-</script>
-
-<style scoped>
-.box-card {
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box {
-  width: 100%;
-}
-
-.wrap-boxs {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-}
-
-.k_ {
-  width: 200px;
-  height: 80px;
-  margin-right: 20px;
-  box-sizing: border-box;
-  padding: 15px 10px;
-  padding-top: 5px;
-  color: #333333;
-}
-
-.size_ {
-  font-weight: 400;
-  font-size: 14px;
-  color: #333333;
-  margin-bottom: 20px;
-}
-
-.title_ {
-  font-weight: 600;
-  font-size: 24px;
-  color: #333333;
-}
-
-#k_1 {
-  background: url("../imgs/k1.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_2 {
-  background: url("../imgs/k2.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_3 {
-  background: url("../imgs/k3.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_4 {
-  background: url("../imgs/k4.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_5 {
-  background: url("../imgs/k5.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_6 {
-  background: url("../imgs/k6.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_7 {
-  background: url("../imgs/k7.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-.d-s {
-  display: flex;
-  align-items: center;
-}
-
-.anniu-h {
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-
-.anniu-act {
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
deleted file mode 100644
index e4d9da2da..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <div class="app-center">
-    <div class="app-top">
-    <el-card :body-style="{ padding: '0px' }">
-      <div class="box">
-        <div class="nbox" :class="pointerClass" @click="updateRedio('会员充值订单')">
-          <div class="fount-box" :style="{ color: radio1 === '会员充值订单' ? '#FF770F' : '#999999' }">会员充值订单</div>
-          <div class="heng-box" v-if="radio1 == '会员充值订单'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-
-        </div>
-        <div class="nbox"  :class="pointerClass" @click="updateRedio('油品交易订单')">
-          <div class="fount-box" :style="{ color: radio1 === '油品交易订单' ? '#FF770F' : '#999999' }">油品交易订单</div>
-          <div class="heng-box" v-if="radio1 == '油品交易订单'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-        </div>
-          <div class="nbox" :class="pointerClass"  @click="updateRedio('便利店订单')">
-          <div class="fount-box" :style="{ color: radio1 === '便利店订单' ? '#FF770F' : '#999999' }">便利店订单</div>
-          <div class="heng-box" v-if="radio1 == '便利店订单'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-
-        </div>
-        <div class="nbox" :class="pointerClass"  @click="updateRedio('积分兑换订单')">
-          <div class="fount-box" :style="{ color: radio1 === '积分兑换订单' ? '#FF770F' : '#999999' }">积分商城订单</div>
-          <div class="heng-box" v-if="radio1 == '积分兑换订单'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-        </div>
-      </div>
-    </el-card>
-
-
-    </div>
-    <jiaoyiduizhang-vip v-if="radio1 === '会员充值订单'"></jiaoyiduizhang-vip>
-    <jiaoyiduizhang-oil v-if="radio1 === '油品交易订单'"></jiaoyiduizhang-oil>
-    <jiaoyiduizhang-store v-if="radio1 === '便利店订单'"></jiaoyiduizhang-store>
-    <jiaoyiduizhang-int v-if="radio1 === '积分兑换订单'"></jiaoyiduizhang-int>
-  </div>
-</template>
-
-<script>
-
-import JiaoyiduizhangVip from "@/views/financialStatement/jiaoyiduizhang/tab/vip.vue";
-import JiaoyiduizhangInt from "@/views/financialStatement/jiaoyiduizhang/tab/int.vue";
-import JiaoyiduizhangOil from "@/views/financialStatement/jiaoyiduizhang/tab/oil.vue";
-import JiaoyiduizhangStore from "@/views/financialStatement/jiaoyiduizhang/tab/store.vue";
-
-export default {
-  name: "jiaoyiduizhang-list1",
-  data(){
-    return{
-      radio1:'会员充值订单',
-      pointerClass() {
-        return 'pointer-cursor';
-      }
-    }
-  },
-  components:{
-    JiaoyiduizhangInt,
-    JiaoyiduizhangVip,
-    JiaoyiduizhangOil,
-    JiaoyiduizhangStore,
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    updateRedio(data) {
-      console.log(this.radio1)
-      this.radio1 = data
-    }
-
-  }
-
-}
-</script>
-
-<style scoped>
-.app-center{
-  width: 100%;
-
-  box-sizing: border-box;
-  //padding: 10px;
-}
-.app-top{
-  width: 100%;
-  //margin-bottom: 20px;
-  height: 60px;
-  box-sizing: border-box;
-
-}
-.el-card__body, .el-main {
-  padding: 0px;
-}
-.box{
-  cursor: pointer;
-  margin-top: 10px ;
-  margin-left: 50px;
-  //height: 40px;
-  display: flex;
-background-color: #FFFFFF;
-  align-items: center;
-  //border: 1px solid #EBEEF5;
-}
-.nbox{
-  margin-left: 30px;
-}
-.fount-box{
-  font-size: 14px;
-  color: #999999
-}
-.fount-box2{
-  font-size: 14px;
-  color: #999999
-}
-.heng-box{
-  background-color: #FF770F;
-  width: 100%;
-  height: 2px;
-  margin-top: 10px;
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
deleted file mode 100644
index 9743ed916..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <el-form-item label="" prop="deptId" style="width: 180px">
-          <el-select
-            v-model="queryParams.deptId"
-            clearable
-            placeholder="所属机构"
-          >
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-<!--        <el-form-item label="" style="width: 180px">-->
-<!--          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="" prop="payChannel" style="width: 180px">-->
-<!--          <el-select-->
-<!--            v-model="queryParams.payChannel"-->
-<!--            clearable-->
-<!--            placeholder="订单类型"-->
-<!--          >-->
-<!--            <el-option label="小程序" value="applet"/>-->
-<!--            <el-option label="收银台" value="cashier"/>-->
-<!--            <el-option label="POS端" value="POS"/>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-        <el-form-item label="" prop="payType" style="width: 180px">
-          <el-select
-            v-model="queryParams.paymentType"
-            clearable
-            placeholder="支付方式"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="status" style="width: 180px">
-          <el-select
-            v-model="queryParams.status"
-            clearable
-            placeholder="订单状态"
-          >
-            <el-option label="支付成功" value="paid"/>
-            <el-option label="待支付" value="unpaid"/>
-            <el-option label="退款成功" value="refund"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易结束日期">
-          </el-date-picker>
-        </el-form-item>
-
-
-
-
-        <el-form-item class="" style="float: right;margin-right:0px">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <!--    </el-card>-->
-      <!--    <el-card class="box-card">-->
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
-          <el-table-column prop="orderNumber" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额（元）">
-            <template slot-scope="scope">
-              <span v-if="scope.row.amount">{{scope.row.amount}}</span>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="payChannel" align="center" label="订单类型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payChannel=='cashier'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
-              <span v-else>其他</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="paymentType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.paymentType=='CASH'">现金</span>
-              <span v-else-if="scope.row.paymentType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.paymentType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" align="center" label="支付状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="消费信息">
-            <el-table-column prop="giftName" align="center" label="商品名称" > </el-table-column>
-            <el-table-column prop="integral" align="center" label="消耗积分" > </el-table-column>
-            <el-table-column prop="exchangeQuantity" align="center" label="数量" > </el-table-column>
-          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="支付通道">
-          </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
-          <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
-<!--          <el-table-column prop="payTime" align="center" label="订单完成时间" >-->
-<!--            <template slot-scope="scope">-->
-<!--              <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>-->
-<!--              <span v-else>&#45;&#45;</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhang";
-
-  export default {
-    name: "jiaoyiduizhang-int",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          CASH:"0",
-          WECHAT:"0",
-          ALIPAY:"0",
-          balance:"0",
-          CASHCount:"0",
-          WECHATCount:"0",
-          ALIPAYCount:"0",
-          balanceCount:"0",
-          refBalance:"0",
-          refBalanceCount:"0",
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getDuiZhangIntegralListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-.box-card{
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box{
-  width: 100%;
-}
-
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
deleted file mode 100644
index 7686fab2e..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <el-form-item label="" prop="deptId" style="width: 180px">
-          <el-select
-            v-model="queryParams.deptId"
-            clearable
-            placeholder="所属机构"
-          >
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-<!--        <el-form-item label="" style="width: 180px">-->
-<!--          <el-input placeholder="请输入油号" v-model="queryParams.orderNo"></el-input>-->
-<!--        </el-form-item>-->
-        <el-form-item label="" prop="payChannel" style="width: 180px">
-          <el-select
-            v-model="queryParams.terminal"
-            clearable
-            placeholder="订单类型"
-          >
-            <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="PC"/>
-            <el-option label="POS端" value="POS"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="payType" style="width: 180px">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="支付方式"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="orderStatus" style="width: 180px">
-          <el-select
-            v-model="queryParams.orderStatus"
-            clearable
-            placeholder="订单状态"
-          >
-            <el-option label="支付成功" value="paid"/>
-            <el-option label="待支付" value="unpaid"/>
-            <el-option label="退款成功" value="refund"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易结束日期">
-          </el-date-picker>
-        </el-form-item>
-
-
-
-
-        <el-form-item class="" style="float: right;margin-right:0px">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <!--    </el-card>-->
-      <!--    <el-card class="box-card">-->
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-
-
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
-          <el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
-          <el-table-column prop="terminal" align="center" label="订单类型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.terminal=='cashier'">收银台</span>
-              <span v-else-if="scope.row.terminal=='POS'">POS机</span>
-              <span v-else-if="scope.row.terminal=='PC'">收银台</span>
-              <span v-else-if="scope.row.terminal=='applet'">小程序</span>
-              <span v-else>其他</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="payType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payType=='CASH'">现金</span>
-              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="orderStatus" align="center" label="支付状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.orderStatus == 'unpaid'">待支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">支付成功</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">退款成功</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="消费信息">
-            <el-table-column prop="oilName" align="center" label="油号" > </el-table-column>
-            <el-table-column prop="gunName" align="center" label="油枪" > </el-table-column>
-            <el-table-column prop="oilNum" align="center" label="升数" > </el-table-column>
-          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="支付通道">
-          </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
-          <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
-          <el-table-column prop="payTime" align="center" label="订单完成时间" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {getDuiZhangOilListApi} from "@/api/financialStatement/jiaoyiduizhang";
-import {getRunningWaterByTissueApi} from "@/api/allOrder";
-
-  export default {
-    name: "jiaoyiduizhang-oil",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          CASH:"0",
-          WECHAT:"0",
-          ALIPAY:"0",
-          balance:"0",
-          CASHCount:"0",
-          WECHATCount:"0",
-          ALIPAYCount:"0",
-          balanceCount:"0",
-          refBalance:"0",
-          refBalanceCount:"0",
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getDuiZhangOilListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-      },
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-.box-card{
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box{
-  width: 100%;
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
deleted file mode 100644
index 79a9ad54d..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <el-form-item label="" prop="deptId" style="width: 180px">
-          <el-select
-            v-model="queryParams.deptId"
-            clearable
-            placeholder="所属机构"
-          >
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-<!--        <el-form-item label="" style="width: 180px">-->
-<!--          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>-->
-<!--        </el-form-item>-->
-        <el-form-item label="" prop="terminal" style="width: 180px">
-          <el-select
-            v-model="queryParams.terminal"
-            clearable
-            placeholder="订单类型"
-          >
-            <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="PC"/>
-            <el-option label="POS端" value="POS"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="payType" style="width: 180px">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="支付方式"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="status" style="width: 180px">
-          <el-select
-            v-model="queryParams.status"
-            clearable
-            placeholder="订单状态"
-          >
-            <el-option label="支付成功" value="paid"/>
-            <el-option label="待支付" value="unpaid"/>
-            <el-option label="退款成功" value="refund"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易结束日期">
-          </el-date-picker>
-        </el-form-item>
-
-
-
-
-        <el-form-item class="" style="float: right;;margin-right:0px">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <!--    </el-card>-->
-      <!--    <el-card class="box-card">-->
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
-          <el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
-          <el-table-column prop="payChannel" align="center" label="订单类型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payChannel=='cashier'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
-              <span v-else>其他</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="payType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payType=='CASH'">现金</span>
-              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" align="center" label="支付状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="消费信息">
-            <el-table-column prop="cvsGoodsName" align="center" label="商品品类" > </el-table-column>
-            <el-table-column prop="goodsName" align="center" label="商品名称" > </el-table-column>
-            <el-table-column prop="goodsNum" align="center" label="数量" > </el-table-column>
-          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="支付通道">
-          </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
-          <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
-          <el-table-column prop="payTime" align="center" label="订单完成时间" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
-
-  export default {
-    name: "jiaoyiduizhang-store",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          CASH:"0",
-          WECHAT:"0",
-          ALIPAY:"0",
-          balance:"0",
-          CASHCount:"0",
-          WECHATCount:"0",
-          ALIPAYCount:"0",
-          balanceCount:"0",
-          refBalance:"0",
-          refBalanceCount:"0",
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-
-      // 获取订单统计信息
-
-
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getDuiZhangGoodsListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-      },
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-.box-card{
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box{
-  width: 100%;
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
deleted file mode 100644
index 3b525a787..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <el-form-item label="" prop="deptId" style="width: 180px">
-          <el-select
-            v-model="queryParams.deptId"
-            clearable
-            placeholder="所属机构"
-          >
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" style="width: 180px">
-          <el-input placeholder="会员手机号" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="payChannel" style="width: 180px">
-          <el-select
-            v-model="queryParams.payChannel"
-            clearable
-            placeholder="订单类型"
-          >
-            <el-option label="充值卡" value="0"/>
-            <el-option label="其他" value="1"/>
-<!--            <el-option label="小程序" value="applet"/>-->
-<!--            <el-option label="收银台" value="cashier"/>-->
-<!--            <el-option label="POS端" value="POS"/>-->
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="payType" style="width: 180px">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="支付方式"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="status" style="width: 180px">
-          <el-select
-            v-model="queryParams.status"
-            clearable
-            placeholder="订单状态"
-          >
-            <el-option label="支付成功" value="paid"/>
-            <el-option label="待支付" value="unpaid"/>
-            <el-option label="退款失败" value="refund"/>
-            <el-option label="支付失败" value="payFail"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易结束日期">
-          </el-date-picker>
-        </el-form-item>
-
-
-
-
-        <el-form-item class="" style="float: right;margin-right:0px">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-<!--    </el-card>-->
-<!--    <el-card class="box-card">-->
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
-          <el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
-          <el-table-column prop="payChannel" align="center" label="订单类型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payChannel=='cashier'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
-              <span v-else>其他</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="payType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payType=='CASH'">现金</span>
-              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" align="center" label="支付状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="消费信息">
-            <el-table-column prop="name" align="center" label="会员名称" > </el-table-column>
-            <el-table-column prop="mobile" align="center" label="会员手机号" > </el-table-column>
-            <el-table-column prop="rechargeType" align="center" label="卡类型" >
-              <template slot-scope="scope">
-                <span v-if="scope.row.rechargeType=='0'">充值卡</span>
-                <span v-else-if="scope.row.rechargeType=='1'">自定义</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="支付通道">
-            <template slot-scope="scope">
-              {{scope.row.mchntCd?scope.row.mchntCd:'--'}}
-
-            </template>
-          </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
-            <template slot-scope="scope">
-              {{scope.row.mchntCd?scope.row.paymentChannel:'--'}}
-
-            </template></el-table-column>
-          <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
-          <el-table-column prop="payTime" align="center" label="订单完成时间" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-import {getDuiZhangVipListApi, getVipListApi} from "@/api/financialStatement/jiaoyiduizhang";
-import {getRunningWaterByTissueApi} from "@/api/allOrder";
-
-  export default {
-    name: "jiaoyiduizhang-vip",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          CASH:"0",
-          WECHAT:"0",
-          ALIPAY:"0",
-          balance:"0",
-          CASHCount:"0",
-          WECHATCount:"0",
-          ALIPAYCount:"0",
-          balanceCount:"0",
-          refBalance:"0",
-          refBalanceCount:"0",
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getDuiZhangVipListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .box-card{
-    width: 100%;
-    margin: 0px 20px 20px 20px;
-  }
-
-  .el-form--inline .el-form-item {
-    margin-right: 20px;
-  }
-
-  .table-box{
-    width: 100%;
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue
deleted file mode 100644
index d23ca2530..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <div class="app-center">
-    <div class="app-top">
-      <el-card >
-        <el-radio-group v-model="radio1">
-          <el-radio-button label="交易明细"></el-radio-button>
-          <el-radio-button label="退款明细"></el-radio-button>
-<!--          <el-radio-button label="按时间统计手续费"></el-radio-button>-->
-<!--          <el-radio-button label="按门店统计手续费"></el-radio-button>-->
-        </el-radio-group>
-      </el-card>
-    </div>
-    <reconciliation-trading v-if="radio1 == '交易明细' "></reconciliation-trading>
-    <reconciliation-ref v-if="radio1 == '退款明细' "></reconciliation-ref>
-    <reconciliation-time v-if="radio1 == '按时间统计手续费' "></reconciliation-time>
-    <reconciliation-store v-if="radio1 == '按门店统计手续费' "></reconciliation-store>
-  </div>
-</template>
-
-<script>
-
-import ReconciliationTrading from "@/views/financialStatement/reconciliation/tab/trading.vue";
-import ReconciliationRef from "@/views/financialStatement/reconciliation/tab/ref.vue";
-import ReconciliationTime from "@/views/financialStatement/reconciliation/tab/time.vue";
-import ReconciliationStore from "@/views/financialStatement/reconciliation/tab/store.vue";
-
-export default {
-  name: "reconciliation-list",
-  data(){
-    return{
-      radio1:'交易明细'
-    }
-  },
-  components:{
-    ReconciliationStore,
-    ReconciliationTime,
-    ReconciliationRef,
-    ReconciliationTrading
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    }
-  }
-
-}
-</script>
-
-<style scoped>
-.app-center{
-  width: 100%;
-
-  box-sizing: border-box;
-  padding: 10px;
-}
-.app-top{
-  width: 100%;
-  margin-bottom: 20px;
-  height: 60px;
-  box-sizing: border-box;
-
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
deleted file mode 100644
index 00e990010..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
+++ /dev/null
@@ -1,470 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
-        <el-form-item label="">
-
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="" prop="deptId">
-          <el-select
-            v-model="queryParams.deptId"
-            clearable
-            placeholder="机构"
-          >
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-            </el-option>
-
-
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="payChannel">
-          <el-select
-            v-model="queryParams.payChannel"
-            clearable
-            placeholder="支付渠道"
-          >
-            <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="cashier"/>
-            <el-option label="POS端" value="POS"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="payType">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="支付方式"
-          >
-            <el-option label="现金" value="CASH"/>
-            <el-option label="微信" value="WECHAT"/>
-            <el-option label="支付宝" value="ALIPAY"/>
-            <el-option label="余额" value="balance"/>
-          </el-select>
-        </el-form-item>
-<!--        <el-form-item class="f-button" style="text-align: right;">-->
-<!--          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>-->
-<!--          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
-<!--&lt;!&ndash;          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>&ndash;&gt;-->
-
-<!--        </el-form-item>-->
-        <el-form-item class="flex-container" style="float: right">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>统计</span>
-      </div>
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-bole">{{
-              orderStatistics.refBalanceCount }}</div>          <div class="size-hui">
-            <div class="nei">退款笔数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ orderStatistics.refBalance?orderStatistics.refBalance:0 }}</div>
-          <div class="size-hui">
-            <div class="nei">退款余额</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-
-
-
-
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-<!--        <div>机构流水分析列表</div>-->
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
-          <el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
-          <el-table-column prop="payChannel" align="center" label="支付渠道">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payChannel=='cashier'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">平台</span>
-              <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
-              <span v-else>其他</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>
-          <el-table-column prop="type" align="center" label="订单来源">
-            <template slot-scope="scope">
-              <span v-if="scope.row.type=='1'">油品</span>
-              <span v-else-if="scope.row.type=='2'">商品</span>
-              <span v-else-if="scope.row.type=='3'">储值卡</span>
-              <span v-else-if="scope.row.type=='4'">积分</span>
-              <span v-else-if="scope.row.type=='5'">囤油卡</span>
-              <span v-else-if="scope.row.type=='6'">油品加商品(收银台订单)</span>
-              <span v-else-if="scope.row.type=='7'">挂账订单</span>
-              <span v-else="">其他</span>
-            </template>
-          </el-table-column>
-<!--          <el-table-column prop="amount" align="center" label="所属模块"> </el-table-column>-->
-          <el-table-column prop="payType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payType=='CASH'">现金</span>
-              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
-            </template>
-          </el-table-column>
-
-<!--          <el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>-->
-<!--          <el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>-->
-          <el-table-column prop="payMoney" align="center" label="退款金额"> </el-table-column>
-<!--          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>-->
-          <!--          <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
-          <el-table-column prop="userName" align="center" label="付款用户"> </el-table-column>
-          <el-table-column prop="reasonRefund" align="content" label="备注" > </el-table-column>
-          <el-table-column label="操作" align="center"  class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button style="width: 60px" size="mini"
-                         @click="getOrdersInfo(scope.row)"
-                         type="success" plain round>详情</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-<!--      <div class="pagination-box">-->
-<!--        <el-pagination-->
-<!--          background-->
-<!--          v-show="total>0"-->
-<!--          layout="prev, pager, next"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.page"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @current-change="getList">-->
-<!--        </el-pagination>-->
-<!--      </div>-->
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-    <el-dialog
-      title="订单信息"
-      :visible.sync="dialogVisible">
-
-      <el-descriptions :title="'订单号：'+ordersInfo.orderNo">
-        <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item>
-        <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item>
-        <el-descriptions-item label="支付渠道">{{ordersInfo.payChannel}}</el-descriptions-item>
-        <el-descriptions-item label="商户号">{{ordersInfo.mchntCd}}</el-descriptions-item>
-        <el-descriptions-item label="费率">{{ordersInfo.amount}}</el-descriptions-item>
-        <el-descriptions-item label="订单来源">{{ordersInfo.type}}</el-descriptions-item>
-        <el-descriptions-item label="所属模块">{{ordersInfo.amount}}</el-descriptions-item>
-        <el-descriptions-item label="支付方式">{{ordersInfo.payType}}</el-descriptions-item>
-        <el-descriptions-item label="付款用户">{{ordersInfo.userName}}</el-descriptions-item>
-        <el-descriptions-item label="支付状态">{{ordersInfo.status}}</el-descriptions-item>
-        <el-descriptions-item label="备注">{{ordersInfo.content}}</el-descriptions-item>
-        <!--        <el-descriptions-item label="备注">-->
-        <!--          <el-tag size="small">学校</el-tag>-->
-        <!--        </el-descriptions-item>-->
-      </el-descriptions>
-
-      <el-descriptions class="margin-top" title="金额详情" :column="3" border>
-        <el-descriptions-item>
-          <template slot="label">
-            订单金额
-          </template>
-          {{ordersInfo.goodsMoney?ordersInfo.goodsMoney:"--"}}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            优惠后应付金额
-          </template>
-          {{ordersInfo.payMoney?ordersInfo.payMoney:"--"}}
-
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            退款金额
-          </template>
-          {{ordersInfo.refMoney?ordersInfo.refMoney:"--"}}
-
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            实收金额
-          </template>
-          {{ordersInfo.payMoney?ordersInfo.payMoney:"--"}}
-
-        </el-descriptions-item>
-      </el-descriptions>
-
-
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-
-import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from "@/api/allOrder";
-
-  export default {
-    name: "reconciliation-ref",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        ordersInfo: {},
-        // 员工列表
-        deptList:[],
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"refund",
-          payType:"",
-          payChannel:"",
-        },
-        orderStatistics:{
-          refBalance:"0",
-          refBalanceCount:"0",
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-        //   this.$download.saveAs(blob,'收银台订单统计.xLsx')
-        // })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-        })
-      },
-
-
-      // 获取列表信息
-      getList(val){
-         let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    //box-sizing: border-box;
-    padding: 5px;
-    //background: #f9f9f9;
-    margin-right: 20px;
-    padding-left: 20px;
-
-    width: 211px;
-    height: 60px;
-    background: rgba(64,158,255,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #409EFF;
-  }
-  .el-form--inline .el-form-item {
-    margin-right: 44px;
-  }
-  .size-hui{
-    display: flex;
-    align-items: center;
-    //width: 200px;
-    font-family: Source Han Sans CN, Source Han Sans CN;
-    font-weight: 400;
-    font-size: 13px;
-    color: #888888;
-    //line-height: 0px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    .nei {
-      width: 150px;
-    }
-  }
-  .size-bole{
-    //font-weight: bold;
-
-    //width: 53px;
-    height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
-    font-size: 24px;
-    color: #555555;
-    //line-height: 0px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-
-  .icon-img{
-    //margin-left: 110px;
-    width: 100%;
-    height: 20px;
-    margin-right: 5px;
-    img{
-      float: right;
-      //width: 100%;
-      width: 20px;
-      height: 100%;
-    }
-  }
-
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue
deleted file mode 100644
index 21cb1ad6b..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue
+++ /dev/null
@@ -1,321 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
-        <el-form-item label="交易时间：">
-          <!--          <el-date-picker-->
-          <!--            v-model="dateRange"-->
-          <!--            style="width: 400px"-->
-          <!--            size="medium"-->
-          <!--            value-format="yyyy-MM-dd"-->
-          <!--            type="datetimerange"-->
-          <!--            range-separator="至"-->
-          <!--            start-placeholder="开始日期"-->
-          <!--            end-placeholder="结束日期"-->
-          <!--          ></el-date-picker>-->
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="机构：" prop="staffId">
-          <el-select
-            v-model="queryParams.staffId"
-            clearable
-            placeholder="全部"
-          >
-            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-              <span style="float: left">{{ item.realName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>订单统计</span>
-      </div>
-      <div class="box-gang">
-      <div class="box">
-        <div class="size-hui">手续费合计</div>
-        <div class="size-bole">{{ 0 }}</div>
-      </div>
-      <div class="box">
-        <div class="size-hui">微信支付手续费</div>
-        <div class="size-bole">{{ 0 }}</div>
-      </div>
-      <div class="box">
-        <div class="size-hui">支付宝手续费</div>
-        <div class="size-bole">{{ 0 }}</div>
-      </div>
-      <div class="box">
-        <div class="size-hui">银行卡手续费</div>
-        <div class="size-bole">{{ 0 }}</div>
-      </div>
-      <div class="box">
-        <div class="size-hui">银联云闪付手续费</div>
-        <div class="size-bole">{{ 0 }}</div>
-      </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-        <div>机构流水分析列表</div>
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
-          </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-          </el-table-column>
-
-
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    name: "reconciliation-store",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-        },
-        orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-
-    },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-        //   this.$download.saveAs(blob,'收银台订单统计.xLsx')
-        // })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   this.orderStatistics = res.data
-        // })
-      },
-
-      // 获取列表信息
-      getList(val){
-
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
-        this.getOrderStatistics()
-      },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    width: 200px;
-    box-sizing: border-box;
-    padding: 10px;
-    background: #f9f9f9;
-    height: 86px;
-    margin-right: 10px;
-  }
-  .size-hui{
-    font-size: 14px;
-    margin-bottom: 10px;
-    margin-top: 10px;
-  }
-  .size-bole{
-    font-weight: bold;
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue
deleted file mode 100644
index 8f179bf8c..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
-        <el-form-item label="交易时间：">
-          <!--          <el-date-picker-->
-          <!--            v-model="dateRange"-->
-          <!--            style="width: 400px"-->
-          <!--            size="medium"-->
-          <!--            value-format="yyyy-MM-dd"-->
-          <!--            type="datetimerange"-->
-          <!--            range-separator="至"-->
-          <!--            start-placeholder="开始日期"-->
-          <!--            end-placeholder="结束日期"-->
-          <!--          ></el-date-picker>-->
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="机构：" prop="staffId">
-          <el-select
-            v-model="queryParams.staffId"
-            clearable
-            placeholder="全部"
-          >
-            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-              <span style="float: left">{{ item.realName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>收银台订单统计</span>
-      </div>
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-hui">手续费合计</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">微信支付手续费</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">支付宝手续费</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">银行卡手续费</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">银联云闪付手续费</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-        <div>机构流水分析列表</div>
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
-          </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-          </el-table-column>
-
-
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    name: "reconciliation-time",
-    data(){
-      return{
-        loading:false,
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-        },
-        orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-
-    },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-        //   this.$download.saveAs(blob,'收银台订单统计.xLsx')
-        // })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   this.orderStatistics = res.data
-        // })
-      },
-
-      // 获取列表信息
-      getList(val){
-
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
-        this.getOrderStatistics()
-      },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    width: 200px;
-    box-sizing: border-box;
-    padding: 10px;
-    background: #f9f9f9;
-    height: 86px;
-    margin-right: 10px;
-  }
-  .size-hui{
-    font-size: 14px;
-    margin-bottom: 10px;
-    margin-top: 10px;
-  }
-  .size-bole{
-    font-weight: bold;
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
deleted file mode 100644
index b72c656b6..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
+++ /dev/null
@@ -1,566 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <el-form-item label="">
-          <el-input placeholder="流水编号" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="交易结束日期">
-          </el-date-picker>
-        </el-form-item>
-          <el-form-item label="" prop="deptId">
-            <el-select
-              v-model="queryParams.deptId"
-              clearable
-              placeholder="机构"
-            >
-              <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-              </el-option>
-
-
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="payChannel">
-            <el-select
-              v-model="queryParams.payChannel"
-              clearable
-              placeholder="支付渠道"
-            >
-              <el-option label="小程序" value="applet"/>
-              <el-option label="收银台" value="cashier"/>
-              <el-option label="POS端" value="POS"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="payType">
-            <el-select
-              v-model="queryParams.payType"
-              clearable
-              placeholder="支付方式"
-            >
-              <el-option label="现金" value="CASH"/>
-              <el-option label="微信" value="WECHAT"/>
-              <el-option label="支付宝" value="ALIPAY"/>
-              <el-option label="余额" value="balance"/>
-            </el-select>
-          </el-form-item>
-        <el-form-item label="" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            clearable
-            placeholder="支付状态"
-          >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="" style="float: right;">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card class="box-card">
-<!--      <div slot="header" class="clearfix">-->
-<!--        <span>收银台订单统计</span>-->
-<!--      </div>-->
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-bole">{{ orderStatistics.wechat?orderStatistics.wechat:0 }}元/{{orderStatistics.wechatcount}}笔</div>
-          <div class="size-hui">
-            <div class="nei">微信收款</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ orderStatistics.alipay?orderStatistics.alipay:0 }}元/{{orderStatistics.alipaycount}}笔</div>
-          <div class="size-hui">
-            <div class="nei">支付宝收款</div>
-
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ orderStatistics.balance?orderStatistics.balance:0 }}元/{{orderStatistics.balanceCount}}笔</div>
-          <div class="size-hui">
-            <div class="nei">会员钱包收款</div>
-
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-
-          </div>
-        </div>
-<!--        <div class="box">-->
-<!--          <div class="size-hui">银行卡收款</div>-->
-<!--          <div class="size-bole">{{ 0 }}元/{{0}}笔</div>-->
-<!--        </div>-->
-<!--        <div class="box">-->
-<!--          <div class="size-hui">银联云闪付收款</div>-->
-<!--          <div class="size-bole">{{ 0 }}元/{{0}}笔</div>-->
-<!--        </div>-->
-        <div class="box">
-          <div class="size-bole">{{ orderStatistics.cash?orderStatistics.cash:0 }}元/{{orderStatistics.cashcount}}笔</div>
-
-          <div class="size-hui">
-            <div class="nei">现金支付收款</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-
-          </div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-<!--        <div>交易明细分析列表</div>-->
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="storeName" align="center" label="门店" width="150"> </el-table-column>
-          <el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
-          <el-table-column prop="payChannel" align="center" label="支付渠道">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payChannel=='cashier'">收银台</span>
-              <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">平台</span>
-              <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
-              <span v-else>其他</span>
-            </template>
-
-          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="商户号" width="150"> </el-table-column>
-<!--          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>-->
-          <el-table-column prop="type" align="center" label="订单来源" width="150">
-            <template slot-scope="scope">
-              <span v-if="scope.row.type=='1'">油品</span>
-              <span v-else-if="scope.row.type=='2'">商品</span>
-              <span v-else-if="scope.row.type=='3'">储值卡</span>
-              <span v-else-if="scope.row.type=='4'">积分</span>
-              <span v-else-if="scope.row.type=='5'">囤油卡</span>
-              <span v-else-if="scope.row.type=='6'">油品加商品(收银台订单)</span>
-              <span v-else-if="scope.row.type=='7'">挂账订单</span>
-              <span v-else="">其他</span>
-            </template>
-          </el-table-column>
-<!--          <el-table-column prop="amount" align="center" label="所属模块"> </el-table-column>-->
-          <el-table-column prop="payType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payType=='CASH'">现金</span>
-              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" align="center" label="支付状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="订单金额">
-            <template slot-scope="scope">
-              <span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span>
-              <span v-else>{{scope.row.goodsMoney}}</span>
-            </template>
-
-          </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="优惠后应付金额" width="150"> </el-table-column>
-          <el-table-column prop="refMoney" align="center" label="退款金额">
-            <template slot-scope="scope">
-              <span v-if="scope.row.status == 'refund'">{{scope.row.payMoney}}</span>
-              <span type="danger" v-else>--</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
-<!--          <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
-          <el-table-column prop="userName" align="center" label="付款用户" width="135"> </el-table-column>
-          <el-table-column prop="content" align="content" label="备注" > </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button style="width: 60px" size="mini"
-                         @click="getOrdersInfo(scope.row)"
-                         type="success" plain round>详情</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-<!--      <div class="pagination-box">-->
-<!--        <el-pagination-->
-<!--          background-->
-<!--          v-show="total>0"-->
-<!--          layout="prev, pager, next"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.page"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @current-change="getList">-->
-<!--        </el-pagination>-->
-<!--      </div>-->
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-
-    <el-dialog
-      title="订单信息"
-      :visible.sync="dialogVisible">
-
-      <el-descriptions :title="'订单号：'+ordersInfo.orderNo">
-        <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item>
-        <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item>
-        <el-descriptions-item label="支付渠道">{{ordersInfo.payChannel}}</el-descriptions-item>
-        <el-descriptions-item label="商户号">{{ordersInfo.mchntCd}}</el-descriptions-item>
-        <el-descriptions-item label="费率">{{ordersInfo.amount}}</el-descriptions-item>
-        <el-descriptions-item label="订单来源">{{ordersInfo.type}}</el-descriptions-item>
-        <el-descriptions-item label="所属模块">{{ordersInfo.amount}}</el-descriptions-item>
-        <el-descriptions-item label="支付方式">{{ordersInfo.payType}}</el-descriptions-item>
-        <el-descriptions-item label="付款用户">{{ordersInfo.userName}}</el-descriptions-item>
-        <el-descriptions-item label="支付状态">{{ordersInfo.status}}</el-descriptions-item>
-        <el-descriptions-item label="备注">{{ordersInfo.content}}</el-descriptions-item>
-<!--        <el-descriptions-item label="备注">-->
-<!--          <el-tag size="small">学校</el-tag>-->
-<!--        </el-descriptions-item>-->
-      </el-descriptions>
-
-      <el-descriptions class="margin-top" title="金额详情" :column="3" border>
-        <el-descriptions-item>
-          <template slot="label">
-            订单金额
-          </template>
-          {{ordersInfo.goodsMoney?ordersInfo.goodsMoney:"--"}}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            优惠后应付金额
-          </template>
-          {{ordersInfo.payMoney?ordersInfo.payMoney:"--"}}
-
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            退款金额
-          </template>
-          {{ordersInfo.refMoney?ordersInfo.refMoney:"--"}}
-
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            实收金额
-          </template>
-          {{ordersInfo.payMoney?ordersInfo.payMoney:"--"}}
-
-        </el-descriptions-item>
-      </el-descriptions>
-
-
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-
-  export default {
-    name: "reconciliation-trading",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          CASH:"0",
-          WECHAT:"0",
-          ALIPAY:"0",
-          balance:"0",
-          CASHCount:"0",
-          WECHATCount:"0",
-          ALIPAYCount:"0",
-          balanceCount:"0",
-          refBalance:"0",
-          refBalanceCount:"0",
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'交易明细统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-          console.log("res.data1111",res.data)
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-.icon-img{
-
-  //margin-left: 110px;
-  width: 100%;
-  height: 20px;
-  margin-right: 5px;
-  img{
-    float: right;
-    //width: 100%;
-    width: 20px;
-
-    height: 100%;
-  }
-}
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    //box-sizing: border-box;
-    padding: 5px;
-    //background: #f9f9f9;
-    margin-right: 20px;
-padding-left: 20px;
-
-    width: 211px;
-    height: 60px;
-    background: rgba(64,158,255,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #409EFF;
-
-  }
-  .size-hui{
-    //font-size: 14px;
-    //margin-bottom: 10px;
-    //margin-top: 10px;
-display: flex;
-    align-items: center;
-//width: 200px;
-    font-family: Source Han Sans CN, Source Han Sans CN;
-    font-weight: 400;
-    font-size: 13px;
-    color: #888888;
-    //line-height: 0px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    .nei {
-      width: 150px;
-    }
-  }
-.el-form--inline .el-form-item {
-  margin-right: 44px;
-}
-.f-button{
-  width: 100%;
-  float: right ;
-  text-align: right;
-}
-  .size-bole{
-    //font-weight: bold;
-
-    //width: 53px;
-    height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
-    font-size: 24px;
-    color: #555555;
-    //line-height: 0px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-.flex-container {
-  //display: flex;
-  //justify-content: flex-end;
-  //align-items: center;
-  //flex-wrap: nowrap; /* 确保不换行 */
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  flex-wrap: nowrap; /* 确保不换行 */
-  width: 100%; /* 让父容器占满可用宽度 */
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue
deleted file mode 100644
index 92c023875..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-  <div class="app-center">
-    <div class="app-top">
-      <el-card>
-        <el-radio-group v-model="radio1">
-          <el-radio-button label="机构流水分析"></el-radio-button>
-          <el-radio-button label="门店流水分析"></el-radio-button>
-          <el-radio-button label="无流水门店"></el-radio-button>
-          <el-radio-button label="日流水分析"></el-radio-button>
-        </el-radio-group>
-      </el-card>
-    </div>
-    <running-water-institution v-if="radio1 == '机构流水分析' "></running-water-institution>
-    <running-water-oil-depot v-if="radio1 == '门店流水分析' "></running-water-oil-depot>
-    <running-water-day v-if="radio1 == '日流水分析' "></running-water-day>
-    <running-water-none v-if="radio1 == '无流水门店' "></running-water-none>
-  </div>
-</template>
-
-<script>
-
-
-import RunningWaterInstitution from "@/views/financialStatement/runningWater/tab/instituion.vue";
-import RunningWaterOilDepot from "@/views/financialStatement/runningWater/tab/oilDepot.vue";
-import RunningWaterDay from "@/views/financialStatement/runningWater/tab/day.vue";
-import RunningWaterNone from "@/views/financialStatement/runningWater/tab/none.vue";
-
-export default {
-  name: "runningWater-list",
-  data(){
-    return{
-      radio1:'机构流水分析'
-    }
-  },
-  components:{
-    RunningWaterNone,
-    RunningWaterDay,
-    RunningWaterOilDepot,
-    RunningWaterInstitution
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    }
-  }
-
-}
-</script>
-
-<style scoped>
-.app-center{
-  width: 100%;
-
-  box-sizing: border-box;
-  padding: 10px;
-}
-.app-top{
-  width: 100%;
-  margin-bottom: 20px;
-  height: 60px;
-  box-sizing: border-box;
-
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
deleted file mode 100644
index c65b83dcd..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>订单统计</span>
-      </div>
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.amount) ? '0.00' : parseFloat(orderStatistics.amount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">交易金额</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.strokeCount) ? '0.00' : parseFloat(orderStatistics.strokeCount).toFixed(2) }}</div>
-          <div class="size-hui">
-          <div class="nei">交易笔数</div>
-          <div class="icon-img">
-            <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-          </div>
-        </div>
-
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.unitPrice) ? '0.00' : parseFloat(orderStatistics.unitPrice).toFixed(2) }}</div>
-          <div class="size-hui">
-          <div class="nei">笔单价</div>
-          <div class="icon-img">
-            <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-          </div>
-        </div>
-
-
-        </div>
-<!--        <div class="box">-->
-<!--          <div class="size-hui">日均交易金额</div>-->
-<!--          <div class="size-bole">{{ orderStatistics.dailyAmount }}</div>-->
-<!--        </div>-->
-<!--        <div class="box">-->
-<!--          <div class="size-hui">日均交易笔数</div>-->
-<!--          <div class="size-bole">{{ orderStatistics.strokesPerDay }}</div>-->
-<!--        </div>-->
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-<!--        <div>门店日流水分析列表</div>-->
-        <div style="display: flex ">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="60px">
-
-            <el-form-item label="">
-              <!--          <el-date-picker-->
-              <!--            v-model="dateRange"-->
-              <!--            style="width: 400px"-->
-              <!--            size="medium"-->
-              <!--            value-format="yyyy-MM-dd"-->
-              <!--            type="datetimerange"-->
-              <!--            range-separator="至"-->
-              <!--            start-placeholder="开始日期"-->
-              <!--            end-placeholder="结束日期"-->
-              <!--          ></el-date-picker>-->
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 140px"
-                type="date"
-                placeholder="交易开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="endTime"
-                style="width: 140px"
-                type="date"
-                placeholder="交易结束日期">
-              </el-date-picker>
-            </el-form-item>
-<!--            <el-form-item label="机构：" prop="deptId">-->
-<!--              <el-select-->
-<!--                v-model="queryParams.deptId"-->
-<!--                clearable-->
-<!--                placeholder="全部"-->
-<!--              >-->
-<!--                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="payTime" align="center" label="日期"></el-table-column>
-<!--          <el-table-column prop="seekZero" align="center" label="活跃机构数量"> </el-table-column>-->
-          <el-table-column prop="storeCount" align="center" label="活跃门店数量"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
-          <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
-          <el-table-column prop="unitPrice" align="center" label="笔单价">
-            <template slot-scope="scope">
-              <span>{{scope.row.unitPrice}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="dailyAmount" align="center" label="日均交易金额">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.amount / scope.row.storeCount).toFixed(2) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="strokesPerDay" align="center" label="日均交易笔数">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.strokeCount / scope.row.storeCount).toFixed(2) }}</span>
-            </template>
-          </el-table-column>
-<!--          <el-table-column prop="seekZero" align="center" label="机构日均交易金额"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="机构日均交易笔数"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="门店日均交易金额"> </el-table-column>-->
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTissueApi} from "@/api/allOrder";
-
-  export default {
-    name: "runningWater-day",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        deptList:[],
-
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-        },
-        orderStatistics:{
-          amount:'0',
-          strokeCount:'0',
-          unitPrice:'0',
-          dailyAmount:'0',
-          strokesPerDay:'0'
-        },
-        total:0,
-      }
-    },
-    created() {
-      console.log("11111111111111111111111111111111")
-
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-
-
-    },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        exportExcelDayApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'日流水分析.xLsx')
-        })
-      },
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getDayDatyListApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getDayListApi(this.addDateRange(this.queryParams, dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    padding: 5px;
-    margin-right: 20px;
-    padding-left: 20px;
-    width: 211px;
-    height: 60px;
-    background: rgba(64,158,255,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #409EFF;
-  }
-  .size-hui{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-family: Source Han Sans CN, Source Han Sans CN;
-    font-weight: 400;
-    font-size: 13px;
-    color: #888888;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    .nei {
-      width: 150px;
-    }
-  }
-  .size-bole{
-    height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
-    font-size: 24px;
-    color: #555555;
-    //line-height: 0px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-
-
-  .icon-img{
-    width: 20px;
-    height: 20px;
-    margin-right: 5px;
-    img{
-      width: 20px;
-      height: 20px;
-    }
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
deleted file mode 100644
index 43032b275..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
+++ /dev/null
@@ -1,390 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>订单统计</span>
-      </div>
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.amount) ? '0.00' : parseFloat(orderStatistics.amount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">交易金额</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.strokeCount) ? '0.00' : parseFloat(orderStatistics.strokeCount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">交易笔数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.unitPrice) ? '0.00' : parseFloat(orderStatistics.unitPrice).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">笔单价</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.dailyAmount) ? '0.00' : parseFloat(orderStatistics.dailyAmount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">日均交易金额</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.strokesPerDay) ? '0.00' : parseFloat(orderStatistics.strokesPerDay).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">日均交易笔数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.inertiaStore) ? '0.00' : parseFloat(orderStatistics.inertiaStore).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">活跃机构数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-<!--        <div>机构流水分析列表</div>-->
-        <div style="display: flex ">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
-
-            <el-form-item label="">
-              <!--          <el-date-picker-->
-              <!--            v-model="dateRange"-->
-              <!--            style="width: 400px"-->
-              <!--            size="medium"-->
-              <!--            value-format="yyyy-MM-dd"-->
-              <!--            type="datetimerange"-->
-              <!--            range-separator="至"-->
-              <!--            start-placeholder="开始日期"-->
-              <!--            end-placeholder="结束日期"-->
-              <!--          ></el-date-picker>-->
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 140px"
-                type="date"
-                placeholder="交易开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="endTime"
-                style="width: 140px"
-                type="date"
-                placeholder="交易结束日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="" prop="staffId">
-              <el-select
-                v-model="queryParams.deptType"
-                clearable
-                placeholder="机构类别"
-              >
-                <!--                //节点类型:1代理商2连锁店3基本门店4三方机构-->
-                <el-option   label="代理商" value="1"></el-option>
-                <el-option   label="三方机构" value="4"></el-option>
-                <el-option   label="连锁店" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="" prop="deptId">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-
-
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-<!--          <el-table-column prop="deptId" align="center" label="机构编号" width="220"> </el-table-column>-->
-          <el-table-column prop="deptName" align="center" label="机构名称">
-          <template slot-scope="slot">
-            <span>{{slot.row.deptName}}({{slot.row.parentStoreName}})</span>
-          </template>
-          </el-table-column>
-          <el-table-column prop="inertiaStore" align="center" label="活跃门店数量"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
-          <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
-          <el-table-column prop="unitPrice" align="center" label="笔单价"> </el-table-column>
-          <el-table-column prop="dailyAmount" align="center" label="日均交易金额"> </el-table-column>
-          <el-table-column prop="strokesPerDay" align="center" label="日均交易笔数"> </el-table-column>
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTissueApi,
-  getInstituionListApi,
-  getRunningWaterByDataApi,
-  getRunningWaterByTissueApi
-} from "@/api/allOrder";
-
-  export default {
-    name: "runningWater-institution",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        deptList:[],
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          deptId:"",
-          deptType:"1",
-
-        },
-        orderStatistics:{
-          amount:'0',
-          strokeCount:'0',
-          unitPrice:'0',
-          dailyAmount:'0',
-          strokesPerDay:'0',
-          inertiaStore:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-      // this.getOrderStatistics();
-
-    },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        exportExcelTissueApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'流水订单统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getInstituionListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-
-        getDeptList() {
-          getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-            this.deptList = response.data.records;
-          })
-        },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    padding: 5px;
-    margin-right: 20px;
-    padding-left: 20px;
-    width: 211px;
-    height: 60px;
-    background: rgba(64,158,255,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #409EFF;
-  }
-  .el-form--inline .el-form-item {
-    margin-right: 44px;
-  }
-  .size-hui{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-family: Source Han Sans CN, Source Han Sans CN;
-    font-weight: 400;
-    font-size: 13px;
-    color: #888888;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    .nei {
-      width: 150px;
-    }
-  }
-  .size-bole{
-    height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
-    font-size: 24px;
-    color: #555555;
-
-    text-align: left;
-    font-style: normal;
-    text-transform: none;  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-
-
-  .icon-img{
-    width: 20px;
-    height: 20px;
-    margin-right: 5px;
-    img{
-      width: 20px;
-      height: 20px;
-    }
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue
deleted file mode 100644
index accbaf622..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <div class="wgang">
-        <div>无流水门店分析列表</div>
-        </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-<!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="deptName" align="center" label="门店名称"> </el-table-column>
-<!--          <el-table-column prop="seekZero" align="center" label="门店省市"> </el-table-column>-->
-          <el-table-column prop="leaderName" align="center" label="联系人"> </el-table-column>
-          <el-table-column prop="leaderPhone" align="center" label="联系电话"> </el-table-column>
-          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>
-          <el-table-column prop="parentStoreName" align="center" label="机构名称"> </el-table-column>
-<!--          <el-table-column prop="leaderName" align="center" label="业务员"> </el-table-column>-->
-<!--          <el-table-column prop="leaderPhone" align="center" label="业务员联系电话"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="省"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="市"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="区"> </el-table-column>-->
-          <el-table-column prop="addr" align="center" label="地址"> </el-table-column>
-          <el-table-column prop="createTime" align="center" label="创建日期"> </el-table-column>
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-  import {getNoneListApi} from "@/api/allOrder";
-
-  export default {
-    name: "runningWater-none",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-        },
-        orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-
-    },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-        //   this.$download.saveAs(blob,'收银台订单统计.xLsx')
-        // })
-      },
-
-      // 获取列表信息
-      getList(val){
-        getNoneListApi(this.addDateRange(this.queryParams)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-      },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    width: 200px;
-    box-sizing: border-box;
-    padding: 10px;
-    background: #f9f9f9;
-    height: 86px;
-    margin-right: 10px;
-  }
-  .size-hui{
-    font-size: 14px;
-    margin-bottom: 10px;
-    margin-top: 10px;
-  }
-  .size-bole{
-    font-weight: bold;
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
deleted file mode 100644
index 781d58317..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>订单统计</span>
-      </div>
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.amount) ? '0.00' : parseFloat(orderStatistics.amount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">交易金额</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.strokeCount) ? '0.00' : parseFloat(orderStatistics.strokeCount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">交易笔数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.unitPrice) ? '0.00' : parseFloat(orderStatistics.unitPrice).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">笔单价</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.dailyAmount) ? '0.00' : parseFloat(orderStatistics.dailyAmount).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">日均交易金额</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.strokesPerDay) ? '0.00' : parseFloat(orderStatistics.strokesPerDay).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">日均交易笔数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <div class="size-bole">{{ isNaN(orderStatistics.inertiaStore) ? '0.00' : parseFloat(orderStatistics.inertiaStore).toFixed(2) }}</div>
-          <div class="size-hui">
-            <div class="nei">活跃机构数</div>
-            <div class="icon-img">
-              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="wgang">
-<!--        <div>门店流水分析列表</div>-->
-        <div style="display: flex ">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
-            <el-form-item label="">
-              <!--          <el-date-picker-->
-              <!--            v-model="dateRange"-->
-              <!--            style="width: 400px"-->
-              <!--            size="medium"-->
-              <!--            value-format="yyyy-MM-dd"-->
-              <!--            type="datetimerange"-->
-              <!--            range-separator="至"-->
-              <!--            start-placeholder="开始日期"-->
-              <!--            end-placeholder="结束日期"-->
-              <!--          ></el-date-picker>-->
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 140px"
-                type="date"
-                placeholder="交易开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="endTime"
-                style="width: 140px"
-                type="date"
-                placeholder="交易结束日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="" prop="staffId">
-              <el-select
-                v-model="queryParams.staffId"
-                clearable
-                placeholder="机构"
-              >
-                <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-                  <span style="float: left">{{ item.realName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-<!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="deptName" align="center" label="门店名称"> </el-table-column>
-          <el-table-column prop="addr" align="center" label="门店省市"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
-          <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
-          <el-table-column prop="unitPrice" align="center" label="笔单价"> </el-table-column>
-          <el-table-column prop="dailyAmount" align="center" label="日均交易金额"> </el-table-column>
-          <el-table-column prop="strokesPerDay" align="center" label="日均交易笔数"> </el-table-column>
-          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>
-          <el-table-column prop="parentStoreName" align="center" label="机构名称"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="站长"> </el-table-column>
-<!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} from "@/api/allOrder";
-
-  export default {
-    name: "runningWater-oilDepot",
-    data(){
-      return{
-        loading:false,
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          deptType:"3",
-
-        },
-        orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-
-    },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        exportExcelOilDeptApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'油站流水订单统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getInstituionListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .app-top{
-    width: 100%;
-
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
-
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .box{
-    padding: 5px;
-    margin-right: 20px;
-    padding-left: 20px;
-    width: 211px;
-    height: 60px;
-    background: rgba(64,158,255,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #409EFF;
-  }
-  .el-form--inline .el-form-item {
-    margin-right: 44px;
-  }
-  .size-hui{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-family: Source Han Sans CN, Source Han Sans CN;
-    font-weight: 400;
-    font-size: 13px;
-    color: #888888;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    .nei {
-      width: 150px;
-    }
-  }
-  .size-bole{
-    height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
-    font-size: 24px;
-    color: #555555;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-  }
-  .table-box{
-    width: 100%;
-  }
-  .pagination-box{
-    width: 100%;
-    margin: 10px auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .top-app-sou{
-    width: 20%;
-  }
-  .tk{
-    text-align: center;
-    color: grey;
-    margin: 10px 0;
-  }
-
-
-  .icon-img{
-
-    width:  20px;
-    height: 20px;
-    margin-right: 5px;
-    img{
-
-      width: 20px;
-      height: 20px;
-    }
-  }
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k1.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k1.png
deleted file mode 100644
index f321d2580..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k1.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k2.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k2.png
deleted file mode 100644
index 120b063b2..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k2.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k3.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k3.png
deleted file mode 100644
index e21935627..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k3.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k4.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k4.png
deleted file mode 100644
index c2b1268b8..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k4.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k5.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k5.png
deleted file mode 100644
index a590ce1eb..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k5.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k6.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k6.png
deleted file mode 100644
index cc3467fe9..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k6.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k7.png b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k7.png
deleted file mode 100644
index 7013130ae..000000000
Binary files a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/imgs/k7.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
deleted file mode 100644
index bdd151cad..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div class="app-center">
-    <div class="app-top">
-    <el-card :body-style="{ padding: '0px' }">
-      <div class="box">
-        <div class="nbox" :class="pointerClass" @click="updateRedio('会员分析')">
-          <div class="fount-box" :style="{ color: radio1 === '会员分析' ? '#FF770F' : '#999999' }">会员分析</div>
-          <div class="heng-box" v-if="radio1 == '会员分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-
-        </div>
-        <div class="nbox"  :class="pointerClass" @click="updateRedio('油品分析')">
-          <div class="fount-box" :style="{ color: radio1 === '油品分析' ? '#FF770F' : '#999999' }">油品分析</div>
-          <div class="heng-box" v-if="radio1 == '油品分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-        </div>
-          <div class="nbox" :class="pointerClass"  @click="updateRedio('便利店分析')">
-          <div class="fount-box" :style="{ color: radio1 === '便利店订单' ? '#FF770F' : '#999999' }">便利店分析</div>
-          <div class="heng-box" v-if="radio1 == '便利店分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-
-        </div>
-        <div class="nbox" :class="pointerClass"  @click="updateRedio('积分商城分析')">
-          <div class="fount-box" :style="{ color: radio1 === '积分商城分析' ? '#FF770F' : '#999999' }">积分商城分析</div>
-          <div class="heng-box" v-if="radio1 == '积分商城分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-        </div>
-      </div>
-    </el-card>
-
-
-    </div>
-    <template >
-      <yunyingfenxi-vip v-if="radio1 === '会员分析'"></yunyingfenxi-vip>
-      <yunyingfenxi-oil v-if="radio1 === '油品分析'"></yunyingfenxi-oil>
-      <yunyingfenxi-store v-if="radio1 === '便利店分析'"></yunyingfenxi-store>
-      <yunyingfenxi-int v-if="radio1 === '积分商城分析'"></yunyingfenxi-int>
-    </template>
-
-  </div>
-</template>
-
-<script>
-
-import yunyingfenxiVip from "@/views/financialStatement/yunyingfenxi/tab/vip.vue";
-import yunyingfenxiInt from "@/views/financialStatement/yunyingfenxi/tab/int.vue";
-import yunyingfenxiOil from "@/views/financialStatement/yunyingfenxi/tab/oil.vue";
-import yunyingfenxiStore from "@/views/financialStatement/yunyingfenxi/tab/store.vue";
-
-export default {
-  name: "yunyingfenxi-list1",
-  data(){
-    return{
-      radio1:'会员分析',
-      pointerClass() {
-        return 'pointer-cursor';
-      }
-    }
-  },
-  components:{
-    yunyingfenxiInt,
-    yunyingfenxiVip,
-    yunyingfenxiOil,
-    yunyingfenxiStore,
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    updateRedio(data) {
-      console.log(this.radio1)
-      this.radio1 = data
-    }
-
-  }
-
-}
-</script>
-
-<style scoped>
-.app-center{
-  width: 100%;
-
-  box-sizing: border-box;
-  //padding: 10px;
-}
-.app-top{
-  width: 100%;
-  //margin-bottom: 20px;
-  height: 60px;
-  box-sizing: border-box;
-
-}
-.el-card__body, .el-main {
-  padding: 0px;
-}
-.box{
-  cursor: pointer;
-  margin-top: 10px ;
-  margin-left: 50px;
-  //height: 40px;
-  display: flex;
-background-color: #FFFFFF;
-  align-items: center;
-  //border: 1px solid #EBEEF5;
-}
-.nbox{
-  margin-left: 30px;
-}
-.fount-box{
-  font-size: 14px;
-  color: #999999
-}
-.fount-box2{
-  font-size: 14px;
-  color: #999999
-}
-.heng-box{
-  background-color: #FF770F;
-  width: 100%;
-  height: 2px;
-  margin-top: 10px;
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
deleted file mode 100644
index fefa80a45..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ /dev/null
@@ -1,392 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <div class="d-s">
-          <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
-               :key="index" @click="editColor(index)">
-            {{ item }}
-          </div>
-          <el-date-picker
-            v-model="value2"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="height:32px"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
-          </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
-            <el-form-item label="" prop="deptId" style="width: 180px">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="所属机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </div>
-        </div>
-      </el-form>
-      <div class="wrap-box">
-        <div class="k_" id="k_1">
-          <div class="size_">累计交易金额（万元）</div>
-          <div class="title_">{{ orderStatistics.paidInfo || 0 }}</div>
-        </div>
-        <div class="k_" id="k_2">
-          <div class="size_">累计交易笔数</div>
-          <div class="title_">{{ orderStatistics.count || 0 }}</div>
-        </div>
-        <div class="k_" id="k_3">
-          <div class="size_">累计兑换商品数量</div>
-          <div class="title_">{{ orderStatistics.exchangeQuantity || 0 }}</div>
-        </div>
-        <div class="k_" id="k_4">
-          <div class="size_">累计消耗积分</div>
-          <div class="title_">{{ orderStatistics.integrals || 0 }}</div>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
-          <el-table-column prop="paidInfo" label="累计交易金额 (万元)" width="150" align="center">
-            <template slot-scope="scope">
-              {{(scope.row.paidInfo/10000).toFixed(6)}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="count" label="累计交易笔数" width="150" align="center"></el-table-column>
-          <el-table-column prop="exchangeQuantity" label="兑换商品数量" width="150" align="center"></el-table-column>
-          <el-table-column prop="integral" label="累计消费积分" width="150" align="center"></el-table-column>
-          <el-table-column label="热门商品信息" align="center">
-            <el-table-column prop="giftName" label="商品名称" width="150" align="center"></el-table-column>
-            <el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="150"
-                             align="center"></el-table-column>
-            <el-table-column prop="paidInfo" label="销售金额 (元)" width="150" align="center"></el-table-column>
-            <el-table-column prop="integralBy" label="消费积分" width="150" align="center"></el-table-column>
-          </el-table-column>
-          <el-table-column prop="statDate" label="统计日期"  align="center">
-            <template>
-              {{this.value2[0]}} 至{{this.value2[1]}}
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getFenXiIntegralDataApi, getFenXiIntegralListApi} from "@/api/financialStatement/yunyingfenxi";
-import {parseTime} from "@/utils/fuint";
-
-export default {
-  name: "yunyingfenxi-int",
-  data() {
-    return {
-      radio1: "油号选错",
-      loading: false,
-      dialogVisible: false,
-      // 员工列表
-      staffList: [],
-      ordersInfo: {},
-
-      timeList: [
-        "今日",
-        "近一周",
-        "近一月",
-        "近一年",
-      ],
-      timeIndex: 0,
-      value2: [],
-      // 日期范围
-      dateRange: [],
-      beginTime: "",
-      endTime: "",
-      // 是否为当天时间
-      isSysDate: false,
-      // 收银台订单列表
-      orderList: [],
-      deptList: [],
-
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        beginTime: "",
-        endTime: "",
-        orderNo: "",
-        status: "",
-        payType: "",
-        payChannel: "",
-        deptType: "3",
-        storeId: "",
-        deptId: "",
-      },
-      orderStatistics: {
-        paidInfo: '0',
-        count: '0',
-        exchangeQuantity: '0',
-        integrals: '0',
-      },
-      total: 0,
-    }
-  },
-  created() {
-    let start = new Date();
-    start.setHours(0)
-    start.setMinutes(0)
-    start.setSeconds(0)
-    start.setMilliseconds(0)
-    this.dateRange = [start, new Date()];
-    this.beginTime = start
-    this.endTime = new Date()
-    this.isSysDate = true
-    let start1 = new Date();
-    start1.setHours(0)
-    start1.setMinutes(0)
-    start1.setSeconds(0)
-    start1.setMilliseconds(0)
-    this.value2 = [parseTime(start1), parseTime(new Date())];
-    this.getList();
-    this.getDeptList();
-
-  },
-  methods: {
-    editColor(index){
-      this.timeIndex = index
-      if (this.timeList[index]=='今日'){
-        let start = new Date();
-        start.setHours(0)
-        start.setMinutes(0)
-        start.setSeconds(0)
-        start.setMilliseconds(0)
-        this.value2 = [start,new Date()];
-      } else if (this.timeList[index]=='近一周'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      } else if (this.timeList[index]=='近一月'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      } else if (this.timeList[index]=='近一年'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      }
-      this.handleQuery()
-    },
-    getDeptList() {
-      getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
-        this.deptList = response.data.records;
-      })
-    },
-    exportExcelCashier() {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
-        const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
-        this.$download.saveAs(blob, '交易明细统计.xLsx')
-      })
-    },
-    // 获取订单统计信息
-    getOrderStatistics() {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      getFenXiIntegralDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
-        this.orderStatistics = res.data
-        console.log("res.data1111", res.data)
-      })
-    },
-
-    // 获取列表信息
-    getList(val) {
-      let dateRange = []
-      if (this.beginTime && this.endTime) {
-        dateRange.push(this.beginTime.toLocaleDateString())
-        dateRange.push(this.endTime.toLocaleDateString())
-      }
-      getFenXiIntegralListApi(this.addDateRange(this.queryParams, this.value2)).then(response => {
-        this.orderList = response.data.records;
-        this.total = response.data.total;
-        this.isSysDate = false
-      })
-      this.getOrderStatistics()
-    },
-    getOrdersInfo(data) {
-      this.dialogVisible = true;
-      this.ordersInfo = data
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-      }
-      this.beginTime = ""
-      this.endTime = ""
-      let start1 = new Date();
-      start1.setHours(0)
-      start1.setMinutes(0)
-      start1.setSeconds(0)
-      start1.setMilliseconds(0)
-      this.value2 = [parseTime(start1), parseTime(new Date())];
-      this.timeIndex = 0
-      this.handleQuery();
-    },
-  }
-}
-</script>
-
-<style scoped>
-.box-card {
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box {
-  width: 100%;
-}
-
-.wrap-box {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-}
-
-.k_ {
-  width: 200px;
-  height: 80px;
-  margin-right: 20px;
-  box-sizing: border-box;
-  padding: 15px 10px;
-  color: #333333;
-}
-
-.size_ {
-  font-weight: 400;
-  font-size: 14px;
-  color: #333333;
-  margin-bottom: 10px;
-}
-
-.title_ {
-  font-weight: 600;
-  font-size: 24px;
-  color: #333333;
-}
-
-#k_1 {
-  background: url("../imgs/k1.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_2 {
-  background: url("../imgs/k2.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_3 {
-  background: url("../imgs/k3.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_4 {
-  background: url("../imgs/k4.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_5 {
-  background: url("../imgs/k5.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_6 {
-  background: url("../imgs/k6.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-#k_7 {
-  background: url("../imgs/k7.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-.d-s {
-  display: flex;
-  align-items: center;
-}
-
-.anniu-h {
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-
-.anniu-act {
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
deleted file mode 100644
index d343147a3..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ /dev/null
@@ -1,420 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px; margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <div class="d-s">
-          <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
-            {{item}}
-          </div>
-          <el-date-picker
-            v-model="value2"
-            style="height:32px"
-
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
-          </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
-            <el-form-item label="" prop="deptId" style="width: 180px">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="所属机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </div>
-        </div>
-
-      </el-form>
-      <div class="wrap-box">
-        <div class="k_" id="k_1">
-          <div class="size_">累计交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount || 0}}</div>
-        </div>
-        <div class="k_" id="k_2">
-          <div class="size_">累计交易升数</div>
-          <div class="title_">{{orderStatistics.num || 0}}</div>
-        </div>
-        <div class="k_" id="k_3">
-          <div class="size_">92#汽油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount92 || 0}}</div>
-        </div>
-        <div class="k_" id="k_4">
-          <div class="size_">95#汽油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount95 || 0}}</div>
-        </div>
-        <div class="k_" id="k_5">
-          <div class="size_">98#汽油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount98 || 0}}</div>
-        </div>
-        <div class="k_" id="k_5">
-          <div class="size_">0#柴油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount0 || 0}}</div>
-        </div>
-      </div>
-          </el-card>
-          <el-card class="box-card">
-
-
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
-          <el-table-column align="center" prop="payAmount" label="累计交易金额(万元)">
-            <template slot-scope="scope">
-              {{(scope.row.payAmount/10000).toFixed(6)}}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="sum" label="累计交易笔数"></el-table-column>
-          <el-table-column align="center" prop="oilNum" label="累计交易升数"></el-table-column>
-          <el-table-column align="center" label="92#汽油">
-            <el-table-column align="center" prop="amount92" label="交易金额(万元)">
-              <template slot-scope="scope">
-                {{(scope.row.amount92/10000).toFixed(6)}}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="count92" label="交易笔数"></el-table-column>
-            <el-table-column align="center" prop="num92" label="交易升数"></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="95#汽油">
-            <el-table-column align="center" prop="amount95" label="交易金额(万元)">
-              <template slot-scope="scope">
-                {{(scope.row.amount95/10000).toFixed(6)}}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="count95" label="交易笔数"></el-table-column>
-            <el-table-column align="center" prop="num95" label="交易升数"></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="98#汽油">
-            <el-table-column align="center" prop="amount98" label="交易金额(万元)">
-              <template slot-scope="scope">
-                {{(scope.row.amount98/10000).toFixed(6)}}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="count98" label="交易笔数" ></el-table-column>
-            <el-table-column align="center" prop="num98" label="交易升数" ></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="0#柴油">
-            <el-table-column align="center" prop="amount0" label="交易金额(万元)" >
-              <template slot-scope="scope">
-                {{(scope.row.amount0/10000).toFixed(6)}}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="count0" label="交易笔数" ></el-table-column>
-            <el-table-column align="center" prop="num0" label="交易升数" ></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" prop="date" label="统计日期" >
-            <template>
-              {{this.value2[0]}} 至{{this.value2[1]}}
-<!--              this.value2 = [parseTime(start1),parseTime(new Date())];-->
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialStatement/yunyingfenxi";
-import {parseTime} from "@/utils/fuint";
-
-  export default {
-    name: "yunyingfenxi-oil",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        timeList:[
-          "今日",
-          "近一周",
-          "近一月",
-          "近一年",
-        ],
-        timeIndex:0,
-        value2: [],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          amount:'0',
-          num:'0',
-          amount92:'0',
-          amount95:'0',
-          amount98:'0',
-          amount0:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      let start1 = new Date();
-      start1.setHours(0)
-      start1.setMinutes(0)
-      start1.setSeconds(0)
-      start1.setMilliseconds(0)
-      this.value2 = [parseTime(start1),parseTime(new Date())];
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      editColor(index){
-        this.timeIndex = index
-        if (this.timeList[index]=='今日'){
-          let start = new Date();
-          start.setHours(0)
-          start.setMinutes(0)
-          start.setSeconds(0)
-          start.setMilliseconds(0)
-          this.value2 = [start,new Date()];
-        } else if (this.timeList[index]=='近一周'){
-          let nowDate = new Date();
-          let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-        } else if (this.timeList[index]=='近一月'){
-          let nowDate = new Date();
-          let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-        } else if (this.timeList[index]=='近一年'){
-          let nowDate = new Date();
-          let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-        }
-        this.handleQuery()
-      },
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'交易明细统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getFenXiOilOrderDataApi(this.addDateRange(this.queryParams, this.value2)).then(res=>{
-          this.orderStatistics = res.data
-          console.log("res.data1111",res.data)
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        // let dateRange = []
-        // if (this.beginTime && this.endTime) {
-        //   dateRange.push(this.beginTime.toLocaleDateString())
-        //   dateRange.push(this.endTime.toLocaleDateString())
-        // }
-        getFenXiOilOrderListApi(this.addDateRange(this.queryParams,this.value2)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        let start1 = new Date();
-        start1.setHours(0)
-        start1.setMinutes(0)
-        start1.setSeconds(0)
-        start1.setMilliseconds(0)
-        this.value2 = [parseTime(start1),parseTime(new Date())];
-        this.timeIndex = 0
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-.box-card{
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box{
-  width: 100%;
-}
-.wrap-box{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-}
-.k_{
-  width: 200px;
-  height: 80px;
-  margin-right: 20px;
-  box-sizing: border-box;
-  padding: 15px 10px;
-  color: #333333;
-}
-.size_{
-  font-weight: 400;
-  font-size: 14px;
-  color: #333333;
-  margin-bottom: 10px;
-}
-.title_{
-  font-weight: 600;
-  font-size: 24px;
-  color: #333333;
-}
-#k_1{
-  background: url("../imgs/k1.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_2{
-  background: url("../imgs/k2.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_3{
-  background: url("../imgs/k3.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_4{
-  background: url("../imgs/k4.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_5{
-  background: url("../imgs/k5.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_6{
-  background: url("../imgs/k6.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_7{
-  background: url("../imgs/k7.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-.d-s{
-  display: flex;
-  align-items: center;
-}
-.anniu-h{
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-.anniu-act{
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
deleted file mode 100644
index 4322a85dc..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ /dev/null
@@ -1,396 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px; margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
-        <div class="d-s">
-          <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
-            {{item}}
-          </div>
-          <el-date-picker
-            v-model="value2"
-            style="height:32px"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期" @click="handleQuery">
-          </el-date-picker>
-          <div  style="margin-left: 15px;margin-top: 17px;width: 100%">
-            <el-form-item label="" prop="deptId" style="width: 180px;">
-              <el-select
-                v-model="queryParams.deptId"
-                clearable
-                placeholder="所属机构"
-              >
-                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item class="" style="float: right;">
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </div>
-        </div>
-
-      </el-form>
-      <div class="wrap-box">
-        <div class="k_" id="k_1">
-          <div class="size_">累计交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.payAmount || 0}}</div>
-        </div>
-        <div class="k_" id="k_2">
-          <div class="size_">累计交易笔数</div>
-          <div class="title_">{{orderStatistics.count || 0}}</div>
-        </div>
-        <div class="k_" id="k_3">
-          <div class="size_">累计销售商品数量</div>
-          <div class="title_">{{orderStatistics.goodsNum || 0}}</div>
-        </div>
-        <div class="k_" id="k_4">
-          <div class="size_">热销品类数量</div>
-          <div class="title_">{{orderStatistics.cvg || 0}}</div>
-        </div>
-      </div>
-      </el-card>
-      <el-card class="box-card">
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
-          <el-table-column prop="payAmounts" label="累计交易金额 (万元)"  align="center">
-            <template slot-scope="scope">
-              {{(scope.row.payAmounts/10000).toFixed(6)}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="counts" label="累计交易笔数"  align="center"></el-table-column>
-          <el-table-column prop="goodsNums" label="累计销售商品数量"  align="center"></el-table-column>
-          <el-table-column label="商品信息" align="center">
-                <el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
-                  <template slot-scope="scope">
-                    {{(scope.row.payAmounts/10000).toFixed(6)}}
-                  </template>
-                </el-table-column>
-
-          </el-table-column>
-          <el-table-column label="热销品类信息" align="center">
-
-                <el-table-column prop="cvgName" label="品类名称" width="100" align="center"></el-table-column>
-                <el-table-column prop="cvgNum" label="销售数量 (件)" width="100" align="center"></el-table-column>
-                <el-table-column prop="cvgAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
-
-          </el-table-column>
-          <el-table-column label="热销商品信息" align="center">
-                <el-table-column prop="goodsName" label="商品名称" width="100" align="center"></el-table-column>
-                <el-table-column prop="goodsNum" label="销售数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="goodsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
-<!--                <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
-          </el-table-column>
-          <el-table-column prop="statDate" label="统计日期" width="200" align="center">
-            <template>
-              {{this.value2[0]}} 至{{this.value2[1]}}
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStatement/yunyingfenxi";
-import {parseTime} from "@/utils/fuint";
-
-  export default {
-    name: "yunyingfenxi-store",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-
-        timeList:[
-          "今日",
-          "近一周",
-          "近一月",
-          "近一年",
-        ],
-        timeIndex:0,
-        value2: [],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          count:'0',
-          cvg:'0',
-          goodsNum:'0',
-          payAmount:'0',
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      let start1 = new Date();
-      start1.setHours(0)
-      start1.setMinutes(0)
-      start1.setSeconds(0)
-      start1.setMilliseconds(0)
-      this.value2 = [parseTime(start1),parseTime(new Date())];
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      editColor(index){
-        this.timeIndex = index
-        if (this.timeList[index]=='今日'){
-          let start = new Date();
-          start.setHours(0)
-          start.setMinutes(0)
-          start.setSeconds(0)
-          start.setMilliseconds(0)
-          this.value2 = [start,new Date()];
-        } else if (this.timeList[index]=='近一周'){
-          let nowDate = new Date();
-          let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-        } else if (this.timeList[index]=='近一月'){
-          let nowDate = new Date();
-          let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-        } else if (this.timeList[index]=='近一年'){
-          let nowDate = new Date();
-          let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-        }
-        this.handleQuery()
-      },
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'交易明细统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getFenXiStoreDataApi(this.addDateRange(this.queryParams, this.value2)).then(res=>{
-          this.orderStatistics = res.data
-          console.log("res.data1111",res.data)
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getFenXiStoreListApi(this.addDateRange(this.queryParams,this.value2)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        let start1 = new Date();
-        start1.setHours(0)
-        start1.setMinutes(0)
-        start1.setSeconds(0)
-        start1.setMilliseconds(0)
-        this.value2 = [parseTime(start1),parseTime(new Date())];
-        this.timeIndex = 0
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-.box-card{
-  width: 100%;
-  margin: 0px 20px 20px 20px;
-}
-
-.el-form--inline .el-form-item {
-  margin-right: 20px;
-}
-
-.table-box{
-  width: 100%;
-}
-.wrap-box{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-}
-.k_{
-  width: 200px;
-  height: 80px;
-  margin-right: 20px;
-  box-sizing: border-box;
-  padding: 16px 10px;
-  color: #333333;
-}
-.size_{
-  font-weight: 400;
-  font-size: 14px;
-  color: #333333;
-  margin-bottom: 10px;
-}
-.title_{
-  font-weight: 600;
-  font-size: 24px;
-  color: #333333;
-}
-#k_1{
-  background: url("../imgs/k1.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_2{
-  background: url("../imgs/k2.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_3{
-  background: url("../imgs/k3.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_4{
-  background: url("../imgs/k4.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_5{
-  background: url("../imgs/k5.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_6{
-  background: url("../imgs/k6.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-#k_7{
-  background: url("../imgs/k7.png");
-  background-size: cover; /* 背景图片铺满盒子 */
-  background-repeat: no-repeat; /* 禁止背景图片重复 */
-}
-
-.d-s{
-  display: flex;
-  align-items: center;
-}
-.anniu-h{
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-.anniu-act{
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
deleted file mode 100644
index 73bdff162..000000000
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<!-- 收银台订单-->
-<template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-        <el-form-item label="" prop="deptId" style="width: 180px">
-          <el-select
-            v-model="queryParams.deptId"
-            clearable
-            placeholder="所属机构"
-          >
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item class="" style="float: right;">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-<!--    </el-card>-->
-<!--    <el-card class="box-card">-->
-      <div class="wrap-box">
-        <div class="k_" id="k_1">
-          <div class="size_">会员总数</div>
-          <div class="title_">{{orderStatistics.sumnum}}</div>
-        </div>
-        <div class="k_" id="k_2">
-          <div class="size_">累计充值金额（万元）</div>
-          <div class="title_">{{orderStatistics.tongjMoney}}</div>
-        </div>
-        <div class="k_" id="k_3">
-          <div class="size_">会员总消费（万元）</div>
-          <div class="title_">{{orderStatistics.tongjXfMoney}}</div>
-        </div>
-        <div class="k_" id="k_4">
-          <div class="size_">会员总余额（万元）</div>
-          <div class="title_">--</div>
-        </div>
-        <div class="k_" id="k_5">
-          <div class="size_">累计囤油卡余额（万元）</div>
-          <div class="title_">--</div>
-        </div>
-        <div class="k_" id="k_6">
-          <div class="size_">累计礼品卡余额（元）</div>
-          <div class="title_">--</div>
-        </div>
-        <div class="k_" id="k_7">
-          <div class="size_">累计储值卡余额（元 ）</div>
-          <div class="title_">{{orderStatistics.balanceSum}}</div>
-        </div>
-      </div>
-          </el-card>
-          <el-card class="box-card">
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          border
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="userName" align="center" label="会员名称"> </el-table-column>
-          <el-table-column prop="mobile" align="center" label="会员手机号码" > </el-table-column>
-          <el-table-column prop="physicalCard" align="center" label="会员卡号"></el-table-column>
-          <el-table-column prop="storeName" align="center" label="所属机构"> </el-table-column>
-          <el-table-column prop="gradeName" align="center" label="会员等级" > </el-table-column>
-          <el-table-column prop="amount" align="center" label="累计充值金额（元）" > </el-table-column>
-          <el-table-column prop="countNum" align="center" label="累计充值次数" > </el-table-column>
-          <el-table-column prop="leijiMoney" align="center" label="累计消费金额（元）" > </el-table-column>
-          <el-table-column prop="leijiNum" align="center" label="累计消费笔数" > </el-table-column>
-<!--          <el-table-column prop="createTime" align="center" label="囤油卡余额" > </el-table-column>-->
-<!--          <el-table-column prop="createTime" align="center" label="电子礼品卡余额" > </el-table-column>-->
-          <el-table-column prop="cardBalance" align="center" label="储值卡余额" > </el-table-column>
-<!--          <el-table-column prop="createTime" align="center" label="累计余额" > </el-table-column>-->
-          <el-table-column prop="leijiMoneyRef" align="center" label="累计退款金额" > </el-table-column>
-          <el-table-column prop="leijiNum" align="center" label="累计退款笔数" > </el-table-column>
-
-        </el-table>
-      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-
-import {
-  exportExcelTradingApi,
-  getRunningWaterByTissueApi,
-  getTissueByDataApi,
-  getTradingPageApi
-} from "@/api/allOrder";
-import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/financialStatement/yunyingfenxi";
-
-  export default {
-    name: "yunyingfenxi-vip",
-    data(){
-      return{
-        radio1:"油号选错",
-        loading:false,
-        dialogVisible:false,
-        // 员工列表
-        staffList:[],
-        ordersInfo:{},
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        deptList:[],
-
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-          orderNo:"",
-          status:"",
-          payType:"",
-          payChannel:"",
-          deptType:"3",
-          storeId:"",
-          deptId:"",
-        },
-        orderStatistics:{
-          sumnum:'', // 会员总数
-          balanceSum:'', // 会员余额
-          tongjMoney:'', // 累计冲纸
-          tongjXfMoney:'', // 总消费
-        },
-        total:0,
-      }
-    },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      this.getDeptList();
-
-    },
-    methods:{
-      getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
-        })
-      },
-      exportExcelCashier() {
-        let dateRange = []
-        // if (this.beginTime && this.endTime) {
-        //   dateRange.push(this.beginTime.toLocaleDateString())
-        //   dateRange.push(this.endTime.toLocaleDateString())
-        // }
-        exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'交易明细统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        // if (this.beginTime && this.endTime) {
-        //   dateRange.push(this.beginTime.toLocaleDateString())
-        //   dateRange.push(this.endTime.toLocaleDateString())
-        // }
-        getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-          console.log("res.data1111",res.data)
-        })
-      },
-
-      // 获取列表信息
-      getList(val){
-        let dateRange = []
-        // if (this.beginTime && this.endTime) {
-        //   dateRange.push(this.beginTime.toLocaleDateString())
-        //   dateRange.push(this.endTime.toLocaleDateString())
-        // }
-        getFenXiUserbalanceListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getOrderStatistics()
-      },
-      getOrdersInfo(data) {
-        this.dialogVisible = true;
-        this.ordersInfo = data
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
-        }
-        this.beginTime = ""
-        this.endTime = ""
-        this.handleQuery();
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .box-card{
-    width: 100%;
-    margin: 0px 20px 20px 20px;
-  }
-
-  .el-form--inline .el-form-item {
-    margin-right: 20px;
-  }
-
-  .table-box{
-    width: 100%;
-  }
-  .wrap-box{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    margin-bottom: 15px;
-  }
-  .k_{
-    width: 200px;
-    height: 80px;
-    margin-right: 20px;
-    box-sizing: border-box;
-    padding: 15px 10px;
-    color: #333333;
-  }
-  .size_{
-    font-weight: 400;
-    font-size: 14px;
-    color: #333333;
-    margin-bottom: 10px;
-  }
-  .title_{
-    font-weight: 600;
-    font-size: 24px;
-    color: #333333;
-  }
-  #k_1{
-    background: url("../imgs/k1.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-  #k_2{
-    background: url("../imgs/k2.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-  #k_3{
-    background: url("../imgs/k3.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-  #k_4{
-    background: url("../imgs/k4.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-  #k_5{
-    background: url("../imgs/k5.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-  #k_6{
-    background: url("../imgs/k6.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-  #k_7{
-    background: url("../imgs/k7.png");
-    background-size: cover; /* 背景图片铺满盒子 */
-    background-repeat: no-repeat; /* 禁止背景图片重复 */
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/goods/cate/index.vue b/fuintAdmin_zt/src/views/goods/cate/index.vue
deleted file mode 100644
index 6b1c5831b..000000000
--- a/fuintAdmin_zt/src/views/goods/cate/index.vue
+++ /dev/null
@@ -1,384 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" class="main-search" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="分类名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入分类名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="store">
-        <el-select
-          v-model="queryParams.storeId"
-          placeholder="所属店铺"
-          clearable
-          style="width: 180px"
-        >
-          <el-option :key="0" label="公共分类" v-if="!this.$store.getters.storeId" :value="0"/>
-          <el-option v-for="storeInfo in storeOptions" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['goods:cate:index']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="分类ID" prop="id" width="66"/>
-      <el-table-column label="所属店铺" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeName">{{ scope.row.storeName }}</span>
-          <span v-else>公共所有</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="图片" align="center" width="200">
-        <template slot-scope="scope">
-            <img class="list-img" :src="imagePath + scope.row.logo">
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['goods:cate:index']"
-            v-if="storeId == scope.row.storeId || storeId == 0"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['goods:cate:index']"
-            v-if="storeId == scope.row.storeId || storeId == 0"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="分类名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入名称" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属店铺" prop="storeId">
-              <el-select class="input" v-model="form.storeId" clearable placeholder="请选择所属店铺">
-                <el-option :key="0" label="公共分类" v-if="storeId == 0" :value="0"/>
-                <el-option
-                  v-for="item in storeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-              <div class="form-tips">提示：未选择则属于公共分类</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="排序" prop="sort">
-              <el-input-number v-model="form.sort" :min="0"/>
-              <div class="form-tips">提示：数值越小，排行越靠前</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="9">
-            <el-form-item label="图片" prop="image">
-              <el-upload
-                   :action="uploadAction"
-                   list-type="picture-card"
-                   :class="{hide:hideUpload}"
-                   :file-list="uploadFiles"
-                   :auto-upload="true"
-                   :show-file-list="false"
-                   :headers="uploadHeader"
-                   :on-success="handleUploadSuccess">
-                <img
-                  v-if="this.form.logo"
-                  :src="imagePath + this.form.logo"
-                  class="list-img"
-                />
-                <i class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改，建议尺寸：128 x 128）</p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth'
-import { getGoodsCateList, getGoodsCateInfo, saveGoodsCate, updateGoodsCateStatus } from "@/api/goodsCate";
-export default {
-  name: "GoodsCateIndex",
-  data() {
-    return {
-      storeId: this.$store.getters.storeId,
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 图片根目录
-      imagePath: "",
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 店铺列表
-      storeOptions: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'sort', order: 'descending'},
-      // 表单参数
-      form: { storeId: this.$store.getters.storeId, id: '', name: '', logo: '', sort: 0, status: "A" },
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        name: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "名称不能为空", trigger: "blur" },
-          { min: 2, max: 200, message: '名称长度必须介于2 和 200 之间', trigger: 'blur' }
-        ],
-        logo: [{ required: true, message: "请上传图片", trigger: "blur" }]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询分类列表
-    getList() {
-      this.loading = true;
-      getGoodsCateList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.imagePath = response.data.imagePath;
-          this.storeOptions = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
-        return updateGoodsCateStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增商品分类";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        storeId: this.storeId,
-        name: "",
-        status: "A",
-        logo: "",
-        sort: 0,
-        description: ""
-      };
-      this.uploadFiles = []
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.logo.length < 1) {
-              this.form.logo = '/static/defaultImage/none.png';
-          }
-          if (this.form.id) {
-              saveGoodsCate(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveGoodsCate(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getGoodsCateInfo(id).then(response => {
-        this.form = response.data.cateInfo;
-        this.uploadFiles = [{ url: response.data.imagePath + this.form.logo, status: 'finished'}]
-        this.open = true;
-        this.title = "编辑商品分类";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.name
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return updateGoodsCateStatus(row.id, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleUploadSuccess(file) {
-      this.form.logo = file.data.fileName;
-    }
-  }
-};
-</script>
-<style scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/goods/components/Sku.vue b/fuintAdmin_zt/src/views/goods/components/Sku.vue
deleted file mode 100644
index a9984f92f..000000000
--- a/fuintAdmin_zt/src/views/goods/components/Sku.vue
+++ /dev/null
@@ -1,444 +0,0 @@
-<template>
-  <div class="sku-list">
-    <template v-if="!disabled">
-      <div class="sku-list-head">
-        <el-button type="primary" size="mini" @click="addSkuRow">添加规格</el-button
-        >
-      </div>
-      <div
-        class="sku-list-item"
-        v-for="(item, index) in skuData.attrList"
-        :key="index"
-      >
-        <div class="sku-list-item-main">
-          <div class="sku-list-item__layout">
-            <span class="span">规格名</span>
-            <el-input
-              size="small"
-              v-model="item.name"
-              class="input"
-            ></el-input>
-          </div>
-          <div class="sku-list-item__layout">
-            <span class="span">规格值</span>
-            <div class="sku-list-item-tags">
-              <el-tag
-                class="sku-list-item-tag"
-                closable
-                v-for="(subItem, i) in item.child"
-                v-if="subItem.name"
-                @close="removeSkuAttr(index, i)"
-                :key="i"
-              >{{ subItem.name }}</el-tag
-              >
-              <el-button
-                size="small"
-                icon="el-icon-plus"
-                @click="addSkuAttr(index)"
-              >添加</el-button
-              >
-            </div>
-          </div>
-        </div>
-        <el-button
-          type="text"
-          size="small"
-          class="sku-list-item-removeBtn"
-          @click="removeSkuRow(index)"
-        >删除规格</el-button
-        >
-      </div>
-    </template>
-
-    <div class="batch-setting">
-      <span class="label">批量设置</span>
-      <el-input size="small" v-model="batch.skuNo" placeholder="sku编码" class="input input-sn"></el-input>
-      <span class="create-sn" @click="createGoodsSn()">随机生成</span>
-      <el-input size="small" v-model="batch.price" placeholder="商品价格" class="input"></el-input>
-      <el-input size="small" v-model="batch.linePrice" placeholder="划线价格" class="input"></el-input>
-      <el-input size="small" v-model="batch.stock" placeholder="商品库存" class="input"></el-input>
-      <el-input size="small" v-model="batch.weight" placeholder="商品重量" class="input"></el-input>
-      <el-button size="small" type="danger" class="button" @click="batchSetSku()">确认设置</el-button>
-    </div>
-
-    <el-table border :data="skuData.skuList">
-      <el-table-column label="序号" align="center" width="60">
-        <template slot-scope="scope">
-          <span>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="图片" align="center" width="120">
-        <template slot-scope="scope">
-          <el-upload
-            :disabled="disabled"
-            :action="uploadAction"
-            list-type="picture-card"
-            :auto-upload="true"
-            :headers="uploadHeader"
-            :file-list="[]"
-            :limit="1"
-            :on-success="function(file) {
-               return onUploadImgSuccess(file, scope.$index) }"
-            :show-file-list="false"
-          >
-            <img
-              v-if="scope.row.logo"
-              :src="uploadDomain + scope.row.logo"
-              class="sku-logo"
-            />
-            <i v-if="!scope.row.logo" class="el-icon-plus"></i>
-          </el-upload>
-        </template>
-      </el-table-column>
-      <el-table-column label="规格" align="center">
-        <template slot-scope="scope">
-          <div class="spec-tag" v-for="spec in scope.row.specList"><span class="i">{{ spec.value }}</span></div>
-        </template>
-      </el-table-column>
-      <el-table-column label="sku编码" align="center" width="160">
-        <template slot-scope="scope">
-          <el-input
-            :readonly="disabled"
-            v-model="scope.row.skuNo"
-          ></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="销售价格(元)" align="center">
-        <template slot-scope="scope">
-          <el-input
-            :readonly="disabled"
-            v-model="scope.row.price"
-          ></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="划线价格(元)" align="center">
-        <template slot-scope="scope">
-          <el-input
-            :readonly="disabled"
-            v-model="scope.row.linePrice"
-          ></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品库存" align="center">
-        <template slot-scope="scope">
-          <el-input :readonly="disabled" v-model="scope.row.stock"></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="重量(千克)" align="center">
-        <template slot-scope="scope">
-          <el-input :readonly="disabled" v-model="scope.row.weight"></el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { saveSpecName, saveSpecValue, deleteSpec, deleteSpecValue } from "@/api/goods";
-export default {
-  name: 'Sku',
-  model: {
-    prop: "skuData",
-    event: "change",
-  },
-  props: {
-    goodsId: {
-      type: String,
-      default: "",
-    },
-    uploadDomain: {
-      type: String,
-      default: "",
-    },
-    skuData: {
-      type: Object,
-      default: () => ({}),
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 批量设置
-      batch: { price: '', skuNo: '', linePrice: '', weight: '', stock: '' }
-    };
-  },
-  watch: {
-    "skuData.attrList": {
-      handler() {
-        if (!this.disabled) {
-            this.$set(this.skuData, "skuList", this.getTable());
-        }
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
-  methods: {
-    // 添加规格行
-    addSkuRow(i) {
-      this.$prompt("请输入规格名称", "添加规格", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        inputPattern: /\S+/,
-        inputErrorMessage: "规格名称不能为空",
-        closeOnClickModal: false,
-      }).then(({ value }) => {
-          saveSpecName({ goodsId: this.goodsId, name: value }).then(response => {
-            this.skuData.attrList.push({
-                id: response.data.id,
-                name: value,
-                child: [],
-            });
-            this.$emit("skuChange", this.skuData);
-          })
-      });
-    },
-    // 删除规格行
-    removeSkuRow(i) {
-      const app = this
-      app.$modal.confirm('确认删除该规格吗？').then(function() {
-          deleteSpec({ goodsId: app.goodsId, specName: app.skuData.attrList[i].name }).then(response => {
-              app.skuData.attrList.splice(i, 1);
-              app.$emit("skuChange", app.skuData);
-          })
-      });
-    },
-    // 删除规格属性值
-    removeSkuAttr(a, b) {
-      const app = this
-      app.$modal.confirm('确认删除该规格值吗？').then(function() {
-          deleteSpecValue({ id: app.skuData.attrList[a].child[b].id }).then(response => {
-              app.skuData.attrList[a].child.splice(b, 1);
-              app.$emit("skuChange", app.skuData);
-          })
-      });
-    },
-    // 添加规格属性值
-    addSkuAttr(i) {
-      this.$prompt("请输入规格值", "添加规格值", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        inputPattern: /\S+/,
-        inputErrorMessage: "规格值不能为空",
-        closeOnClickModal: false,
-      }).then(({ value }) => {
-          saveSpecValue({ goodsId: this.goodsId, specName: this.skuData.attrList[i].name, value: value }).then(response => {
-              this.skuData.attrList[i].child.push({
-                 id: response.data.id,
-                 name: value,
-                 value: value,
-              });
-              this.$emit("skuChange", this.skuData);
-          })
-      });
-    },
-    // 批量设置sku
-    batchSetSku() {
-      const app = this;
-      app.skuData.skuList.forEach(function(skuInfo, index) {
-         if (app.batch.skuNo) {
-             skuInfo.skuNo = app.batch.skuNo + index;
-         }
-         if (app.batch.price) {
-             if (app.batch.price > 0) {
-                 skuInfo.price = app.batch.price;
-             } else {
-                 app.$modal.alert("商品价格须大于0！");
-                 return false;
-             }
-         }
-         if (app.batch.linePrice) {
-             if (app.batch.linePrice >= 0) {
-                 skuInfo.linePrice = app.batch.linePrice;
-             } else {
-                 app.$modal.alert("商品划线价格须大于等于0！");
-                 return false;
-             }
-         }
-         if (app.batch.weight) {
-             if (app.batch.weight >= 0) {
-                 skuInfo.weight = app.batch.weight;
-             } else {
-                 app.$modal.alert("商品重量须大于等于0！");
-                 return false;
-             }
-         }
-         if (app.batch.stock) {
-             if (app.batch.stock >= 0) {
-                 skuInfo.stock = app.batch.stock;
-             } else {
-                 app.$modal.alert("商品库存须大于等于0！");
-                 return false;
-             }
-         }
-      })
-    },
-    // 生成随机条码
-    createGoodsSn() {
-      let sn = (Math.random() + 1) * 10000000000000;
-      this.batch.skuNo = sn.toFixed(0);
-    },
-    onUploadImgSuccess(file, index) {
-      if (!file) {
-          return;
-      }
-      this.uploadDomain = file.data.domain;
-      this.skuData.skuList[index].logo = file.data.fileName
-      this.$emit("skuChange", this.skuData);
-    },
-    getTable() {
-      const table = [];
-      const attrValueAry = [];
-      const arr = [];
-      const tmpSkuData = (this.skuData.attrList || []).filter(
-        (d) => d.name != "" && d.child.length > 0
-      );
-      if (!tmpSkuData || tmpSkuData.length == 0) {
-         return [];
-      }
-
-      tmpSkuData.forEach((item) => {
-         attrValueAry.push(item.child);
-      });
-
-      function func(skuArr = [], i) {
-        for (let j = 0; j < attrValueAry[i].length; j++) {
-          if (i < attrValueAry.length - 1) {
-            skuArr[i] = attrValueAry[i][j];
-            func(skuArr, i + 1);
-          } else {
-            arr.push([...skuArr, attrValueAry[i][j]]);
-          }
-        }
-      }
-      func([], 0);
-
-      console.log('arr = ', arr);
-
-      arr.forEach((item) => {
-        let specIds = "",
-            specList = [],
-            findItem,
-            tableItem;
-        item.forEach((d) => {
-            specIds += specIds ? `-${d.id}` : `${d.id}`;
-            specList.push( { id: d.id, name: d.name, value: d.name } )
-        });
-
-        console.log('specList = ', specList);
-
-        findItem =
-          this.skuData.initSkuList.find((item) => {
-            return specIds.includes(item.specIds);
-          }) || {};
-
-        tableItem = Object.assign(
-          {
-            price: '',
-            linePrice: '',
-            skuNo: '',
-            stock: '',
-            logo: '',
-            weight: '0',
-            specList: specList
-          },
-          findItem,
-          {
-            specIds,
-          }
-        );
-        tableItem.specList = specList;
-        console.log('tableItem = ', tableItem)
-        table.push(tableItem);
-      });
-
-      return table;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.sku-list {
-  &-head {
-    margin-bottom: 10px;
-  }
-  &-item {
-    display: flex;
-    align-items: center;
-    border: 1px solid #eee;
-    border-radius: 5px;
-    margin-bottom: 5px;
-    padding: 10px;
-    background: #f5f5f5;
-    &-main {
-      flex: 1;
-    }
-    &-removeBtn {
-      margin-left: 20px;
-      color: #f56c6c;
-    }
-    &__layout {
-      display: flex;
-      align-items: center;
-      margin-bottom: 5px;
-      &:last-child {
-        margin-bottom: 0;
-      }
-      .input {
-        width: 240px;
-      }
-      .span {
-        font-size: 13px;
-        font-weight: bold;
-        margin-right: 10px;
-        color: #666;
-      }
-    }
-    &-tags {
-      flex: 1;
-    }
-    &-tag {
-      margin-bottom: 10px;
-      margin-right: 10px;
-    }
-  }
-}
-.spec-tag {
-     margin: 10px 0px 10px 0px;
-    .i {
-       background: #cceeee;
-       color: #00acac;
-       padding: 5px;
-       border-radius: 12px;
-    }
-}
-.sku-logo {
-    height: 78px;
-    width: 78px;
-    border-radius: 6px;
-}
-.batch-setting {
-    margin: 20px 0px 3px 0px;
-   .input {
-      width: 100px;
-      margin-left: 10px;
-   }
-   .input-sn {
-      width: 140px;
-   }
-   .button {
-     margin-left: 5px;
-   }
-}
-.create-sn {
-  margin-left: 2px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/goods/goods/add.vue b/fuintAdmin_zt/src/views/goods/goods/add.vue
deleted file mode 100644
index 3c54e8ea1..000000000
--- a/fuintAdmin_zt/src/views/goods/goods/add.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <goodsForm :is-edit="false" :is-add="true"/>
-</template>
-
-<script>
-import goodsForm from './goodsForm'
-
-export default {
-  name: 'goodsAdd',
-  components: { goodsForm }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/goods/goods/edit.vue b/fuintAdmin_zt/src/views/goods/goods/edit.vue
deleted file mode 100644
index c488a13c1..000000000
--- a/fuintAdmin_zt/src/views/goods/goods/edit.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <goodsForm :is-edit="true" :is-add="false"/>
-</template>
-
-<script>
-import goodsForm from './goodsForm'
-
-export default {
-  name: 'goodsEdit',
-  components: { goodsForm }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/goods/goods/goodsForm.vue b/fuintAdmin_zt/src/views/goods/goods/goodsForm.vue
deleted file mode 100644
index 7f0c281aa..000000000
--- a/fuintAdmin_zt/src/views/goods/goods/goodsForm.vue
+++ /dev/null
@@ -1,495 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-      <el-tabs v-model="activeTab" @tab-click="handleTabClick">
-        <el-tab-pane label="基础信息" name="base">
-          <div class="content">
-            <el-form ref="baseForm" :model="baseForm" :rules="baseRules" label-width="120px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品类型" prop="cateId">
-                    <el-select class="input" v-model="baseForm.type" placeholder="请选择商品类型">
-                      <el-option
-                        v-for="item in typeOptions"
-                        :key="item.key"
-                        :label="item.name"
-                        :value="item.key"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品名称" prop="name">
-                    <el-input class="input" v-model="baseForm.name" placeholder="请输入商品名称" maxlength="200" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品条码" prop="goodsNo">
-                    <el-input class="input" v-model="baseForm.goodsNo" placeholder="请输入商品条码，或使用扫码枪扫描" maxlength="50"/>
-                    <div class="create-sn" @click="createGoodsSn()">随机生成条码</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品分类" prop="cateId">
-                    <el-select class="input" v-model="baseForm.cateId" placeholder="请选择商品分类">
-                      <el-option
-                        v-for="item in cateOptions"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                        :disabled="item.status !== 'A'"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="所属店铺" prop="storeId">
-                    <el-select class="input" v-model="baseForm.storeId" clearable placeholder="请选择所属店铺">
-                      <el-option :key="0" label="公共商品" v-if="storeId == 0" :value="0"/>
-                      <el-option
-                        v-for="item in storeOptions"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                        :disabled="item.status !== 'A'"
-                      ></el-option>
-                    </el-select>
-                    <div class="form-tips">提示：未选择则属于公共商品</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品图片" prop="images">
-                    <el-upload class="form__head-icon-upload"
-                               :action="uploadAction"
-                               list-type="picture-card"
-                               :file-list="uploadFiles"
-                               :limit="10"
-                               :auto-upload="true"
-                               :headers="uploadHeader"
-                               :on-success="handleUploadSuccess"
-                               :on-remove="handleRemove">
-                      <i class="el-icon-plus"></i>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="显示排序" prop="sort">
-                    <el-input-number v-model="baseForm.sort" :min="0" />
-                    <div class="form-tips">提示：数值越小，排行越靠前</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品状态">
-                    <el-radio-group v-model="baseForm.status">
-                      <el-radio key="A" label="A" value="A">上架</el-radio>
-                      <el-radio key="N" label="N" value="N">下架</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane label="扩展信息" name="extend">
-          <div class="content">
-            <el-form ref="extendForm" :model="extendForm" :rules="extendRules" label-width="120px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="积分抵扣" prop="canUsePoint">
-                    <el-radio-group v-model="extendForm.canUsePoint">
-                      <el-radio key="Y" label="Y" value="Y">可用</el-radio>
-                      <el-radio key="N" label="N" value="N">不可用</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="会员折扣" prop="isMemberDiscount">
-                    <el-radio-group v-model="extendForm.isMemberDiscount">
-                      <el-radio key="Y" label="Y" value="Y">有折扣</el-radio>
-                      <el-radio key="N" label="N" value="N">无折扣</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="规格类型" prop="isSingleSpec">
-                    <el-radio-group v-model="extendForm.isSingleSpec">
-                      <el-radio key="Y" label="Y" value="Y">单规格</el-radio>
-                      <el-radio key="N" label="N" value="N">多规格</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row v-if="extendForm.isSingleSpec == 'N'">
-                <el-col :span="24">
-                  <el-form-item label="商品规格" prop="goodsSpec">
-                     <Sku ref="Sku" :skuData="skuData" :goodsId="baseForm.goodsId" :uploadDomain="uploadDomain" @skuChange="skuChange"/>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row v-if="baseForm.type == 'service'">
-                <el-col :span="24">
-                  <el-form-item label="服务时长" prop="serviceTime">
-                    <el-input v-model="extendForm.serviceTime" class="min-input" placeholder="请输入服务时长，单位：分钟" maxlength="50"/>
-                    <div class="form-tips">提示：输入数字，单位：分钟</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row v-if="baseForm.type == 'coupon'">
-                <el-col :span="24">
-                  <el-form-item label="卡券ID" prop="couponIds">
-                    <el-input v-model="extendForm.couponIds" class="input" rows="2" type="textarea" placeholder="请输入购买的卡券ID，英文逗号分隔，如：19932,938423,324234" maxlength="1000"/>
-                    <div class="form-tips">提示：购买的卡券ID，英文逗号分隔</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row v-if="extendForm.isSingleSpec == 'Y'">
-                <el-col :span="24">
-                  <el-form-item label="库存数量" prop="stock">
-                    <el-input v-model="extendForm.stock" class="min-input" placeholder="请输入库存数量" maxlength="50"/>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row v-if="extendForm.isSingleSpec == 'Y'">
-                <el-col :span="24">
-                  <el-form-item label="商品价格" prop="price">
-                    <el-input v-model="extendForm.price" class="min-input" placeholder="请输入商品价格" maxlength="50"/>
-                    <div class="form-tips">单位：元</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row v-if="extendForm.isSingleSpec == 'Y'">
-                <el-col :span="24">
-                  <el-form-item label="划线价格" prop="linePrice">
-                    <el-input v-model="extendForm.linePrice" class="min-input" placeholder="请输入商品划线，空则不显示" maxlength="50" />
-                    <div class="form-tips">单位：元</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="初始销量" prop="initSale">
-                    <el-input v-model="extendForm.initSale" class="min-input" placeholder="请输入初始销量" maxlength="10"/>
-                    <div class="form-tips">提示：输入数字，虚拟销量</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row v-if="extendForm.isSingleSpec == 'Y' && baseForm.type == 'product'">
-                <el-col :span="24">
-                  <el-form-item label="商品重量" prop="weight">
-                    <el-input v-model="extendForm.weight" class="min-input" placeholder="请输入商品重量" maxlength="10"/>
-                    <div class="form-tips">提示：输入数字，单位kg</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="商品卖点" prop="salePoint">
-                    <el-input class="input" v-model="extendForm.salePoint" placeholder="请输入商品卖点，几个字总结" maxlength="50"/>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane label="商品介绍" name="detail">
-          <div class="content" style="width: 375px;margin-left: 80px;">
-            <el-form ref="detailForm" :model="detailForm" :rules="detailRules" label-width="120px">
-               <editor v-model="detailForm.description" :min-height="550"/>
-            </el-form>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-      <div slot="footer" class="footer">
-         <el-button type="primary" @click="submitForm">确 定</el-button>
-         <el-button @click="cancel">取 消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth'
-import { saveGoods, getGoodsInfo } from "@/api/goods";
-import Sku from '../components/Sku';
-export default {
-  name: "GoodsForm",
-  components: { Sku },
-  data() {
-    return {
-      storeId: this.$store.getters.storeId,
-      // 遮罩层
-      loading: false,
-      activeTab: 'base',
-      storeOptions: [],
-      cateOptions: [],
-      typeOptions: [],
-      skuData: { attrList: [], skuList: [], initSkuList: [] },
-      // 基础信息表单
-      baseForm: { type: 'product', goodsId: '', name: '', storeId: this.$store.getters.storeId, cateId: '', goodsNo: '', images: [], status: "A", sort: 0 },
-      // 扩展信息表单
-      extendForm: { goodsId: '', canUsePoint: 'Y', isMemberDiscount: 'Y', isSingleSpec: 'Y', serviceTime: 0, couponIds: '', stock: '', price: '', linePrice: '', salePoint: '', initSale: '', weight: '', skuData: null },
-      // 详情信息表单
-      detailForm: { goodsId: '', description : '' },
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 上传域名
-      uploadDomain: '',
-      // 上传文件列表
-      uploadFiles: [],
-      // 基础信息表单校验
-      baseRules: {
-        name: [
-          { required: true, message: "商品名称不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '商品名称长度必须介于2和200 之间', trigger: 'blur' }
-        ],
-        goodsNo: [
-          { required: true, message: "商品条码不能为空", trigger: "blur" },
-          { min: 2, max: 100, message: '商品条码长度必须介于2和100之间', trigger: 'blur' }
-        ],
-        cateId: [
-          { required: true, message: "请选择商品分类", trigger: "blur" }
-        ],
-        images: [
-          { required: true, message: "请上传商品图片", trigger: "blur" }
-        ],
-      },
-      // 扩展信息表单校验
-      extendRules: {
-        canUsePoint: [
-          { required: true, message: "请选择", trigger: "blur" }
-        ],
-        isMemberDiscount: [
-          { required: true, message: "请选择", trigger: "blur" }
-        ],
-        isSingleSpec: [
-          { required: true, message: "请选择", trigger: "blur" }
-        ],
-        price: [
-          { required: true, message: "请输入商品价格", trigger: "blur" }, { pattern: /(^[1-9]\d*(\.\d{1,2})?$)|(^0(\.\d{1,2})?$)/, message: `价格必须大于0`, trigger: 'blur' }
-        ],
-        stock: [
-          { required: true, message: "请输入库存数量", trigger: "blur" }, { pattern: /^[0-9]{1,10}$/, message: `库存数量必须是正整数`, trigger: 'blur' }
-        ],
-        initSale: [
-          { pattern: /^[0-9]{1,10}$/, message: `初始销量必须是正整数`, trigger: 'blur' }
-        ],
-        weight: [
-          { pattern: /(^[1-9]\d*(\.\d{1,2})?$)|(^0(\.\d{1,2})?$)/, message: `重量必须大于等于0`, trigger: 'blur' }
-        ],
-      },
-      detailRules: {
-        description: [
-          { required: true, message: "请输入商品详情", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    const goodsId = this.$route.query.goodsId ? this.$route.query.goodsId : '0'
-    this.getGoodsInfo(goodsId);
-  },
-  methods: {
-    handleTabClick() {
-       // empty
-    },
-    getGoodsInfo(goodsId) {
-      const app = this;
-      getGoodsInfo(goodsId).then(response => {
-          const goodsInfo = response.data.goods;
-          const imagePath = response.data.imagePath;
-          this.uploadDomain = imagePath;
-          if (goodsInfo) {
-              // 商品基础信息
-              this.baseForm.goodsId = goodsInfo.id+'';
-              this.baseForm.type = goodsInfo.type;
-              this.baseForm.name = goodsInfo.name;
-              this.baseForm.goodsNo = goodsInfo.goodsNo;
-              this.baseForm.cateId = goodsInfo.cateId;
-              this.baseForm.storeId = goodsInfo.storeId;
-              this.baseForm.sort = goodsInfo.sort;
-              this.baseForm.status = goodsInfo.status;
-              // 商品图片
-              this.baseForm.images = response.data.images;
-              const images = this.baseForm.images;
-              app.uploadFiles = [];
-              if (images && images.length > 0) {
-                  images.forEach(function(url){
-                     app.uploadFiles.push({ url: imagePath + url })
-                  })
-              }
-
-              // 扩展信息
-              this.extendForm.goodsId = goodsInfo.id;
-              this.extendForm.canUsePoint = goodsInfo.canUsePoint == null ? 'Y' : goodsInfo.canUsePoint;
-              this.extendForm.isMemberDiscount = goodsInfo.isMemberDiscount == null ? 'Y' : goodsInfo.isMemberDiscount;
-              this.extendForm.isSingleSpec = goodsInfo.isSingleSpec == null ? 'Y' : goodsInfo.isSingleSpec;
-              this.extendForm.stock = goodsInfo.stock;
-              this.extendForm.price = goodsInfo.price;
-              this.extendForm.linePrice = goodsInfo.linePrice;
-              this.extendForm.initSale = goodsInfo.initSale;
-              this.extendForm.salePoint = goodsInfo.salePoint;
-              this.extendForm.weight = goodsInfo.weight;
-              this.extendForm.serviceTime = goodsInfo.serviceTime;
-              this.extendForm.couponIds = goodsInfo.couponIds;
-
-              // 多规格
-              this.skuData.attrList = response.data.specData;
-              this.skuData.skuList = response.data.skuData;
-              this.skuData.initSkuList = response.data.skuData;
-
-              // 商品详情
-              this.detailForm.goodsId = goodsInfo.id;
-              this.detailForm.description = goodsInfo.description;
-          }
-          this.cateOptions = response.data.cateList;
-          this.storeOptions = response.data.storeList;
-          this.typeOptions = response.data.typeList;
-      });
-    },
-    cancel() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push( { path: '/goods/goods/index' } );
-    },
-    skuChange(skuData) {
-       // empty
-    },
-    // 提交按钮
-    submitForm: function() {
-      const app = this;
-      if (app.activeTab == 'base') {
-          app.$refs["baseForm"].validate(valid => {
-            if (valid) {
-                saveGoods(app.baseForm).then(response => {
-                   app.$modal.msgSuccess("保存成功！");
-                   app.getGoodsInfo(response.data.goodsInfo.id);
-                });
-            }
-          });
-      } else if (app.activeTab == 'extend') {
-          if (!app.extendForm.goodsId) {
-              app.$modal.msgError("请先提交商品基础信息");
-              app.activeTab = 'base';
-              return false;
-          }
-          // 多规格商品验证
-          if (app.skuData.skuList && app.skuData.skuList.length > 0) {
-              let isValid0 = true;
-              let isValid1 = true;
-              let isValid2 = true;
-              app.skuData.skuList.forEach(function(item) {
-                 if (!item.skuNo || item.skuNo.length < 1 ) {
-                     isValid0 = false;
-                 }
-                 if (item.stock < 0) {
-                     isValid1 = false;
-                 }
-                 if (item.price < 0) {
-                     isValid2 = false;
-                 }
-              })
-              if (!isValid1) {
-                  app.$modal.alert("商品sku编码长度需大于1，请仔细核对！");
-                  return false;
-              }
-              if (!isValid1) {
-                  app.$modal.alert("商品库存须大于等于0，请仔细核对！");
-                  return false;
-              }
-              if (!isValid2) {
-                  app.$modal.alert("商品价格须大于等于0，请仔细核对！");
-                  return false;
-              }
-          }
-
-          app.extendForm.skuData = app.skuData.skuList;
-          app.extendForm.specData = app.skuData.attrList;
-          app.$refs["extendForm"].validate(valid => {
-            if (valid) {
-                saveGoods(app.extendForm).then(response => {
-                    app.$modal.msgSuccess("保存成功！");
-                    app.getGoodsInfo(response.data.goodsInfo.id);
-                });
-            }
-          });
-      } else {
-          if (!app.detailForm.goodsId) {
-              app.$modal.msgError("请先提交商品基础信息");
-              app.activeTab = 'base';
-              return false;
-          }
-          app.$refs["detailForm"].validate(valid => {
-              if (valid) {
-                  saveGoods(app.detailForm).then(response => {
-                      app.$modal.msgSuccess("保存成功！");
-                      app.getGoodsInfo(response.data.goodsInfo.id);
-                  });
-              }
-          });
-      }
-    },
-    // 文件上传成功
-    handleUploadSuccess(file) {
-      this.baseForm.images.push(file.data.fileName)
-    },
-    // 文件删除处理
-    handleRemove(file) {
-      const newImages = [];
-      if (this.baseForm.images && this.baseForm.images.length > 0) {
-          this.baseForm.images.forEach(function(item){
-              if (file.url.indexOf(item) == -1) {
-                  newImages.push(item);
-              }
-          })
-      }
-      this.baseForm.images = newImages;
-    },
-    // 生成随机条码
-    createGoodsSn() {
-      let sn = (Math.random() + 1) * 100000000000000;
-      this.baseForm.goodsNo = sn.toFixed(0);
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-   .main-panel {
-      padding-top: 5px;
-      .content {
-          margin-top: 30px;
-          margin-left: 20px;
-      }
-     .footer {
-        margin-top: 20px;
-     }
-     .create-sn {
-        font-size: 12px;
-        color: blue;
-        cursor: pointer;
-        width: 100px;
-     }
-   }
-</style>
diff --git a/fuintAdmin_zt/src/views/goods/goods/index.vue b/fuintAdmin_zt/src/views/goods/goods/index.vue
deleted file mode 100644
index ae768623a..000000000
--- a/fuintAdmin_zt/src/views/goods/goods/index.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" class="main-search" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="商品名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入商品名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="store">
-        <el-select
-          v-model="queryParams.storeId"
-          placeholder="所属店铺"
-          clearable
-          style="width: 180px"
-        >
-          <el-option :key="0" label="公共商品" v-if="!storeId" :value="0"/>
-          <el-option v-for="storeInfo in storeOptions" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="商品条码" prop="goodsNo">
-        <el-input
-          v-model="queryParams.goodsNo"
-          placeholder="请输入商品条码"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商品类型" prop="cateId">
-        <el-select class="input" v-model="queryParams.type" clearable placeholder="请选择商品类型">
-          <el-option
-            v-for="item in typeOptions"
-            :key="item.key"
-            :label="item.name"
-            :value="item.key"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 100px"
-        >
-          <el-option key="A" label="上架" value="A"/>
-          <el-option key="N" label="下架" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['goods:goods:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="50"/>
-      <el-table-column label="所属店铺" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeInfo">{{ scope.row.storeInfo.name }}</span>
-          <span v-else>公共所有</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品名称" align="center" min-width="300" prop="name" />
-      <el-table-column label="主图" align="center" width="100">
-        <template slot-scope="scope">
-           <img class="list-img" :src="scope.row.logo">
-        </template>
-      </el-table-column>
-      <el-table-column label="商品条码" align="center" prop="goodsNo" width="130"/>
-      <el-table-column label="所属分类" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.cateInfo.name }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="价格" align="center" width="80">
-        <template slot-scope="scope">
-          <span v-if="scope.row.price">{{ scope.row.price.toFixed(2) }}</span>
-          <span v-else>0.00</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="上架状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="120" fixed='right'>
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['goods:goods:edit']"
-            @click="handleUpdate(scope.row)"
-            v-if="storeId == scope.row.storeId || storeId == 0"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['goods:goods:edit']"
-            v-if="storeId == scope.row.storeId || storeId == 0"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getGoodsList, updateGoodsStatus } from "@/api/goods";
-export default {
-  name: "GoodsIndex",
-  data() {
-    return {
-      storeId: this.$store.getters.storeId,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 店铺列表
-      storeOptions: [],
-      // 商品类型
-      typeOptions: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'sort', order: 'descending'},
-      // 表单参数
-      form: { id: '', name: '', logo: '', sort: 0, status: "A" },
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        name: '',
-        goodsNo: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "名称不能为空", trigger: "blur" },
-          { min: 2, max: 200, message: '名称长度必须介于2 和 200 之间', trigger: 'blur' }
-        ],
-        logo: [{ required: true, message: "请上传图片", trigger: "blur" }]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询商品列表
-    getList() {
-      this.loading = true;
-      getGoodsList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.typeOptions = response.data.typeList;
-          this.storeOptions = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "上架" : "下架";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
-        return updateGoodsStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.$router.push( { path: '/goods/goods/add' } )
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.$router.push( { path: '/goods/goods/edit?goodsId=' + row.id } )
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.name
-      this.$modal.confirm('是否确认删除商品"' + name + '"？').then(function() {
-        return updateGoodsStatus(row.id, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleUploadSuccess (file) {
-      this.form.logo = file.data.fileName
-    },
-    handleRemove (file, fileList) {
-      setTimeout(() => {
-        this.hideUpload = fileList.length > 0
-      }, 520)
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
deleted file mode 100644
index bbbc2e93f..000000000
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ /dev/null
@@ -1,812 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-carousel height="230px">
-      <el-carousel-item v-for="(item,index) in bannerList" :key="index">
-        <div class="bannser">
-
-          <!--          <img src="../../assets/images/banner.png" alt="" >-->
-          <img :src="imagePath+item.productImage" alt="" >
-        </div>
-      </el-carousel-item>
-    </el-carousel>
-    <div class="b-bs">
-      <div class="left-box">
-        <div class="san-box">
-          <div>
-            <img src="../../assets/images/l-one.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.allTotal || 0 }}</div>
-            <div class="r-size">合作油站总数</div>
-          </div>
-        </div>
-        <div class="san-box" style="background: linear-gradient( 90deg, #FFDC9B 0%, #FFC154 100%);">
-          <div>
-            <img src="../../assets/images/l-two.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.weekTotal || 0 }}</div>
-            <div class="r-size">7日活跃油站汇总数</div>
-          </div>
-        </div>
-        <div class="san-box" style="background: linear-gradient( 90deg, #9CDCA0 0%, #5BC557 100%);">
-          <div>
-            <img src="../../assets/images/l-three.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.monthTotal || 0 }}</div>
-            <div class="r-size">本月新增油站数</div>
-          </div>
-        </div>
-      </div>
-      <div class="right-box">
-        <div class="title_">
-          <div>通知中心</div>
-          <div style="font-size: 12px;color: #BBBBBB;display: flex;align-items: center">更多 <i class="el-icon-arrow-right"></i> </div>
-        </div>
-<!--        <div class="hang_" v-for="(item,index) in 4" :key="index" >【到期提醒】百业兴智慧油站系统将于2024年07月10日到期...</div>-->
-        <div class="hang_" v-for="(item,index) in noticeList" :key="index" >【{{ item.notificationType }}】{{ item.templateContent }}</div>
-        <div class="hang_" v-if="this.noticeList.length==0">暂无通知</div>
-      </div>
-    </div>
-    <div class="b-bs">
-      <div class="left-box-t">
-        <div class="d-s">
-          <div class="h-tt" >数据看板</div>
-          <div class="q-anniu">近一周</div>
-          <div style="margin-right: 40px">
-            <el-date-picker
-              v-model="value1"
-              type="datetimerange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="getStoreAmount">
-            </el-date-picker>
-          </div>
-          <div style="margin-right: 40px">
-            <el-select v-model="value" clearable placeholder="请选择" @change="chooseDept()">
-              <el-option
-                v-for="item in options"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="d-s" style="margin-top: 15px">
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>活跃油站数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.storeTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>交易金额(万元)/交易笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.tradeAmount || 0 }}/{{ storeAmount.tradeTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>退款金额(元)/退款笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.refundAmount || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>笔均单价(元)</div>
-            </div>
-            <div class="num-size">{{ storeAmount.averagePrice || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>日均交易额(万元)/日均交易笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.dayTradeAmount || 0 }}/{{ storeAmount.dayTradeTotal || 0 }}</div>
-          </div>
-        </div>
-        <div class="hui-hang"></div>
-        <div class="d-s" >
-          <div>
-            <div class="h-tt" >活跃油站</div>
-            <div id="ccc" style="width: 300px;height: 200px; "></div>
-          </div>
-          <div id="cccc" style="width: 300px;height: 200px;"></div>
-          <div id="ccct" style="width: 300px;height: 200px;"></div>
-          <div id="cttt" style="width: 340px;height: 200px;"></div>
-
-        </div>
-      </div>
-      <div class="right-box-t">
-        <div class="h-tt" >硬件设备</div>
-        <div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
-<!--          <div class="r-img">-->
-<!--            <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">-->
-<!--          </div>-->
-<!--          <div>容大(RT RONGTA)RP76II针式76mm小票打印机加油站二三联票据 RP76II/USB口</div>-->
-          <div class="r-img">
-            <img :src="imagePath + item.image" style="width: 84px;height: 70px">
-          </div>
-          <div>{{ item.name }}</div>
-        </div>
-      </div>
-    </div>
-    <div class="bottom_">
-      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
-      <div class="d-s">
-        <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
-          {{item}}
-        </div>
-        <el-date-picker
-          v-model="value2"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-      <div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
-
-    </div>
-
-  </div>
-</template>
-
-<script>
-import echarts from "echarts";
-import {getStoreAmountByTime, storeAmountIndex1, storeTotalIndex} from "@/api/indexBanner";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-import {parseTime} from "@/utils/fuint";
-import {getBannerListApi} from "@/api/sys/banner";
-import {getListApi} from "@/api/setting/hardware";
-import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
-export default {
-
-  props:["accountId"],
-  data(){
-    return{
-      form: {},
-      timeList:[
-        "今日",
-        "近一周",
-        "近一月",
-        "近一年",
-      ],
-      timeIndex:0,
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: '',
-      value1: [],
-      value2: [],
-      imagePath: process.env.VUE_APP_SERVER_URL,
-      queryParams:{},
-      // 店铺数量
-      storeTotal:{},
-      // 店铺金额
-      storeAmount:{},
-      // banner图列表
-      bannerList:{},
-      storeList:[],
-      hardwareList:[],
-      noticeList:[]
-    }
-  },
-  created() {
-    let nowDate = new Date();
-    let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-    this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-    this.getStoreTotal()
-    this.selectChildByDeptIdApi()
-    this.getStoreAmount()
-    this.selectBannerList()
-    let start = new Date();
-    start.setHours(0)
-    start.setMinutes(0)
-    start.setSeconds(0)
-    start.setMilliseconds(0)
-    this.value2 = [parseTime(start),parseTime(new Date())];
-    this.getStoreList()
-    this.getHardwareList()
-    this.getNoticeList()
-  },
-  mounted() {
-    // this.initChart()
-  },
-  methods:{
-    getNoticeList(){
-      getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
-        this.noticeList = res.data.records
-      })
-    },
-    getHardwareList(){
-      getListApi({page: 1, pageSize: 3,status:'1'}).then(res=>{
-        this.hardwareList = res.data.records;
-        this.hardwareList.forEach(item => {
-          if (item.image.includes(",")){
-            item.image = item.image.split(",")[0]
-          }
-        })
-      })
-    },
-    editColor(index){
-      this.timeIndex = index
-      if (this.timeList[index]=='今日'){
-        let start = new Date();
-        start.setHours(0)
-        start.setMinutes(0)
-        start.setSeconds(0)
-        start.setMilliseconds(0)
-        this.value2 = [start,new Date()];
-      } else if (this.timeList[index]=='近一周'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      } else if (this.timeList[index]=='近一月'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      } else if (this.timeList[index]=='近一年'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      }
-      this.getStoreList()
-    },
-    getStoreList(){
-      getStoreAmountByTime(this.addDateRange({},this.value2)).then(res => {
-        this.storeList = res.data
-        this.initChart()
-      })
-    },
-    selectBannerList(){
-      let queryParams = {
-        pageNo:1,
-        pageSize:10,
-        system_position:"系统首页"
-      }
-      getBannerListApi(queryParams).then(res=>{
-        this.bannerList = res.data.records
-      })
-    },
-    // 查询
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.options = res.data
-      })
-    },
-    getStoreTotal(){
-      storeTotalIndex().then(res => {
-        this.storeTotal = res.data
-      })
-    },
-    // 选择机构信息
-    chooseDept(){
-      this.options.forEach(item => {
-        if (item.deptId == this.value){
-          this.queryParams.ancestors = item.ancestors
-        }
-      })
-      this.getStoreAmount()
-    },
-    getStoreAmount(){
-      storeAmountIndex1(this.addDateRange(this.queryParams,this.value1)).then(res => {
-        this.storeAmount = res.data
-        this.initChart()
-      })
-    },
-    countPercentage(upNum,downNum){
-      let percentage = 0;
-      percentage = (upNum / downNum)*100
-      return percentage.toFixed(2)
-    },
-    initChart() {
-      const chart = echarts.init(document.getElementById('ccc'))
-      const chart1 = echarts.init(document.getElementById('cccc'))
-      const chart2= echarts.init(document.getElementById('ccct'))
-      const chart4= echarts.init(document.getElementById('cttt'))
-      const chart3= echarts.init(document.getElementById('ctct'))
-
-      let hourList = []
-      let storeNumList = []
-      let tradeAmountList = []
-      let tradeNumList = []
-      if (this.storeList.length>0) {
-        for (let i = 0; i < 24; i++) {
-          let flag = false;
-          let hour = i.toString().padStart(2, '0') + ":00"; // 转换为两位数格式
-          this.storeList.forEach(item => {
-            if (item.tradeTime == hour){
-              flag = true
-              storeNumList.push(item.storeNum)
-              tradeAmountList.push(item.tradeAmount)
-              tradeNumList.push(item.tradeNum)
-            }
-          })
-          hourList.push(hour);
-          if (!flag) {
-            storeNumList.push(0)
-            tradeAmountList.push(0)
-            tradeNumList.push(0)
-          }
-        }
-      }else {
-        hourList = ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']
-        storeNumList = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-        tradeAmountList = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-        tradeNumList = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-      }
-
-      const option = {
-        color: [
-          '#179726',
-          '#FFB519',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: '80%',
-            data: [
-              // { value: 28, name: '28%' },
-              // { value: 72, name: '72%' },
-              // { value: this.countPercentage(Number(this.storeAmount.noStoreTotal),Number(this.storeAmount.noStoreTotal) + Number(this.storeAmount.storeTotal)), name: '非7日活跃油站' },
-              // { value: this.countPercentage(Number(this.storeAmount.storeTotal),Number(this.storeAmount.noStoreTotal) + Number(this.storeAmount.storeTotal)), name: '7日活跃油站' },
-
-              { value: Number(this.storeAmount.noStoreTotal), name: '非7日活跃油站' },
-              { value: Number(this.storeAmount.storeTotal), name: '7日活跃油站' },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option1 = {
-        color: [
-          '#3B6ADE',
-          '#409eff',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: '80%',
-            data: [
-              // { value: 28, name: '28%' },
-              // { value: 72, name: '72%' },
-              // { value: this.countPercentage(Number(this.storeAmount.addStoreTotal),Number(this.storeAmount.addStoreTotal) + Number(this.storeAmount.noAddStoreTotal)), name: '本月新增油站' },
-              // { value: this.countPercentage(Number(this.storeAmount.noAddStoreTotal),Number(this.storeAmount.addStoreTotal) + Number(this.storeAmount.noAddStoreTotal)), name: '非本月新增油站' },
-
-              { value: Number(this.storeAmount.addStoreTotal), name: '本月新增油站' },
-              { value: Number(this.storeAmount.noAddStoreTotal), name: '非本月新增油站' },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option2 = {
-        color: [
-          '#0DC291',
-          '#FFB519',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: '80%',
-            data: [
-              // { value: 28, name: '28%' },
-              // { value: 72, name: '72%' },
-              // { value: this.countPercentage(Number(this.storeAmount.weekStoreTotal),Number(this.storeAmount.weekStoreTotal) + Number(this.storeAmount.noWeekStoreTotal)), name: '本月新增7日活跃油站' },
-              // { value: this.countPercentage(Number(this.storeAmount.noWeekStoreTotal),Number(this.storeAmount.weekStoreTotal) + Number(this.storeAmount.noWeekStoreTotal)), name: '本月新增非7日活跃油站' },
-              { value: Number(this.storeAmount.weekStoreTotal), name: '本月新增7日活跃油站' },
-              { value: Number(this.storeAmount.noWeekStoreTotal), name: '本月新增非7日活跃油站' },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option3 = {
-        color: ['#FF9655', '#0DC291', '#409EFF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999'
-            }
-          }
-        },
-
-        legend: {
-          data: ['交易金额', '交易笔数', '活跃油站数']
-        },
-        xAxis: [
-          {
-            type: 'category',
-            // data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'],
-            data: hourList,
-            axisPointer: {
-              type: 'shadow'
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '活跃油站数',
-
-            // min: 0,
-            // max: 250,
-            // interval: 50,
-            axisLabel: {
-              formatter: '{value} '
-            }
-          },
-          {
-            type: 'value',
-            name: '金额(元)',
-            // min: 0,
-            // max: 25,
-            // interval: 5,
-            axisLabel: {
-              formatter: '{value}'
-            }
-          }
-        ],
-        series: [
-          {
-            name: '活跃油站数',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + ' ml';
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                //这里设置柱形图圆角 5左上角，右上角，右下角，左下角]
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   30.0, 31.9, 71.0, 23.2, 41.6, 31.7, 21.6, 30.0, 31.9, 71.0, 23.2, 41.6,0,1,4,5,7,2
-            // ]
-            data: storeNumList
-          },
-
-          {
-            name: '交易金额',
-            type: 'line',
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + ' °C';
-              }
-            },
-            // data: [3.0, 3.9, 7.0, 2.2, 4.6, 3.7, 2.6, 3.0, 3.9, 7.0, 3.2, 4.6,0,4,5,7,5]
-            data: tradeAmountList
-          },
-          {
-            name: '交易笔数',
-            type: 'line',
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + ' °C';
-              }
-            },
-            // data: [2.0, 3.9, 4.0, 5.2, 4.6, 6.7, 7.6, 6.0, 5.9, 4.0, 4.2, 2.6]
-            data: tradeNumList
-          }
-        ],
-        grid: {
-          left: '1%',
-          right: '1%',
-          bottom: '3%',
-          containLabel: true
-        }
-
-      };
-      const option4 ={
-        color: ['#f82f2f', '#179627'],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: ['40%', '70%'],
-            avoidLabelOverlap: false,
-            itemStyle: {
-              borderRadius: 10,
-              borderColor: '#fff',
-              borderWidth: 10
-            },
-
-            emphasis: {
-              label: {
-                show: true,
-                fontSize: 40,
-                fontWeight: 'bold'
-              }
-            },
-
-            data: [
-              // { value: 225, name: '富友占比' },
-              // { value: 735, name: '拉卡拉占比' }
-              { value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友占比' },
-              { value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉占比' }
-            ]
-          }
-        ]
-      };
-      chart.setOption(option)
-      chart1.setOption(option1)
-      chart2.setOption(option2)
-      chart3.setOption(option3)
-      chart4.setOption(option4)
-
-
-
-    }
-
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-
-.app-container{
-  width: 100%;
-  height: 100%;
-  /* height: 100vh; */
-  background: #f4f5f9;
-}
-.d-s{
-  display: flex;
-  align-items: center;
-}
-.bannser{
-  width: 100%;
-  height: 230px;
-  border-radius: 8px;
-  overflow: hidden;
-  img{
-    width: 100%;
-    height: 100%;
-  }
-
-}
-.b-bs{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 20px;
-}
-.left-box{
-  width: 73%;
-  background: #FFFFFF;
-  border-radius: 10px 10px 10px 10px;
-  border: 1px solid #FFFFFF;
-  height: 192px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.left-box-t{
-  width: 73%;
-  box-sizing: border-box;
-  padding: 15px;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 380px;
-
-}
-.right-box{
-  width: 25%;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 192px;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.right-box-t{
-  width: 25%;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 380px;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.san-box{
-  width: 360px;
-  height: 150px;
-  box-sizing: border-box;
-  border-radius: 8px;
-  background: linear-gradient( 90deg, #70CAFD 0%, #02AAFE 100%);
-  margin: 15px 0px;
-  margin-right: 15px;
-  box-sizing: border-box;
-  padding: 20px 40px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.r-title{
-  font-weight: bold;
-  font-size: 42px;
-  color: #FFFFFF;
-  text-align: center;
-}
-.r-size{
-  font-size: 14px;
-  color: #FFFFFF;
-}
-.title_{
-  font-size: 16px;
-  color: #333333;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-.hang_{
-  width: 100%;
-  white-space: nowrap;   //不换行
-  overflow: hidden;       //超出部分隐藏
-  text-overflow: ellipsis;    //文本溢出显示省略号
-  font-size: 14px;
-  color: #777777;
-  margin: 14px auto;
-}
-.h-tt{
-  font-size: 16px;
-  color: #333333;
-  font-weight: bold;
-  margin-right: 40px;
-}
-.q-anniu{
-  width: 80px;
-  height: 26px;
-  background: #FF9655;
-  border-radius: 4px 4px 4px 4px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #fff;
-  cursor: pointer;
-  margin-right: 20px;
-}
-
-.k-box{
-  width: 215px;
-  height: 68px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  border: 1px solid #e1e0e0;
-  box-sizing: border-box;
-  padding: 10px;
-  margin-right: 10px;
-}
-.num-size{
-  font-weight: bold;
-  font-size: 24px;
-  color: #555555;
-}
-.sian{
-  width: 6px;
-  height: 6px;
-  background: #2BBCFF;
-  border-radius: 50%;
-  margin-right: 5px;
-}
-.hui-hang{
-  width: 100%;
-  height: 5px;
-  background: #F4F5F9;
-  margin: 15px auto;
-}
-.h-r-ba{
-  height: 170px;
-  margin: 0px 50px;
-  width: 5px;
-  background: #f4f5f9;
-}
-.r-img{
-  width: 84px;
-  height: 70px;
-  margin-right: 20px;
-}
-.bottom_{
-  width: 100%;
-  border-radius: 10px;
-  background:  #fff;
-  box-sizing: border-box;
-  padding: 20px;
-  margin-top: 20px;
-}
-.anniu-h{
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-.anniu-act{
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/homeComponents/manage.vue b/fuintAdmin_zt/src/views/homeComponents/manage.vue
deleted file mode 100644
index 16fc8076f..000000000
--- a/fuintAdmin_zt/src/views/homeComponents/manage.vue
+++ /dev/null
@@ -1,840 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-carousel height="230px">
-      <el-carousel-item v-for="(item,index) in bannerList" :key="index">
-        <div class="bannser">
-
-<!--          <img src="../../assets/images/banner.png" alt="" >-->
-          <img :src="imagePath+item.productImage" alt="" >
-        </div>
-      </el-carousel-item>
-    </el-carousel>
-
-    <div class="b-bs">
-      <div class="left-box">
-        <div class="san-box">
-          <div>
-            <img src="../../assets/images/l-one.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.allTotal || 0 }}</div>
-            <div class="r-size">合作油站总数</div>
-          </div>
-        </div>
-        <div class="san-box" style="background: linear-gradient( 90deg, #FFDC9B 0%, #FFC154 100%);">
-          <div>
-            <img src="../../assets/images/l-two.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.weekTotal || 0 }}</div>
-            <div class="r-size">7日活跃油站汇总数</div>
-          </div>
-        </div>
-        <div class="san-box" style="background: linear-gradient( 90deg, #9CDCA0 0%, #5BC557 100%);">
-          <div>
-            <img src="../../assets/images/l-three.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.monthTotal || 0 }}</div>
-            <div class="r-size">本月新增油站数</div>
-          </div>
-        </div>
-      </div>
-      <div class="right-box">
-        <div class="title_">
-          <div>通知中心</div>
-          <div style="font-size: 12px;color: #BBBBBB;display: flex;align-items: center">更多 <i class="el-icon-arrow-right"></i> </div>
-        </div>
-<!--        <div class="hang_" v-for="(item,index) in 4" :key="index" >【到期提醒】百业兴智慧油站系统将于2024年07月10日到期...</div>-->
-        <div class="hang_" v-for="(item,index) in noticeList" :key="index" >【{{ item.notificationType }}】{{ item.templateContent }}</div>
-        <div class="hang_" v-if="this.noticeList.length==0">暂无通知</div>
-      </div>
-    </div>
-    <div class="b-bs">
-      <div class="left-box-t">
-        <div class="d-s">
-          <div class="h-tt" >数据看板</div>
-          <div class="q-anniu">近一周</div>
-          <div style="margin-right: 40px">
-            <el-date-picker
-              v-model="value1"
-              type="datetimerange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="getStoreAmount">
-            </el-date-picker>
-          </div>
-          <div style="margin-right: 40px">
-            <el-select v-model="value" clearable placeholder="请选择" @change="chooseDept()">
-              <el-option
-                v-for="item in options"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="d-s" style="margin-top: 15px">
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>活跃油站数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.storeTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>交易金额(万元)/交易笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.tradeAmount || 0 }}/{{ storeAmount.tradeTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>退款金额(元)/退款笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.refundAmount || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>笔均单价(元)</div>
-            </div>
-            <div class="num-size">{{ storeAmount.averagePrice || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>日均交易额(万元)/日均交易笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.dayTradeAmount || 0 }}/{{ storeAmount.dayTradeTotal || 0 }}</div>
-          </div>
-        </div>
-        <div class="hui-hang"></div>
-        <div class="d-s" >
-          <div>
-            <div class="h-tt" >活跃油站</div>
-            <div id="ccc" style="width: 300px;height: 200px; "></div>
-          </div>
-          <div class="h-r-ba"></div>
-          <div>
-
-            <div class="d-s" style="justify-content: space-between">
-              <div id="cccc" style="width: 300px;height: 200px;margin-right: 50px"></div>
-              <div id="ccct" style="width: 300px;height: 200px; margin-left: 50px"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="right-box-t">
-        <div class="h-tt" >硬件设备</div>
-        <div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
-<!--          <div class="r-img">-->
-<!--            <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">-->
-<!--          </div>-->
-<!--          <div>容大(RT RONGTA)RP76II针式76mm小票打印机加油站二三联票据 RP76II/USB口</div>-->
-          <div class="r-img">
-            <img :src="imagePath + item.image" style="width: 84px;height: 70px">
-          </div>
-          <div>{{ item.name }}</div>
-        </div>
-      </div>
-    </div>
-    <div class="bottom_">
-      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
-      <div class="d-s">
-        <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
-          {{item}}
-        </div>
-        <el-date-picker
-          v-model="value2"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @change="getStoreList()">
-        </el-date-picker>
-      </div>
-      <div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
-
-    </div>
-
-  </div>
-</template>
-
-<script>
-import echarts from "echarts";
-import {selectStoreAmount, storeAmountIndex, storeTotalIndex} from "@/api/indexBanner";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-import {parseTime} from "@/utils/fuint";
-import {getBannerListApi} from "@/api/sys/banner";
-import {getListApi} from "@/api/setting/hardware";
-import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
-export default {
-
-  props:["accountId"],
-  data(){
-    return{
-      form: {},
-      timeList:[
-        "今日",
-        "近一周",
-        "近一月",
-        "近一年",
-      ],
-      timeIndex:0,
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: '',
-      value1: [],
-      value2: [],
-      imagePath: process.env.VUE_APP_SERVER_URL,
-      queryParams:{},
-      // 店铺数量
-      storeTotal:{},
-      // 店铺金额
-      storeAmount:{},
-      // banner图列表
-      bannerList:{},
-      storeList:[],
-      hardwareList:[],
-      noticeList:[]
-    }
-  },
-  created() {
-    let nowDate = new Date();
-    let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-    this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-    this.getStoreTotal()
-    this.selectChildByDeptIdApi()
-    this.getStoreAmount()
-    this.selectBannerList()
-    let start = new Date();
-    start.setHours(0)
-    start.setMinutes(0)
-    start.setSeconds(0)
-    start.setMilliseconds(0)
-    this.value2 = [start,new Date()];
-    this.getStoreList()
-    this.getHardwareList()
-    this.getNoticeList()
-  },
-  mounted() {
-    // this.initChart()
-  },
-  methods:{
-    getNoticeList(){
-      getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
-        this.noticeList = res.data.records
-      })
-    },
-    getHardwareList(){
-      getListApi({page: 1, pageSize: 3,status:'1'}).then(res=>{
-        this.hardwareList = res.data.records;
-        this.hardwareList.forEach(item => {
-          if (item.image.includes(",")){
-            item.image = item.image.split(",")[0]
-          }
-        })
-      })
-    },
-    editColor(index){
-      this.timeIndex = index
-      if (this.timeList[index]=='今日'){
-        let start = new Date();
-        start.setHours(0)
-        start.setMinutes(0)
-        start.setSeconds(0)
-        start.setMilliseconds(0)
-        this.value2 = [start,new Date()];
-      } else if (this.timeList[index]=='近一周'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      } else if (this.timeList[index]=='近一月'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      } else if (this.timeList[index]=='近一年'){
-        let nowDate = new Date();
-        let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
-        this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-      }
-      this.getStoreList()
-    },
-    getStoreList(){
-      selectStoreAmount(this.addDateRange({},this.value2)).then(res => {
-        this.storeList = res.data
-        this.initChart()
-      })
-    },
-    // 选择机构信息
-    chooseDept(){
-      this.options.forEach(item => {
-        if (item.deptId == this.value){
-          this.queryParams.ancestors = item.ancestors
-        }
-      })
-      this.getStoreAmount()
-    },
-    selectBannerList(){
-      let queryParams = {
-        pageNo:1,
-        pageSize:10,
-        system_position:"系统首页"
-      }
-      getBannerListApi(queryParams).then(res=>{
-        this.bannerList = res.data.records
-      })
-    },
-    // 查询
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.options = res.data
-      })
-    },
-    getStoreTotal(){
-      storeTotalIndex().then(res => {
-        this.storeTotal = res.data
-      })
-    },
-    getStoreAmount(){
-      storeAmountIndex(this.addDateRange(this.queryParams,this.value1)).then(res => {
-        this.storeAmount = res.data
-        this.initChart()
-      })
-    },
-    countPercentage(upNum,downNum){
-      let percentage = 0;
-      percentage = (upNum / downNum)*100
-      return percentage.toFixed(2)
-    },
-    initChart() {
-      const chart = echarts.init(document.getElementById('ccc'))
-      const chart1 = echarts.init(document.getElementById('cccc'))
-      const chart2= echarts.init(document.getElementById('ccct'))
-      const chart3= echarts.init(document.getElementById('ctct'))
-
-      let dataList = []
-      let allTotal = 0
-      if (this.storeAmount.oilNameList) {
-        this.storeAmount.oilNameList.forEach(item => {
-          allTotal += item.countNum
-        })
-        this.storeAmount.oilNameList.forEach(item => {
-          let data = {value: 0, name: ""}
-          data.value = this.countPercentage(item.countNum, allTotal);
-          data.name = item.oilName + item.oilType + "占比"
-          dataList.push(data)
-        })
-      }
-
-      let storeNameList = []
-      let oilAmountList = []
-      let noOilAmountList = []
-      let rechargeBalanceList = []
-      let consumeBalanceList = []
-      let userBalanceList = []
-      if (this.storeList.length>0) {
-        this.storeList.forEach(item => {
-          storeNameList.push(item.storeName)
-          oilAmountList.push(item.oilAmount)
-          noOilAmountList.push(item.noOilAmount)
-          rechargeBalanceList.push(item.userRechargeBalance)
-          consumeBalanceList.push(item.userConsumeBalance)
-          userBalanceList.push(item.userBalance)
-        })
-      }
-
-      const option = {
-        color: [
-          '#b7f1e2',
-          '#fc7150',
-          '#fea500',
-          '#5facfe',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            roseType: 'area',
-            radius: [5, '80%'],
-            // data: [
-            //   { value: 36, name: '#98汽油占比' },
-            //   { value: 42, name: '0#柴油占比' },
-            //   { value: 40, name: '#95汽油占比' },
-            //   { value: 38, name: '#92柴油占比' },
-            //
-            //
-            // ],
-            data: dataList,
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                borderRadius: 8,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option1 = {
-        color: [
-          '#3B6ADE',
-          '#409eff',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: '80%',
-            data: [
-              // { value: 28, name: '28%' },
-              // { value: 72, name: '72%' },
-              { value: this.countPercentage(Number(this.storeAmount.oilNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.noOilNum)), name: "油品交易占比" },
-              { value: this.countPercentage(Number(this.storeAmount.noOilNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.noOilNum)), name: "非油品交易占比" },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option2 = {
-        color: [
-          '#46c2c4',
-          '#6e4dd8',
-          '#214790',
-          '#d55f5f',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: [50, '80%'],
-            data: [
-              // { value: 28, name: '会员充值占比' },
-              // { value: 72, name: '积分商城交易占比' },
-              // { value: 28, name: '油品交易占比' },
-              // { value: 72, name: '便利店交易占比' },
-              { value: this.countPercentage(Number(this.storeAmount.userNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '会员充值占比' },
-              { value: this.countPercentage(Number(this.storeAmount.integralNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '积分商城交易占比' },
-              { value: this.countPercentage(Number(this.storeAmount.oilNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '油品交易占比' },
-              { value: this.countPercentage(Number(this.storeAmount.goodNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '便利店交易占比' },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-
-      const option3 = {
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999'
-            }
-          }
-        },
-
-        legend: {
-          data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额']
-        },
-        xAxis: [
-          {
-            type: 'category',
-            // data: ['中建锦绣广场1站', '中建锦绣广场2站', '中建锦绣广场3站', '中建锦绣广场4站', '中建锦绣广场5站', '中建锦绣广场6站', '中建锦绣广场7站'],
-            data: storeNameList,
-            axisPointer: {
-              type: 'shadow'
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '金额(元)',
-            // min: 0,
-            // max: 10000,
-            // interval: 2000,
-            axisLabel: {
-              formatter: '{value}'
-            }
-          }
-          // {
-          //   type: 'value',
-          //   name: '',
-          //   min: 0,
-          //   max: 25,
-          //   interval: 5,
-          //   axisLabel: {
-          //     formatter: '{value} '
-          //   }
-          // }
-        ],
-        series: [
-          {
-            name: '油品交易额',
-            color: '#FF9655',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            barGap: '60%',
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: oilAmountList
-          },
-          {
-            name: '非油品交易额',
-            color: '#55F3FF',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: noOilAmountList
-          },
-          {
-            name: '会员充值金额',
-            color: '#0DC291',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: rechargeBalanceList
-          },
-          {
-            name: '会员消费金额',
-            color: '#409EFF',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: consumeBalanceList
-          },
-          {
-            name: '会员余额',
-            color: '#D55F5F',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
-            // ]
-            data: userBalanceList
-          }
-        ],
-        grid: {
-          left: '3%',
-          right: '3%',
-          bottom: '3%',
-          containLabel: true
-        }
-      };
-
-      chart.setOption(option)
-      chart1.setOption(option1)
-      chart2.setOption(option2)
-      chart3.setOption(option3)
-
-
-    }
-
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-
-.app-container{
-  width: 100%;
-  height: 100%;
-  /* height: 100vh; */
-  background: #f4f5f9;
-}
-.d-s{
-  display: flex;
-  align-items: center;
-}
-.bannser{
-  width: 100%;
-  height: 230px;
-  border-radius: 8px;
-  overflow: hidden;
-  img{
-    width: 100%;
-    height: 100%;
-  }
-
-}
-.b-bs{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 20px;
-}
-.left-box{
-  width: 73%;
-  background: #FFFFFF;
-  border-radius: 10px 10px 10px 10px;
-  border: 1px solid #FFFFFF;
-  height: 192px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.left-box-t{
-  width: 73%;
-  box-sizing: border-box;
-  padding: 15px;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 380px;
-
-}
-.right-box{
-  width: 25%;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 192px;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.right-box-t{
-  width: 25%;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 380px;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.san-box{
-  width: 360px;
-  height: 150px;
-  box-sizing: border-box;
-  border-radius: 8px;
-  background: linear-gradient( 90deg, #70CAFD 0%, #02AAFE 100%);
-  margin: 15px 0px;
-  margin-right: 15px;
-  box-sizing: border-box;
-  padding: 20px 40px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.r-title{
-  font-weight: bold;
-  font-size: 42px;
-  color: #FFFFFF;
-  text-align: center;
-}
-.r-size{
-  font-size: 14px;
-  color: #FFFFFF;
-}
-.title_{
-  font-size: 16px;
-  color: #333333;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-.hang_{
-  width: 100%;
-  white-space: nowrap;   //不换行
-  overflow: hidden;       //超出部分隐藏
-  text-overflow: ellipsis;    //文本溢出显示省略号
-  font-size: 14px;
-  color: #777777;
-  margin: 14px auto;
-}
-.h-tt{
-  font-size: 16px;
-  color: #333333;
-  font-weight: bold;
-  margin-right: 40px;
-}
-.q-anniu{
-  width: 80px;
-  height: 26px;
-  background: #FF9655;
-  border-radius: 4px 4px 4px 4px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #fff;
-  cursor: pointer;
-  margin-right: 20px;
-}
-
-.k-box{
-  width: 215px;
-  height: 68px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  border: 1px solid #e1e0e0;
-  box-sizing: border-box;
-  padding: 10px;
-  margin-right: 10px;
-}
-.num-size{
-  font-weight: bold;
-  font-size: 24px;
-  color: #555555;
-}
-.sian{
-  width: 6px;
-  height: 6px;
-  background: #2BBCFF;
-  border-radius: 50%;
-  margin-right: 5px;
-}
-.hui-hang{
-  width: 100%;
-  height: 5px;
-  background: #F4F5F9;
-  margin: 15px auto;
-}
-.h-r-ba{
-  height: 170px;
-  margin: 0px 50px;
-  width: 5px;
-  background: #f4f5f9;
-}
-.r-img{
-  width: 84px;
-  height: 70px;
-  margin-right: 20px;
-}
-.bottom_{
-  width: 100%;
-  border-radius: 10px;
-  background:  #fff;
-  box-sizing: border-box;
-  padding: 20px;
-  margin-top: 20px;
-}
-.anniu-h{
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-.anniu-act{
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/homeComponents/shopowner.vue b/fuintAdmin_zt/src/views/homeComponents/shopowner.vue
deleted file mode 100644
index 089a8f9a4..000000000
--- a/fuintAdmin_zt/src/views/homeComponents/shopowner.vue
+++ /dev/null
@@ -1,813 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-carousel height="230px">
-      <el-carousel-item v-for="(item,index) in bannerList" :key="index">
-        <div class="bannser">
-
-          <!--          <img src="../../assets/images/banner.png" alt="" >-->
-          <img :src="imagePath+item.productImage" alt="" >
-        </div>
-      </el-carousel-item>
-    </el-carousel>
-    <div class="b-bs">
-      <div class="left-box">
-        <div class="san-box">
-          <div>
-            <img src="../../assets/images/l-one.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.allTotal || 0 }}</div>
-            <div class="r-size">合作油站总数</div>
-          </div>
-        </div>
-        <div class="san-box" style="background: linear-gradient( 90deg, #FFDC9B 0%, #FFC154 100%);">
-          <div>
-            <img src="../../assets/images/l-two.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.weekTotal || 0 }}</div>
-            <div class="r-size">7日活跃油站汇总数</div>
-          </div>
-        </div>
-        <div class="san-box" style="background: linear-gradient( 90deg, #9CDCA0 0%, #5BC557 100%);">
-          <div>
-            <img src="../../assets/images/l-three.png" style="width: 80px;height: 80px">
-          </div>
-          <div>
-            <div class="r-title">{{ storeTotal.monthTotal || 0 }}</div>
-            <div class="r-size">本月新增油站数</div>
-          </div>
-        </div>
-      </div>
-      <div class="right-box">
-        <div class="title_">
-          <div>通知中心</div>
-          <div style="font-size: 12px;color: #BBBBBB;display: flex;align-items: center">更多 <i class="el-icon-arrow-right"></i> </div>
-        </div>
-<!--        <div class="hang_" v-for="(item,index) in 4" :key="index" >【到期提醒】百业兴智慧油站系统将于2024年07月10日到期...</div>-->
-        <div class="hang_" v-for="(item,index) in noticeList" :key="index" >【{{ item.notificationType }}】{{ item.templateContent }}</div>
-        <div class="hang_" v-if="this.noticeList.length==0">暂无通知</div>
-      </div>
-    </div>
-    <div class="b-bs">
-      <div class="left-box-t">
-        <div class="d-s">
-          <div class="h-tt" >数据看板</div>
-          <div class="q-anniu">近一周</div>
-          <div style="margin-right: 40px">
-            <el-date-picker
-              v-model="value1"
-              type="datetimerange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="getStoreAmount">
-            </el-date-picker>
-          </div>
-          <div style="margin-right: 40px">
-            <el-select v-model="value" clearable placeholder="请选择" @change="chooseDept()">
-              <el-option
-                v-for="item in options"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="d-s" style="margin-top: 15px">
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>活跃油站数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.storeTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>交易金额(万元)/交易笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.tradeAmount || 0 }}/{{ storeAmount.tradeTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>退款金额(元)/退款笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.refundAmount || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>笔均单价(元)</div>
-            </div>
-            <div class="num-size">{{ storeAmount.averagePrice || 0 }}</div>
-          </div>
-          <div class="k-box">
-            <div class="d-s" style="font-size: 12px;color: #999999;">
-              <div class="sian"></div>
-              <div>日均交易额(万元)/日均交易笔数</div>
-            </div>
-            <div class="num-size">{{ storeAmount.dayTradeAmount || 0 }}/{{ storeAmount.dayTradeTotal || 0 }}</div>
-          </div>
-        </div>
-        <div class="hui-hang"></div>
-        <div class="d-s" >
-          <div>
-            <div class="h-tt" >活跃油站</div>
-            <div id="ccc" style="width: 300px;height: 200px; "></div>
-          </div>
-          <div class="h-r-ba"></div>
-          <div>
-<!--            <div class="h-tt" >活跃油站</div>-->
-            <div class="d-s" style="justify-content: space-between">
-              <div id="cccc" style="width: 300px;height: 200px;margin-right: 50px"></div>
-              <div id="ccct" style="width: 300px;height: 200px;"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="right-box-t">
-        <div class="h-tt" >硬件设备</div>
-        <div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
-<!--          <div class="r-img">-->
-<!--            <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">-->
-<!--          </div>-->
-<!--          <div>容大(RT RONGTA)RP76II针式76mm小票打印机加油站二三联票据 RP76II/USB口</div>-->
-          <div class="r-img">
-            <img :src="imagePath + item.image" style="width: 84px;height: 70px">
-          </div>
-          <div>{{ item.name }}</div>
-        </div>
-      </div>
-    </div>
-    <div class="bottom_">
-      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
-      <div class="d-s">
-        <div class="anniu-h" :class="{ 'anniu-act': index == 0 }" v-for="(item,index) in timeList" :key="index">
-          {{item}}
-        </div>
-        <el-date-picker
-          v-model="value2"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-      <div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
-
-    </div>
-
-  </div>
-</template>
-
-<script>
-import echarts from "echarts";
-import {selectStoreAmount, storeAmountIndex, storeTotalIndex} from "@/api/indexBanner";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-import {parseTime} from "@/utils/fuint";
-import {getBannerListApi} from "@/api/sys/banner";
-import {getListApi} from "@/api/setting/hardware";
-import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
-export default {
-
-  props:["accountId"],
-  data(){
-    return{
-      form: {},
-      timeList:[
-        "今日",
-        "近一周",
-        "近一月",
-        "近一年",
-      ],
-
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: '',
-      value1: [],
-      value2: [],
-      imagePath: process.env.VUE_APP_SERVER_URL,
-      queryParams:{},
-      // 店铺数量
-      storeTotal:{},
-      // 店铺金额
-      storeAmount:{},
-      // banner图列表
-      bannerList:{},
-      storeList:[],
-      hardwareList:[],
-      noticeList:[]
-    }
-  },
-  created() {
-    let nowDate = new Date();
-    let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-    this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
-    this.getStoreTotal()
-    this.selectChildByDeptIdApi()
-    this.getStoreAmount()
-    this.selectBannerList()
-    let start = new Date();
-    start.setHours(0)
-    start.setMinutes(0)
-    start.setSeconds(0)
-    start.setMilliseconds(0)
-    this.value2 = [start,new Date()];
-    this.getStoreList()
-    this.getHardwareList()
-    this.getNoticeList()
-  },
-  mounted() {
-    // this.initChart()
-  },
-  methods:{
-    getNoticeList(){
-      getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
-        this.noticeList = res.data.records
-      })
-    },
-    getHardwareList(){
-      getListApi({page: 1, pageSize: 3,status:'1'}).then(res=>{
-        this.hardwareList = res.data.records;
-        this.hardwareList.forEach(item => {
-          if (item.image.includes(",")){
-            item.image = item.image.split(",")[0]
-          }
-        })
-      })
-    },
-    getStoreList(){
-      selectStoreAmount(this.addDateRange({},this.value2)).then(res => {
-        this.storeList = res.data
-        this.initChart()
-      })
-    },
-    // 选择机构信息
-    chooseDept(){
-      this.options.forEach(item => {
-        if (item.deptId == this.value){
-          this.queryParams.ancestors = item.ancestors
-        }
-      })
-      this.getStoreAmount()
-    },
-    selectBannerList(){
-      let queryParams = {
-        pageNo:1,
-        pageSize:10,
-        system_position:"系统首页"
-      }
-      getBannerListApi(queryParams).then(res=>{
-        this.bannerList = res.data.records
-      })
-    },
-    // 查询
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.options = res.data
-      })
-    },
-    getStoreTotal(){
-      storeTotalIndex().then(res => {
-        this.storeTotal = res.data
-      })
-    },
-    getStoreAmount(){
-      storeAmountIndex(this.addDateRange(this.queryParams,this.value1)).then(res => {
-        this.storeAmount = res.data
-        this.initChart()
-      })
-    },
-    countPercentage(upNum,downNum){
-      let percentage = 0;
-      percentage = (upNum / downNum)*100
-      return percentage.toFixed(2)
-    },
-    initChart() {
-      const chart = echarts.init(document.getElementById('ccc'))
-      const chart1 = echarts.init(document.getElementById('cccc'))
-      const chart2= echarts.init(document.getElementById('ccct'))
-      const chart3= echarts.init(document.getElementById('ctct'))
-
-      let dataList = []
-      let allTotal = 0
-      if (this.storeAmount.oilNameList) {
-        this.storeAmount.oilNameList.forEach(item => {
-          allTotal += item.countNum
-        })
-        this.storeAmount.oilNameList.forEach(item => {
-          let data = {value: 0, name: ""}
-          data.value = this.countPercentage(item.countNum, allTotal);
-          data.name = item.oilName + item.oilType + "占比"
-          dataList.push(data)
-        })
-      }
-
-      let storeNameList = []
-      let oilAmountList = []
-      let noOilAmountList = []
-      let rechargeBalanceList = []
-      let consumeBalanceList = []
-      let userBalanceList = []
-      if (this.storeList.length>0) {
-        this.storeList.forEach(item => {
-          storeNameList.push(item.storeName)
-          oilAmountList.push(item.oilAmount)
-          noOilAmountList.push(item.noOilAmount)
-          rechargeBalanceList.push(item.userRechargeBalance)
-          consumeBalanceList.push(item.userConsumeBalance)
-          userBalanceList.push(item.userBalance)
-        })
-      }
-
-      const option = {
-        color: [
-          '#b7f1e2',
-          '#fc7150',
-          '#fea500',
-          '#5facfe',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            roseType: 'area',
-            radius: [5, '80%'],
-            // data: [
-            //   { value: 36, name: '#98汽油占比' },
-            //   { value: 42, name: '0#柴油占比' },
-            //   { value: 40, name: '#95汽油占比' },
-            //   { value: 38, name: '#92柴油占比' },
-            //
-            //
-            // ],
-            data: dataList,
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                borderRadius: 8,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option1 = {
-        color: [
-          '#3B6ADE',
-          '#409eff',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: '80%',
-            data: [
-              // { value: 28, name: '28%' },
-              // { value: 72, name: '72%' },
-              { value: this.countPercentage(Number(this.storeAmount.oilNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.noOilNum)), name: "油品交易占比" },
-              { value: this.countPercentage(Number(this.storeAmount.noOilNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.noOilNum)), name: "非油品交易占比" },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      const option2 = {
-        color: [
-          '#46c2c4',
-          '#6e4dd8',
-          '#214790',
-          '#d55f5f',
-        ],
-        tooltip: {
-          trigger: 'item'
-        },
-
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: [50, '80%'],
-            data: [
-              // { value: 28, name: '会员充值占比' },
-              // { value: 72, name: '积分商城交易占比' },
-              // { value: 28, name: '油品交易占比' },
-              // { value: 72, name: '便利店交易占比' },
-              { value: this.countPercentage(Number(this.storeAmount.userNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '会员充值占比' },
-              { value: this.countPercentage(Number(this.storeAmount.integralNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '积分商城交易占比' },
-              { value: this.countPercentage(Number(this.storeAmount.oilNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '油品交易占比' },
-              { value: this.countPercentage(Number(this.storeAmount.goodNum),Number(this.storeAmount.oilNum)+Number(this.storeAmount.userNum)+Number(this.storeAmount.integralNum)+Number(this.storeAmount.goodNum)), name: '便利店交易占比' },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-
-      const option3 = {
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999'
-            }
-          }
-        },
-
-        legend: {
-          data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额']
-        },
-        xAxis: [
-          {
-            type: 'category',
-            // data: ['中建锦绣广场1站', '中建锦绣广场2站', '中建锦绣广场3站', '中建锦绣广场4站', '中建锦绣广场5站', '中建锦绣广场6站', '中建锦绣广场7站'],
-            data: storeNameList,
-            axisPointer: {
-              type: 'shadow'
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '金额(元)',
-            // min: 0,
-            // max: 10000,
-            // interval: 2000,
-            axisLabel: {
-              formatter: '{value}'
-            }
-          }
-          // {
-          //   type: 'value',
-          //   name: '',
-          //   min: 0,
-          //   max: 25,
-          //   interval: 5,
-          //   axisLabel: {
-          //     formatter: '{value} '
-          //   }
-          // }
-        ],
-        series: [
-          {
-            name: '油品交易额',
-            color: '#FF9655',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            barGap: '60%',
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: oilAmountList
-          },
-          {
-            name: '非油品交易额',
-            color: '#55F3FF',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: noOilAmountList
-          },
-          {
-            name: '会员充值金额',
-            color: '#0DC291',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: rechargeBalanceList
-          },
-          {
-            name: '会员消费金额',
-            color: '#409EFF',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
-            // ]
-            data: consumeBalanceList
-          },
-          {
-            name: '会员余额',
-            color: '#D55F5F',
-            type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value;
-              }
-            },
-            barWidth: 13,
-            itemStyle: {
-              normal: {
-                barBorderRadius: [50, 50, 0, 0]
-              }
-            },
-            // data: [
-            //   2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
-            // ]
-            data: userBalanceList
-          }
-        ],
-        grid: {
-          left: '3%',
-          right: '3%',
-          bottom: '3%',
-          containLabel: true
-        }
-      };
-
-      chart.setOption(option)
-      chart1.setOption(option1)
-      chart2.setOption(option2)
-      chart3.setOption(option3)
-
-
-    }
-
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-
-.app-container{
-  width: 100%;
-  height: 100%;
-  /* height: 100vh; */
-  background: #f4f5f9;
-}
-.d-s{
-  display: flex;
-  align-items: center;
-}
-.bannser{
-  width: 100%;
-  height: 230px;
-  border-radius: 8px;
-  overflow: hidden;
-  img{
-    width: 100%;
-    height: 100%;
-  }
-
-}
-.b-bs{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 20px;
-}
-.left-box{
-  width: 73%;
-  background: #FFFFFF;
-  border-radius: 10px 10px 10px 10px;
-  border: 1px solid #FFFFFF;
-  height: 192px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.left-box-t{
-  width: 73%;
-  box-sizing: border-box;
-  padding: 15px;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 380px;
-
-}
-.right-box{
-  width: 25%;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 192px;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.right-box-t{
-  width: 25%;
-  border-radius: 8px;
-  background: #fff;
-  border: 1px solid #FFFFFF;
-  height: 380px;
-  box-sizing: border-box;
-  padding: 15px;
-}
-.san-box{
-  width: 360px;
-  height: 150px;
-  box-sizing: border-box;
-  border-radius: 8px;
-  background: linear-gradient( 90deg, #70CAFD 0%, #02AAFE 100%);
-  margin: 15px 0px;
-  margin-right: 15px;
-  box-sizing: border-box;
-  padding: 20px 40px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.r-title{
-  font-weight: bold;
-  font-size: 42px;
-  color: #FFFFFF;
-  text-align: center;
-}
-.r-size{
-  font-size: 14px;
-  color: #FFFFFF;
-}
-.title_{
-  font-size: 16px;
-  color: #333333;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-.hang_{
-  width: 100%;
-  white-space: nowrap;   //不换行
-  overflow: hidden;       //超出部分隐藏
-  text-overflow: ellipsis;    //文本溢出显示省略号
-  font-size: 14px;
-  color: #777777;
-  margin: 14px auto;
-}
-.h-tt{
-  font-size: 16px;
-  color: #333333;
-  font-weight: bold;
-  margin-right: 40px;
-}
-.q-anniu{
-  width: 80px;
-  height: 26px;
-  background: #FF9655;
-  border-radius: 4px 4px 4px 4px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #fff;
-  cursor: pointer;
-  margin-right: 20px;
-}
-
-.k-box{
-  width: 215px;
-  height: 68px;
-  background: #FFFFFF;
-  border-radius: 8px;
-  border: 1px solid #e1e0e0;
-  box-sizing: border-box;
-  padding: 10px;
-  margin-right: 10px;
-}
-.num-size{
-  font-weight: bold;
-  font-size: 24px;
-  color: #555555;
-}
-.sian{
-  width: 6px;
-  height: 6px;
-  background: #2BBCFF;
-  border-radius: 50%;
-  margin-right: 5px;
-}
-.hui-hang{
-  width: 100%;
-  height: 5px;
-  background: #F4F5F9;
-  margin: 15px auto;
-}
-.h-r-ba{
-  height: 170px;
-  margin: 0px 50px;
-  width: 5px;
-  background: #f4f5f9;
-}
-.r-img{
-  width: 84px;
-  height: 70px;
-  margin-right: 20px;
-}
-.bottom_{
-  width: 100%;
-  border-radius: 10px;
-  background:  #fff;
-  box-sizing: border-box;
-  padding: 20px;
-  margin-top: 20px;
-}
-.anniu-h{
-  width: 80px;
-  height: 26px;
-  background: #FAFAFA;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #DDDDDD;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #777777;
-  margin-right: 20px;
-}
-.anniu-act{
-  background: #FF9655 !important;
-  border: 1px solid #FF9655 !important;
-  color: #fff;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/index.vue b/fuintAdmin_zt/src/views/index.vue
deleted file mode 100644
index e02bad474..000000000
--- a/fuintAdmin_zt/src/views/index.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="">
-<!--    代理-->
-    <agent v-if="power == 1" :accountId="accountId"></agent>
-<!--    连锁-->
-    <manage v-if="power == 2" :accountId="accountId"></manage>
-<!--    油站-->
-    <shopowner v-if="power == 3" :accountId="accountId"></shopowner>
-  </div>
-</template>
-
-<script>
-import agent from "@/views/homeComponents/agent.vue";
-import manage from "@/views/homeComponents/manage.vue"
-import shopowner from "@/views/homeComponents/shopowner.vue"
-import {getAccountInfo} from "@/api/indexBanner";
-export default {
-  data(){
-    return{
-      power:1,
-      accountId:"",
-    }
-  },
-  created() {
-    this.getInfo()
-  },
-  mounted() {
-  },
-  components:{
-    agent,manage,shopowner
-  },
-  methods:{
-    getInfo(){
-      getAccountInfo().then(res => {
-        if (res.data.deptType == 1 || res.data.deptType == 4){
-          this.power = 1
-        }else if (res.data.deptType == 2){
-          this.power = 2
-        }else if (res.data.deptType == 3){
-          this.power = 3
-        }
-        this.accountId = res.data.accountId
-      })
-    }
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-
-.app-container{
-  width: 100%;
-  height: 100%;
-  background: #f4f5f9;
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/indexBanner/imgUpload/imgUpload.vue b/fuintAdmin_zt/src/views/indexBanner/imgUpload/imgUpload.vue
deleted file mode 100644
index 95efb7dde..000000000
--- a/fuintAdmin_zt/src/views/indexBanner/imgUpload/imgUpload.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<template>
-  <div class="component-upload-image">
-    <el-upload
-      multiple
-      :action="uploadImgUrl"
-      list-type="picture-card"
-      :on-success="handleUploadSuccess"
-      :before-upload="handleBeforeUpload"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      ref="imageUpload"
-      :on-remove="handleDelete"
-      :show-file-list="true"
-      :headers="headers"
-      :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
-    >
-<!--      <div style="display: flex;height: 100%;">-->
-<!--        <img v-if="doorList!=[]"-->
-<!--          v-for="(item,index) in doorList"-->
-<!--          :src="item"-->
-<!--          style="display: block; max-width: 100%; margin: 0 auto;margin-right: 20px"-->
-<!--        />-->
-<!--      </div>-->
-<!--      <div v-else>-->
-        <img
-          v-if="dialogImageUrl"
-          :src="dialogImageUrl"
-          style="display: block; max-width: 100%; margin: 0 auto;height: 100%"
-        />
-        <i v-else class="el-icon-plus"></i>
-<!--      </div>-->
-    </el-upload>
-
-    <!-- 上传提示 -->
-    <div class="el-upload__tip" slot="tip" v-if="showTip">
-      请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
-      的文件
-    </div>
-
-<!--    <el-dialog-->
-<!--      :visible.sync="dialogVisible"-->
-<!--      title="预览"-->
-<!--      width="800"-->
-<!--      append-to-body-->
-<!--    >-->
-<!--      <img-->
-<!--        :src="dialogImageUrl"-->
-<!--        style="display: block; max-width: 100%; margin: 0 auto"-->
-<!--      />-->
-<!--    </el-dialog>-->
-  </div>
-</template>
-
-<script>
-import { getToken } from "@/utils/auth";
-
-export default {
-  props: {
-    value: [String, Object, Array],
-    // 图片数量限制
-    limit: {
-      type: Number,
-      default: 5,
-    },
-    // 大小限制(MB)
-    fileSize: {
-      type: Number,
-      default: 5,
-    },
-    // 文件类型, 例如['png', 'jpg', 'jpeg']
-    fileType: {
-      type: Array,
-      default: () => ["png", "jpg", "jpeg"],
-    },
-    // 是否显示提示
-    isShowTip: {
-      type: Boolean,
-      default: true
-    },
-    imgUrl:"",
-    doorUrl:"",
-  },
-  data() {
-    return {
-      number: 0,
-      uploadList: [],
-      dialogImageUrl: "",
-      dialogVisible: false,
-      hideUpload: false,
-      baseUrl:process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/backendApi/file/upload", // 上传的图片服务器地址
-      headers: {
-        "Access-Token" : getToken(),
-      },
-      fileList: [],
-      doorList:[],
-    };
-  },
-  watch: {
-    value: {
-      handler(val) {
-        if (val) {
-          // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
-          // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
-            if (typeof item === "string") {
-              item = { name: item, url: item };
-            }
-            return item;
-          });
-        } else {
-          this.fileList = [];
-          return [];
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  computed: {
-    // 是否显示提示
-    showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize);
-    },
-  },
-  created() {
-    // this.dialogImageUrl = this.baseUrl + this.imgUrl;
-    this.handlePictureCardPreview();
-  },
-  methods: {
-    // 上传前loading加载
-    handleBeforeUpload(file) {
-      let isImg = false;
-      if (this.fileType.length) {
-        let fileExtension = "";
-        if (file.name.lastIndexOf(".") > -1) {
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
-        }
-        isImg = this.fileType.some(type => {
-          if (file.type.indexOf(type) > -1) return true;
-          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
-          return false;
-        });
-      } else {
-        isImg = file.type.indexOf("image") > -1;
-      }
-
-      if (!isImg) {
-        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
-        return false;
-      }
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      this.$modal.loading("正在上传图片，请稍候...");
-      this.number++;
-    },
-    // 文件个数超出
-    handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
-    },
-    // 上传成功回调
-    handleUploadSuccess(res, file) {
-      if (res.code === 200) {
-        this.uploadList.push({ name: res.data.url, url: res.data.url });
-        this.uploadedSuccessfully();
-      } else {
-        this.number--;
-        this.$modal.closeLoading();
-        this.$modal.msgError(res.msg);
-        this.$refs.imageUpload.handleRemove(file);
-        this.uploadedSuccessfully();
-      }
-    },
-    // 删除图片
-    handleDelete(file) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if (findex > -1) {
-        this.fileList.splice(findex, 1);
-        this.$emit("input", this.listToString(this.fileList));
-      }
-    },
-    // 上传失败
-    handleUploadError() {
-      this.$modal.msgError("上传图片失败，请重试");
-      this.$modal.closeLoading();
-    },
-    // 上传结束处理
-    uploadedSuccessfully() {
-      if (this.number > 0 && this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
-        this.uploadList = [];
-        this.number = 0;
-        this.$emit("input", this.listToString(this.fileList));
-        this.$modal.closeLoading();
-      }
-    },
-    // 预览
-    handlePictureCardPreview(file) {
-      if (this.imgUrl){
-        if (this.imgUrl.includes("http")){
-          this.dialogImageUrl = this.imgUrl;
-        }else {
-          this.dialogImageUrl = this.baseUrl + this.imgUrl;
-        }
-      }else {
-        if (file!=undefined){
-          this.dialogImageUrl = file.url;
-        }else {
-          this.dialogImageUrl = ""
-        }
-      }
-      if (this.doorUrl != "" && this.doorUrl != undefined && this.doorUrl != []){
-        let list = JSON.parse(this.doorUrl)
-        list.forEach(item => {
-          let data = {name:"",url:""}
-          data.name = item.split("/")[item.split("/").length-1]
-          data.url = this.baseUrl + item
-          this.fileList.push(data)
-          // this.dialogImageUrl = this.baseUrl + item;
-          // this.doorList.push(this.baseUrl + item);
-        })
-      }else {
-        if (file!=undefined){
-          this.dialogImageUrl = file.url;
-        }
-      }
-      // this.dialogVisible = true;
-    },
-    // 对象转成指定字符串分隔
-    listToString(list, separator) {
-      let strs = "";
-      separator = separator || ",";
-      for (let i in list) {
-        if (list[i].url) {
-          strs += list[i].url.replace(this.baseUrl, "") + separator;
-        }
-      }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
-};
-</script>
-<style scoped lang="scss">
-// .el-upload--picture-card 控制加号部分
-::v-deep.hide .el-upload--picture-card {
-  display: none;
-}
-// 去掉动画效果
-::v-deep .el-list-enter-active,
-::v-deep .el-list-leave-active {
-  transition: all 0s;
-}
-
-::v-deep .el-list-enter, .el-list-leave-active {
-  opacity: 0;
-  transform: translateY(0);
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/indexBanner/index.vue b/fuintAdmin_zt/src/views/indexBanner/index.vue
deleted file mode 100644
index fa310f486..000000000
--- a/fuintAdmin_zt/src/views/indexBanner/index.vue
+++ /dev/null
@@ -1,282 +0,0 @@
-<template>
-  <div>
-    <el-card class="card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="店铺" prop="storeId">
-          <el-select v-model="queryParams.storeId" filterable placeholder="请选择店铺" clearable style="width: 100%">
-            <el-option v-for="item in storeList"
-                       :key="item.id" clearable
-                       :label="item.name" :value="item.id"
-                       @keyup.enter.native="handleQuery"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="路由" prop="routeUrl">
-          <el-input
-            v-model="queryParams.routeUrl"
-            placeholder="请输入路由地址"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-          <!--          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
-
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <el-card class="card">
-      <div>
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleAdd"
-        >新增配置</el-button>
-      </div>
-
-      <el-table ref="tables" v-loading="loading" :data="list">
-        <el-table-column label="ID" align="center" prop="id" width="80" />
-        <el-table-column label="店铺" align="center" prop="storeId" >
-          <template slot-scope="scope">
-            <span>{{scope.row.storeId ? storeName(storeList,scope.row.storeId) : "--"}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="轮播图" align="center" prop="bannerUrl"  >
-          <template slot-scope="scope">
-            <span v-if="!scope.row.bannerUrl">--</span>
-            <img class="imgBanner" v-else :src="getBannerUrl(scope.row.bannerUrl)">
-          </template>
-        </el-table-column>
-        <el-table-column label="路由地址" align="center" prop="routeUrl" />
-        <el-table-column label="备注" align="center" prop="remark" >
-          <template slot-scope="scope">
-            <span>{{scope.row.remark ? scope.row.remark : "--"}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row.id)"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-card>
-
-    <el-dialog
-      :title="title" width="35%"
-      :visible.sync="dialogVisible">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="店铺" prop="storeId">
-          <el-select v-model="form.storeId" filterable placeholder="请选择店铺" style="width: 100%">
-            <el-option v-for="item in storeList"
-                       :key="item.id"
-                       :label="item.name" :value="item.id+''"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="轮播图" prop="bannerUrl">
-          <imgUpload v-if="flag" :imgUrl="form.bannerUrl" :limit="1" @input="getImgUrl"></imgUpload>
-        </el-form-item>
-        <el-form-item label="路由地址" prop="routeUrl">
-          <el-input v-model="form.routeUrl" placeholder="请填写路由地址"></el-input>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="clear">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </span>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import {
-  addIndexBanner,
-  deleteIndexBanner,
-  indexBannerInfo,
-  listIndexBanner,
-  updateIndexBanner
-} from "@/api/indexBanner/indexBanner";
-import {ljStoreList} from "@/api/indexBanner/ljstore";
-import imgUpload from "@/views/indexBanner/imgUpload/imgUpload.vue"
-
-export default {
-  components: {imgUpload},
-  data(){
-    return{
-      queryParams:{
-        page:1,
-        pageSize:10,
-      },
-      list:[],
-      loading:false,
-      dialogVisible:false,
-      title:'',
-      total:0,
-      storeList:[],
-      baseUrl:process.env.VUE_APP_BASE_API,
-      form:{},
-      flag: false,
-      rules:{
-        storeId: [
-          { required: true, message: '请选择店铺', trigger: 'change' }
-        ],
-        bannerUrl: [
-          { required: true, message: '请插入活动图片', trigger: 'change' }
-        ],
-        routeUrl: [
-          { required: true, message: '请填写路由地址', trigger: 'change' }
-        ],
-      },
-    }
-  },
-  created() {
-    this.getList()
-    this.getStoreList()
-  },
-  methods:{
-    // 获取图片url地址
-    getImgUrl(val){
-      let list = val.split("/static")
-      this.form.bannerUrl = "/static"+list[list.length-1]
-    },
-    // 返回图片路径
-    getBannerUrl(url){
-      let imgurl = ""
-      if (url.includes("http")){
-        imgurl = url
-      }else {
-        imgurl = this.baseUrl + url
-      }
-      return imgurl;
-    },
-    // 获取店铺名称
-    storeName(list,id){
-      let name = ""
-      list.forEach(item => {
-        if (item.id == id){
-          name = item.name
-        }
-      })
-      return name;
-    },
-    // 获取所有店铺信息
-    getStoreList(){
-      ljStoreList().then(res => {
-        if (res.data){
-          this.storeList = res.data
-        }
-      })
-    },
-    // 获取列表信息
-    getList(){
-      listIndexBanner(this.queryParams).then(res => {
-        if (res.data){
-          this.list = res.data.records;
-          this.total = res.data.total;
-        }
-      })
-    },
-    // 新增轮播图配置信息
-    handleAdd(){
-      this.form = {}
-      this.title = "新增配置"
-      this.dialogVisible = true;
-      this.flag = true
-    },
-    // 修改轮播图配置信息
-    handleUpdate(id){
-      indexBannerInfo(id).then(res => {
-        if (res.data){
-          this.form = res.data
-          this.title = "修改配置"
-          this.dialogVisible = true;
-          this.flag = true
-        }
-      })
-    },
-    // 删除轮播图配置信息
-    handleDelete(row){
-      const name = this.storeName(this.storeList,row.storeId) || this.id;
-      this.$modal.confirm('是否确认删除"' + name + '"的路由配置信息？').then(function() {
-        return deleteIndexBanner(row.id);
-      }).then(() => {
-        this.queryParams.page = 1
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    // 提交信息
-    submitForm(){
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id){
-            updateIndexBanner(this.form).then(res => {
-              if (res.data==1){
-                this.$modal.msgSuccess("修改成功")
-                this.dialogVisible = false
-                this.flag = false
-                this.queryParams.page = 1
-                this.getList()
-                this.getStoreList()
-              }
-            })
-          }else {
-            addIndexBanner(this.form).then(res => {
-              if (res.data==1){
-                this.$modal.msgSuccess("添加成功")
-                this.dialogVisible = false
-                this.flag = false
-                this.getList()
-                this.getStoreList()
-              }else {
-                this.$modal.msgError("当前店铺已存在跳转此页面的路由信息")
-              }
-            })
-          }
-        }
-      })
-    },
-    // 取消按钮
-    clear(){
-      this.dialogVisible = false
-      this.flag = false
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .imgBanner{
-    width: 150px;
-    height: 100px;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/login.vue b/fuintAdmin_zt/src/views/login.vue
deleted file mode 100644
index 60d02d51e..000000000
--- a/fuintAdmin_zt/src/views/login.vue
+++ /dev/null
@@ -1,495 +0,0 @@
-<template>
-  <div class="login">
-    <div class="box-center">
-      <div class="box-left">
-<!--        <div class="bai-size">百业兴智慧加油站-中台</div>-->
-<!--        <div class="bact-box">-->
-<!--          <div class="sanhh">活动营销</div>-->
-<!--          <div class="sanhh">节省人力</div>-->
-<!--          <div class="sanhh">精准定位</div>-->
-<!--        </div>-->
-      </div>
-      <div class="box-right">
-        <div class="box-title">
-          <div style="margin-right: 15px;cursor: pointer " v-for="(item,index) in dlyzm" :key="index" @click="actindex = item.type " >
-            <div>{{item.text}}</div>
-            <div class="gangs" v-if="item.type == actindex " ></div>
-          </div>
-
-        </div>
-        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 0" >
-
-
-          <el-form-item prop="username">
-            <el-input
-              v-model="loginForm.username"
-              type="text"
-              auto-complete="off"
-              clearable
-              placeholder="账号"
-            >
-              <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="password">
-            <el-input
-              v-model="loginForm.password"
-              type="password"
-              auto-complete="off"
-              placeholder="密码"
-              clearable
-              @keyup.enter.native="handleLogin"
-            >
-              <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="captchaCode" v-if="captchaOnOff">
-            <div style="display: flex;align-items: center">
-
-              <div>
-                <el-input
-                  v-model="loginForm.captchaCode"
-                  auto-complete="off"
-                  placeholder="请输入验证码"
-                  style="width: 90%"
-                  clearable
-                  @keyup.enter.native="handleLogin"
-                >
-                  <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-                </el-input>
-              </div>
-              <div class="login-code">
-                <img :src="codeUrl" @click="getCodeimg" class="login-code-img"/>
-              </div>
-            </div>
-          </el-form-item>
-          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-          <el-form-item style="width:100%;">
-            <el-button
-              :loading="loading"
-              size="medium"
-              type="primary"
-              style="width:100%;line-height: 24px;font-size: 16px;"
-              @click.native.prevent="handleLogin"
-            >
-              <span v-if="!loading">立即登录</span>
-              <span v-else>登 录 中...</span>
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <!--        验证码-->
-
-        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 1" >
-
-          <el-form-item prop="username">
-            <el-input
-              v-model="loginForm.tel"
-              type="number"
-              auto-complete="off"
-              clearable
-              placeholder="手机号"
-            >
-              <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-
-<!--          <el-form-item prop="captchaCode" v-if="captchaOnOff">-->
-<!--            <div style="display: flex;align-items: center">-->
-
-<!--              <div>-->
-<!--                <el-input-->
-<!--                  v-model="loginForm.telcode"-->
-<!--                  auto-complete="off"-->
-<!--                  placeholder="请输入验证码"-->
-<!--                  style="width: 90%"-->
-<!--                  clearable-->
-<!--                  @keyup.enter.native="handleLogin"-->
-<!--                >-->
-<!--                  <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
-<!--                </el-input>-->
-<!--              </div>-->
-<!--              <div>-->
-<!--                <span class="anniulan" v-show="show" @click="getCodet" >获取验证码</span>-->
-<!--                <span style="cursor: pointer;color: #00aaff " v-show="!show" class="count">{{count}}s后重新获取</span>-->
-<!--              </div>-->
-
-<!--            </div>-->
-<!--          </el-form-item>-->
-          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-<!--          <el-form-item style="width:100%;">-->
-<!--            <el-button-->
-<!--              :loading="loading"-->
-<!--              size="medium"-->
-<!--              type="primary"-->
-<!--              style="width:100%;line-height: 24px;font-size: 16px;"-->
-<!--              @click.native.prevent="posttelcode()"-->
-<!--            >-->
-<!--              <span v-if="!loading">立即登录</span>-->
-<!--              <span v-else>登 录 中...</span>-->
-<!--            </el-button>-->
-<!--          </el-form-item>-->
-        </el-form>
-      </div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import  {getCodeImg, gettelcode, gettellogin,} from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-import BalanceRecharge from "@/views/member/balanceRecharge.vue";
-import {setToken} from "@/utils/auth";
-
-export default {
-  name: "Login",
-  components: {BalanceRecharge},
-  data() {
-    return {
-      show: true,
-      count: '',
-      timer: null,
-      dlyzm:[
-        {text:'登录',type:'0'},
-        // {text: "验证码",type:'1'}
-      ],
-      actindex:0,
-      codeUrl: "",
-      systemName : process.env.VUE_APP_TITLE,
-      loginForm: {
-        tel:null,
-        telcode:null,
-        username: "",
-        password: "",
-        rememberMe: false,
-        captchaCode: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        captchaCode: [{ required: true, trigger: "change", message: "请输入验证码" }, { min: 4, max: 6, message: '请输入验证码', trigger: 'blur' }]
-      },
-      loading: false,
-      // 验证码开关
-      captchaOnOff: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
-    };
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect;
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCodeimg();
-    this.getCookie();
-  },
-  methods: {
-
-    getCodet() {
-
-      // if(!this.loginForm.tel){
-      //   this.$message.error("手机号不能为空")
-      //   return
-      // }
-      //
-      // const TIME_COUNT = 60;
-      // if (!this.timer) {
-      //   this.count = TIME_COUNT;
-      //   this.show = false;
-      //   this.timer = setInterval(() => {
-      //     if (this.count > 0 && this.count <= TIME_COUNT) {
-      //       this.count--;
-      //     } else {
-      //       this.show = true;
-      //       clearInterval(this.timer);
-      //       this.timer = null;
-      //     }
-      //   }, 1000)
-      // }
-      // let data = {
-      //   mobile:this.loginForm.tel
-      // }
-      // gettelcode(data).then(res =>{
-      //   if(res.code == 200){
-      //     this.$message.success("操作成功")
-      //   }else{
-      //     this.$message.error("操作失败请稍后再试")
-      //   }
-      // })
-    },
-    getCodeimg() {
-      const app = this
-      getCodeImg().then(response => {
-        app.codeUrl = response.data.captcha
-        app.loginForm.uuid = response.data.uuid
-      })
-    },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
-        uuid: this.loginForm.uuid
-      };
-    },
-
-    posttelcode(){
-      const data = {
-        mobile:this.loginForm.tel,
-        code:this.loginForm.telcode
-      }
-      this.$store.dispatch("codeLogin", data).then(() => {
-        this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-        // this.$router.push({ path: "/Service/index" }).catch(()=>{});
-      }).catch(() => {
-        this.loading = false;
-
-      });
-
-    },
-    handleLogin() {
-      const app = this;
-      if (app.loading) {
-        return false;
-      }
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          app.loading = true;
-          if (app.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          app.$store.dispatch("Login", this.loginForm).then(() => {
-
-            if (sessionStorage.getItem('IS_BK_LOGIN')) {
-              const data = JSON.parse(Cookies.get("IS_BK_LOGIN"))
-              console.log("dataJSON",data)
-              location.replace(this.bkUrl+"resource_oilstore?token="+data.token);
-            }else {
-              app.$router.push({ path: "/Service/index" }).catch(()=>{});
-            }
-
-            app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-
-            // app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-            // app.$router.push({ path: "index" }).catch(()=>{});
-          }).catch(() => {
-            app.loading = false;
-            if (app.captchaOnOff) {
-              app.getCode();
-            }
-          });
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-.login {
-  height: 100vh;
-  width: 100%;
-  position: relative;
-  background-image: url("../assets/images/loin-back.png");
-  overflow: hidden;
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center;
-  .box-center{
-    width: 1000px;
-    height: 580px;
-    border-radius: 8px;
-    background: #FFFFFF;
-    box-shadow: 0px 4px 10px 0px rgba(20,61,129,0.1);
-    border-radius: 16px 16px 16px 16px;
-    opacity: 1;
-    margin: 150px auto;
-    overflow: hidden;
-    display: flex;
-
-  }
-  .gangs{
-    width: 100%;
-    height: 5px;
-    background: #00aaff;
-    border-radius: 50px;
-  }
-  .box-left{
-    width: 50%;
-    height: 100%;
-    background: #00aaff;
-    background-image: url("../assets/images/ztlogin.png");
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center;
-  }
-  .box-right{
-    width: 50%;
-    box-sizing: border-box;
-    padding: 80px;
-  }
-  .box-title{
-    width: 100%;
-    //text-align: center;
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .bai-size{
-    width: 100%;
-    text-align: center;
-    font-size: 40px;
-    font-weight: bold;
-    color: #FFFFFF;
-    margin-top: 65px;
-
-  }
-  .bact-box{
-    width: 85%;
-    margin: 15px auto;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 40px;
-
-  }
-  .sanhh{
-    width: 112px;
-    height: 34px;
-    background: linear-gradient(90deg, #E1EBFF 0%, #FFFFFF 100%);
-    border-radius: 2px 2px 2px 2px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 400;
-    color: #1755D0;
-  }
-
-  .login-main {
-    background-image: url("../assets/images/login-bg.png");
-    position: fixed;
-    left: 0;
-    right: 500px;
-    top: 0;
-    bottom: 0;
-    -webkit-transform: translateZ(0);
-    overflow: hidden;
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center;
-    .caption {
-      .caption-title {
-        font-size: 30px;
-        font-weight: bold;
-        line-height: 0px;
-      }
-      .caption-remark {
-        line-height: 0px;
-      }
-      background: rgba(0,0,0,.7);
-      color: #ffffff;
-      position: absolute;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      padding: 30px 50px;
-      font-size: 14px;
-      z-index: 20;
-      font-weight: 300;
-      min-width: 680px;
-    }
-  }
-  .login-form {
-    width: 500px;
-    height: 100%;
-    float: right;
-    padding: 80px 60px;
-    background: #FFF;
-    .title {
-      text-align: left;
-      font-size: 24px;
-      color: #707070;
-      padding: 20px 20px 40px 0px;
-      .logo {
-        height: 24px;
-        width: 24px;
-        vertical-align: middle;
-      }
-      .name {
-        margin-left: 5px;
-      }
-    }
-    .login-tip {
-      font-size: 13px;
-      text-align: center;
-      color: #bfbfbf;
-    }
-    .login-code {
-      width: 33%;
-      height: 38px;
-      float: right;
-      img {
-        cursor: pointer;
-        vertical-align: middle;
-      }
-    }
-    .login-code-img {
-      height: 45px;
-    }
-    .el-input {
-      height: 45px;
-      input {
-        height: 45px;
-      }
-    }
-    .input-icon {
-      height: 45px;
-      width: 14px;
-      margin-left: 2px;
-    }
-    .copy-right {
-      color: #888888;
-      text-align: center;
-      font-size: 12px;
-      .link {
-        color: #ff5b57;
-        font-weight: bold;
-      }
-    }
-  }
-}
-.anniulan{
-  width: 100px;
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  //border: 1px solid #00aaff;
-  border-radius: 6px;
-  color: #00aaff;
-  cursor: pointer;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/member/balanceRecharge.vue b/fuintAdmin_zt/src/views/member/balanceRecharge.vue
deleted file mode 100644
index 61a8edf27..000000000
--- a/fuintAdmin_zt/src/views/member/balanceRecharge.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <!-- 充值对话框 -->
-  <el-dialog class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="会员信息：">
-            <span>{{ memberInfo.name }}（ID:{{ memberInfo.id }}）</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="可用余额：" prop="balance">
-            <span>￥{{ memberInfo.balance.toFixed(2) }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="变更类型：" prop="type">
-            <el-radio-group v-model="form.type">
-              <el-radio key="1" label="1" value="1">增加</el-radio>
-              <el-radio key="2" label="2" value="2">扣减</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="变更金额：" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入变更金额" style="width: 200px" maxlength="100" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item class="recharge-item" prop="remark" label="备注信息：">
-            <el-input v-model="form.remark" type="textarea" rows="2" placeholder="请输入备注信息" maxlength="255" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { doRecharge } from "@/api/balance";
-import { getMemberInfo } from "@/api/member";
-export default {
-  name: "balanceRecharge",
-  props: {
-    showDialog:{
-      type:[Boolean],
-      default:()=>false
-    },
-    userId:{
-      type:[String],
-      default:()=> ''
-    }
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      memberInfo: { name: '', id: '', balance: 0 },
-      // 表单参数
-      form: { type: '1', amount: '', userId: '' },
-      // 表单校验
-      rules: {
-        userId: [
-          { required: true, message: "请选择会员", trigger: "blur" },
-        ],
-        amount: [
-          { required: true, message: "金额不能为空", trigger: "blur" },
-          { min: 1, max: 6, message: '请在1至99999元范围内输入', trigger: 'blur' },
-          { pattern: /((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/, message: `请输入正确的金额`, trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  watch: {
-    showDialog(value) {
-      if (value) {
-          this.getMemberInfo()
-      }
-    }
-  },
-  methods: {
-    // 查询会员信息
-    getMemberInfo() {
-      this.loading = true;
-      getMemberInfo(this.userId).then(response => {
-          this.form.userId = response.data.memberInfo.id;
-          this.memberInfo = response.data.memberInfo;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.$emit('closeDialog','balance');
-    },
-    // 充值表单
-    reset() {
-      this.form.userId = '';
-      this.form.type = '1';
-      this.form.amount = '';
-      this.form.remark = '';
-      this.memberInfo = { name: '', id: '', balance: 0 };
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            doRecharge(this.form).then(response => {
-               this.$alert("余额操作成功！");
-               this.$emit('closeDialog','balance');
-               this.reset();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/member/index.vue b/fuintAdmin_zt/src/views/member/index.vue
deleted file mode 100644
index 0a32e9f21..000000000
--- a/fuintAdmin_zt/src/views/member/index.vue
+++ /dev/null
@@ -1,538 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员号" prop="userNo">
-        <el-input
-          v-model="queryParams.userNo"
-          placeholder="请输入会员号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入会员名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员等级" prop="gradeId">
-        <el-select
-          v-model="queryParams.gradeId"
-          clearable
-          placeholder="会员等级"
-        >
-          <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="注册时间">
-        <el-date-picker
-          v-model="queryParams.startTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width:200px"
-          placeholder="开始时间"
-        ></el-date-picker>
-        <span class="sp"> ~ </span>
-        <el-date-picker
-          v-model="queryParams.endTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width:200px"
-          placeholder="结束时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="storeIds">
-        <el-select v-model="storeIds" multiple filterable clearable placeholder="请选择店铺" style="width: 100%;">
-          <el-option
-            v-for="item in storeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['member:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="会员ID" prop="id" min-width="70"/>
-      <el-table-column label="头像" align="center" width="80">
-        <template slot-scope="scope">
-            <img v-if="scope.row.avatar" class="list-avatar" :src="scope.row.avatar">
-            <img v-else class="list-avatar" src="@/assets/images/avatar.png">
-        </template>
-      </el-table-column>
-      <el-table-column label="会员号" prop="userNo" width="150"/>
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="手机号" align="center" prop="mobile" width="100">
-        <template slot-scope="scope">
-          <span>{{ scope.row.mobile ? scope.row.mobile : '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员等级" align="center" prop="gradeId" width="80">
-        <template slot-scope="scope">
-          <span>{{ scope.row.gradeId ? getName(userGradeList, scope.row.gradeId) : '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="所属店铺" align="center" prop="storeId" width="120">
-        <template slot-scope="scope">
-          <span>{{ scope.row.storeId ? scope.row.storeName: '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="余额" align="center" prop="balance">
-        <template slot-scope="scope">
-          <div><span style="color:red;">{{ scope.row.balance ? scope.row.balance.toFixed(2) : '0.00' }}</span></div>
-          <el-button
-            class="mini-btn"
-            type="primary"
-            size="mini"
-            @click="handleBalance(scope.row.id)"
-            v-hasPermi="['balance:modify']"
-          >充值</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="积分" align="center" prop="point">
-        <template slot-scope="scope">
-          <div><span>{{ scope.row.point ? scope.row.point : '0.00' }}</span></div>
-          <el-button
-            class="mini-btn"
-            type="primary"
-            size="mini"
-            @click="handlePoint(scope.row.id)"
-            v-hasPermi="['point:modify']"
-          >变更</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="注册时间" align="center" width="160" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="活跃时间" align="center" width="160" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="120" fixed='right'>
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['member:add']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['member:add']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="会员名称" prop="name" style="width: 420px">
-              <el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="会员等级" prop="gradeId">
-                <el-select
-                  v-model="form.gradeId"
-                  placeholder="会员等级"
-                  style="width: 300px"
-                >
-                  <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
-                </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="有效期限">
-              <el-date-picker
-                v-model="form.startTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime"
-                placeholder="开始时间"
-              ></el-date-picker>
-              <span class="sp"> 至 </span>
-              <el-date-picker
-                v-model="form.endTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime"
-                placeholder="结束时间"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="会员号" prop="userNo">
-              <el-input v-model="form.userNo" placeholder="请输入会员号，为空系统将自动分配" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="性别" prop="sex">
-              <el-radio-group v-model="form.sex">
-                <el-radio :key="1" :label="1" :value="1">男</el-radio>
-                <el-radio :key="0" :label="0" :value="0">女</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="身份证号" prop="idcard">
-              <el-input v-model="form.idcard" placeholder="请输入身份证号" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="生日" prop="birthday">
-              <el-input v-model="form.birthday" placeholder="请输入生日，格式如：1990-01-01" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="通讯地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入通讯地址" maxlength="100"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="会员状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">正常</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row v-if="form.id">
-          <el-col :span="24">
-            <el-form-item label="注册来源">
-              <el-radio-group v-model="form.source">
-                <el-radio label="" v-if="!form.source">未知</el-radio>
-                <el-radio label="wechat_login" v-if="form.source == 'wechat_login'">微信小程序</el-radio>
-                <el-radio label="wechat_mp" v-if="form.source == 'wechat_mp'">微信公众号</el-radio>
-                <el-radio label="backend_add" v-if="form.source == 'backend_add'">后台添加</el-radio>
-                <el-radio label="register_by_account" v-if="form.source == 'register_by_account'">H5注册</el-radio>
-                <el-radio label="mobile_login" v-if="form.source == 'mobile_login'">手机号登录注册</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 余额充值对话框 -->
-    <balanceRecharge :showDialog="openBalance" :userId="userId" @closeDialog="closeDialog" @close="closeDialog"/>
-
-    <!-- 积分充值对话框 -->
-    <pointRecharge :showDialog="openPoint" :userId="userId" @closeDialog="closeDialog" @close="closeDialog"/>
-  </div>
-</template>
-
-<script>
-import { getMemberList, updateMemberStatus, getMemberInfo, saveMember, deleteMember } from "@/api/member";
-import balanceRecharge from "./balanceRecharge";
-import pointRecharge from "./pointRecharge";
-export default {
-  name: "MemberIndex",
-  components: { balanceRecharge, pointRecharge },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 会员等级列表
-      userGradeList: [],
-      // 店铺列表
-      storeList: [],
-      storeIds: [],
-      // 是否显示修改对话框
-      open: false,
-      // 当前操作用户
-      userId: '',
-      // 是否弹层充值
-      openBalance: false,
-      // 是否弹层积分
-      openPoint: false,
-      // 日期范围
-      dateRange: [],
-      // 默认排序
-      defaultSort: {prop: 'updateTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', name: '', gradeId: '', mobile: '', userNo: '', startTime: '', endTime: '', sex: 1, idcard: '', birthday: '', address: '', status: "A", description: '' },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        id: '',
-        userNo: '',
-        name: '',
-        gradeId: '',
-        status: '',
-        storeIds: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "会员名称不能为空", trigger: "blur" },
-          { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
-        ],
-        gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      this.queryParams.storeIds = this.storeIds ? this.storeIds.join(",") : '';
-      getMemberList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.userGradeList = response.data.userGradeList;
-          this.storeList = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.queryParams.storeIds = '';
-      this.storeIds = [];
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
-        return updateMemberStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 余额充值操作
-    handleBalance(userId) {
-       this.openBalance = true;
-       this.userId = userId.toString();
-    },
-    // 积分变更操作
-    handlePoint(userId) {
-       this.openPoint = true
-       this.userId = userId.toString();
-    },
-    // 关闭对话框
-    closeDialog(dialog) {
-      console.log('closeDialog');
-      if (dialog == 'balance') {
-          this.openBalance = false;
-      }
-      if (dialog == 'point') {
-          this.openPoint = false;
-      }
-      this.userId = "";
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增会员";
-    },
-    // 表单重置
-    reset() {
-      this.resetForm("form");
-      this.form.id = '';
-      this.form.description = '';
-      this.form.name = '';
-      this.form.startTime = '';
-      this.form.endTime = '';
-      this.form.gradeId = '';
-      this.form.userNo = '';
-      this.form.mobile = '';
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveMember(this.form).then(response => {
-                this.$modal.msgSuccess("修改会员成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveMember(this.form).then(response => {
-                this.$modal.msgSuccess("新增会员成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getMemberInfo(id).then(response => {
-        this.form = response.data.memberInfo;
-        this.open = true;
-        this.title = "编辑会员";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.name
-      this.$modal.confirm('确定删除"' + name + '"的会员信息？').then(function() {
-        return deleteMember(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/member/pointRecharge.vue b/fuintAdmin_zt/src/views/member/pointRecharge.vue
deleted file mode 100644
index aba41f934..000000000
--- a/fuintAdmin_zt/src/views/member/pointRecharge.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <!-- 积分变更对话框 -->
-  <el-dialog title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="会员信息：">
-            <span>{{ memberInfo.name }}（ID:{{ memberInfo.id }}）</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="可用积分：" prop="balance">
-            <span>￥{{ memberInfo.point }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="变更类型：" prop="type">
-            <el-radio-group v-model="form.type">
-              <el-radio key="1" label="1" value="1">增加</el-radio>
-              <el-radio key="2" label="2" value="2">扣减</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="变更数量：" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入变更数量" style="width: 200px" maxlength="100" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item class="recharge-item" prop="remark" label="备注信息：">
-            <el-input v-model="form.remark" type="textarea" rows="2" placeholder="请输入备注信息" maxlength="255" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { doRecharge } from "@/api/point";
-import { getMemberInfo } from "@/api/member";
-export default {
-  name: "pointRecharge",
-  props: {
-    showDialog:{
-      type:[Boolean],
-      default:()=>false
-    },
-    userId:{
-      type:[String],
-      default:()=> ''
-    }
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      memberInfo: { name: '', id: '', point: 0 },
-      // 表单参数
-      form: { type: '1', amount: '', userId: '' },
-      // 表单校验
-      rules: {
-        userId: [
-          { required: true, message: "请选择会员", trigger: "blur" },
-        ],
-        amount: [
-          { required: true, message: "金额不能为空", trigger: "blur" },
-          { pattern: /^[0-9]{1,10}$/, message: `请输入1-10位数字`, trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  watch: {
-    showDialog(value) {
-      if (value) {
-          this.getMemberInfo()
-      }
-    }
-  },
-  methods: {
-    // 查询会员信息
-    getMemberInfo() {
-      this.loading = true;
-      getMemberInfo(this.userId).then(response => {
-          this.form.userId = response.data.memberInfo.id;
-          this.memberInfo = response.data.memberInfo;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.$emit('closeDialog','point');
-    },
-    // 充值表单
-    reset() {
-      this.form.userId = '';
-      this.form.type = '1';
-      this.form.amount = '';
-      this.form.remark = '';
-      this.memberInfo = { name: '', id: '', point: 0 };
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            doRecharge(this.form).then(response => {
-               this.$alert("积分操作成功！");
-               this.$emit('closeDialog','point');
-               this.reset();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/member/setting.vue b/fuintAdmin_zt/src/views/member/setting.vue
deleted file mode 100644
index 356ecf2fd..000000000
--- a/fuintAdmin_zt/src/views/member/setting.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-      <el-form ref="form" :model="form" :rules="rules" label-width="200px" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="领券是否需要手机号" prop="getCouponNeedPhone">
-              <el-select v-model="form.getCouponNeedPhone" placeholder="领券是否需要手机号">
-                <el-option key="true" label="是" value="true"/>
-                <el-option key="false" label="否" value="false"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="提交订单是否需要手机号" prop="submitOrderNeedPhone">
-              <el-select v-model="form.submitOrderNeedPhone" placeholder="提交订单是否需要手机号">
-                <el-option key="true" label="是" value="true"/>
-                <el-option key="false" label="否" value="false"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="登录是否需要手机号" prop="loginNeedPhone">
-              <el-select v-model="form.loginNeedPhone" placeholder="提交订单是否需要手机号">
-                <el-option key="true" label="是" value="true"/>
-                <el-option key="false" label="否" value="false"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getMemberSetting, saveSetting } from "@/api/member";
-export default {
-  name: "MemberSetting",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 表单参数
-      form: { getCouponNeedPhone: "false", submitOrderNeedPhone: "false", loginNeedPhone: "false" },
-      // 表单校验
-      rules: {
-        getCouponNeedPhone: [
-          { required: true, message: "请选择", trigger: "blur" },
-        ],
-        submitOrderNeedPhone: [
-          { required: true, message: "请选择", trigger: "blur" },
-        ],
-        loginNeedPhone: [
-          { required: true, message: "请选择", trigger: "blur" },
-        ],
-      }
-    };
-  },
-  created() {
-    this.getSettingInfo();
-  },
-  methods: {
-    // 查询配置
-    getSettingInfo() {
-      this.loading = true;
-      getMemberSetting().then(response => {
-          this.form = response.data;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push('/')
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveSetting(this.form).then(response => {
-              this.$modal.msgSuccess("保存成功");
-              this.getSettingInfo();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/merchant/index.vue b/fuintAdmin_zt/src/views/merchant/index.vue
deleted file mode 100644
index 34c01e295..000000000
--- a/fuintAdmin_zt/src/views/merchant/index.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="商户号" prop="no">
-        <el-input
-          v-model="queryParams.no"
-          placeholder="请输入商户号"
-          clearable
-          style="width: 150px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商户名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入商户名称"
-          clearable
-          style="width: 200px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 120px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['merchant:index']"
-        >新增商户</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id"  width="55"/>
-      <el-table-column label="商户号" align="center" prop="no" />
-      <el-table-column label="商户名称" align="center" prop="name" />
-      <el-table-column label="联系人" align="center" prop="contact"/>
-      <el-table-column label="手机号" align="center" prop="phone"/>
-      <el-table-column label="地址" align="center" prop="address"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-      <template slot-scope="scope">
-        <el-switch
-          v-model="scope.row.status"
-          active-value="A"
-          inactive-value="N"
-          @change="handleStatusChange(scope.row)"
-        ></el-switch>
-      </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['merchant:index']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['merchant:index']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="商户号" prop="no">
-              <el-input v-model="form.no" placeholder="请输入商户号，5-30个字符，未输入则系统自动生成" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="商户类型" prop="type">
-              <el-select class="input" v-model="form.type" clearable placeholder="请选择商户类型" style="width: 300px">
-                <el-option
-                  v-for="item in typeOptions"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
-                ></el-option>
-              </el-select>
-              <div class="form-tips">提示：选择适合的行业</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="商户名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入商户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="9">
-            <el-form-item label="商户logo" prop="logo">
-              <el-upload
-                :action="uploadAction"
-                list-type="picture-card"
-                :class="{hide:hideUpload}"
-                :file-list="uploadFiles"
-                :auto-upload="true"
-                :show-file-list="false"
-                :headers="uploadHeader"
-                :on-success="handleUploadSuccess">
-                <img
-                  v-if="form.logo"
-                  :src="imagePath + form.logo"
-                  class="list-img"
-                />
-                <i v-if="!form.logo" class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改）</p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model="form.contact" placeholder="请输入联系人姓名" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="联系电话" prop="contactPhone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="联系地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入联系地址" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="微信小程序appId" prop="wxAppId">
-              <el-input v-model="form.wxAppId" placeholder="请输入微信小程序appId，30-50个字符" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="微信小程序appSecret" prop="wxAppSecret">
-              <el-input v-model="form.wxAppSecret" placeholder="请输入微信小程序appSecret，30-50个字符" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="微信公众号appId" prop="wxOfficialAppId">
-              <el-input v-model="form.wxOfficialAppId" placeholder="请输入微信小程序appId，30-50个字符" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="微信公众号appSecret" prop="wxOfficialAppSecret">
-              <el-input v-model="form.wxOfficialAppSecret" placeholder="请输入微信小程序appSecret，30-50个字符" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { getMerchantList, updateMerchantStatus, getMerchantInfo, saveMerchant } from "@/api/merchant";
-export default {
-  name: "MerchantList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 商户类型
-      typeOptions: [],
-      // 表单参数
-      form: { id: '', name: '', no: '', logo: '', contact: '', phone: '', wxAppId: '', wxAppSecret: '', wxOfficialAppId: '', wxOfficialAppSecret: '', description: '', status: "A" },
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      uploadHeader: { 'Access-Token' : getToken() },
-      // 图片根目录
-      imagePath: "",
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        no: '',
-        name: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        type: [
-          { required: true, message: "商户号不能为空", trigger: "blur" },
-        ],
-        no: [
-          { required: true, message: "商户号不能为空", trigger: "blur" },
-          { min: 5, max: 30, message: '商户号长度必须介于5至30之间', trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: "商户名称不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '商户名称长度必须介于 2 和 50 之间', trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询日志
-    getList() {
-      this.loading = true;
-      getMerchantList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.data.dataList.content;
-          this.total = response.data.dataList.totalElements;
-          this.imagePath = response.data.imagePath;
-          this.typeOptions = response.data.typeList;
-          this.loading = false;
-      });
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "1" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"商户吗？').then(function() {
-         return updateMerchantStatus(row.id, row.status);
-      }).then(() => {
-         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-         row.status = row.status === "A" ? "A" : "D";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
-      this.multiple = !selection.length;
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增商户";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        no: "",
-        name: "",
-        logo: "",
-        license: "",
-        wxAppId: "",
-        wxAppSecret: "",
-        wxOfficialAppId: "",
-        wxOfficialAppSecret: "",
-        description: "",
-        status: "A"
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveMerchant(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveMerchant(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      const app = this;
-      app.reset();
-      const id = row.id || this.ids;
-      getMerchantInfo(id).then(response => {
-        app.form = response.data.merchantInfo;
-        app.open = true;
-        app.title = "编辑商户";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.name || this.id;
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return updateMerchantStatus(row.id, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleUploadSuccess(file) {
-      this.form.logo = file.data.fileName;
-    }
-  }
-};
-</script>
-<style scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/oilPrice/index.vue b/fuintAdmin_zt/src/views/oilPrice/index.vue
deleted file mode 100644
index 681f17048..000000000
--- a/fuintAdmin_zt/src/views/oilPrice/index.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-<template>
-    <div class="app-container">
-      <el-card  style="margin-bottom: 20px">
-        <div slot="header" class="clearfix">
-          <span>油价配置</span>
-        </div>
-        <el-button type="primary">新增油号</el-button>
-        <div class="top-box">
-<!--              循环-->
-          <div class="oil-box" v-for="(item,index) in 9 " :key="index" >
-            <div class="top-icon">
-              <div>启用</div>
-            </div>
-            <div class="box-icon"><i class="el-icon-edit" style="color:#409EFF; "></i></div>
-            <div class="box-title"> 汽油 92# </div>
-            <div class="between-box">
-              <div>油站价:</div>
-              <div><span class="jiacu">7.28元</span> /L</div>
-            </div>
-            <div class="between-box">
-              <div>国标价:</div>
-              <div> <span class="jiacu">7.28元</span>  /L</div>
-            </div>
-            <div class="between-box">
-              <div>最后更新时间:</div>
-              <div> 2023-07-18 17:55:02 </div>
-            </div>
-          </div>
-        </div>
-      </el-card>
-      <el-card  style="margin-bottom: 20px">
-        <div slot="header" class="clearfix">
-          <span>预设油价记录</span>
-        </div>
-        <el-button type="success">新增预设油价</el-button>
-        <div class="table-box">
-        <el-table
-          :data="tableData"
-          style="width: auto">
-          <el-table-column
-            prop="date"
-            label="日期"
-            width="300">
-          </el-table-column>
-          <el-table-column label="配送信息" style="width: 100%">
-            <el-table-column
-              prop="name"
-              label="姓名"
-              width="120">
-            </el-table-column>
-            <el-table-column label="地址">
-              <el-table-column
-                prop="province"
-                label="省份"
-                width="120">
-              </el-table-column>
-              <el-table-column
-                prop="city"
-                label="市区"
-                width="120">
-              </el-table-column>
-              <el-table-column
-                prop="address"
-                label="地址"
-                width="300">
-              </el-table-column>
-              <el-table-column
-                prop="zip"
-                label="邮编"
-                width="120">
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
-        </el-table>
-        </div>
-
-      </el-card>
-    </div>
-</template>
-
-<script>
-  export default {
-    name: 'index',
-    data() {
-      return {
-        tableData: [{
-          date: '2016-05-03',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-08',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-06',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-07',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }]
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .app-container{
-    width: 100%;
-
-    background: #f6f8f9;
-  }
-  .top-box{
-    width: 100%;
-    box-sizing: border-box;
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-  }
-  .clearfix:before,
-  .clearfix:after {
-    display: table;
-    content: "";
-  }
-  .clearfix:after {
-    clear: both
-  }
-  .oil-box{
-    width: 24%;
-    box-sizing: border-box;
-    padding: 15px;
-    background: #f9f9f9;
-    border-radius: 8px;
-    margin-right: 15px;
-    margin-top: 10px;
-    font-size: 14px;
-    position: relative;
-    overflow: hidden;
-
-  }
-  .between-box{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 10px auto;
-  }
-  .box-icon{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    cursor: pointer;
-  }
-  .box-title{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 18px;
-    font-weight: bold;
-  }
-  .jiacu{
-    font-weight: bold;
-  }
-  .top-icon{
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    background-color: #e1ecfc;
-    padding: 3px 7px;
-    color: #409eff;
-    font-size: 13px;
-    border-bottom-right-radius: 6px;
-  }
-  .table-box{
-    width: 100%;
-    margin: 20px auto;
-  }
-</style>
diff --git a/fuintAdmin_zt/src/views/openGift/index.vue b/fuintAdmin_zt/src/views/openGift/index.vue
deleted file mode 100644
index d81af4203..000000000
--- a/fuintAdmin_zt/src/views/openGift/index.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="卡券ID" prop="couponId">
-        <el-input
-          v-model="queryParams.couponId"
-          placeholder="请输入卡券ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员等级" prop="gradeId">
-        <el-select
-          v-model="queryParams.gradeId"
-          clearable
-          placeholder="会员等级"
-        >
-          <el-option v-for="grade in userGradeList" :key="grade.id" :label="grade.name" :value="grade.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['openGift:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="55"/>
-      <el-table-column label="会员等级" align="center" prop="gradeInfo.name" />
-      <el-table-column label="赠送卡券" align="center" prop="couponInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.couponInfo">
-              <span>{{ scope.row.couponInfo.name }}</span>
-          </span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="卡券数量" align="center" prop="couponNum" />
-      <el-table-column label="赠送积分" align="center" prop="point">
-         <template slot-scope="scope">
-             <span v-if="scope.row.point > 0">{{ scope.row.point }}</span>
-             <span v-else>无</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.createTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.updateTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['openGift:add']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['openGift:add']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="会员等级" prop="gradeId">
-              <el-select
-                v-model="form.gradeId"
-                style="width: 240px"
-                placeholder="会员等级"
-              >
-                <el-option v-for="grade in userGradeList" :key="grade.id" :label="grade.name" :value="grade.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券ID" prop="couponId">
-              <el-input v-model="form.couponId" placeholder="请输入要赠送的卡券ID" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="卡券数量" prop="couponNum">
-              <el-input v-model="form.couponNum" placeholder="请输入要赠送的卡券数量" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="积分数量" prop="point">
-              <el-input v-model="form.point" placeholder="请输入赠送积分数量"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getOpenGiftList, updateOpenGiftStatus, getOpenGiftInfo, saveOpenGift, deleteOpenGift } from "@/api/openGift";
-export default {
-  name: "OpenGiftIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 会员等级列表
-      userGradeList: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', gradeId: '', couponId: '', couponNum: '', point: '', status: "A" },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        couponId: '',
-        gradeId: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        gradeId: [
-          { required: true, message: "会员等级不能为空", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getOpenGiftList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.userGradeList = response.data.userGradeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + 'ID等于' + row.id + '的数据项吗？').then(function() {
-        return updateOpenGiftStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增开卡赠礼";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        gradeId: "",
-        couponId: "",
-        couponNum: "",
-        point: ""
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveOpenGift(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveOpenGift(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getOpenGiftInfo(id).then(response => {
-        this.form.id = response.data.openGiftInfo.id;
-        if (response.data.openGiftInfo.gradeInfo) {
-            this.form.gradeId = response.data.openGiftInfo.gradeInfo.id
-        }
-        if (response.data.openGiftInfo.couponInfo) {
-            this.form.couponId = response.data.openGiftInfo.couponInfo.id;
-            this.form.couponNum = response.data.openGiftInfo.couponNum;
-        }
-        this.form.point = response.data.openGiftInfo.point;
-        this.open = true;
-        this.title = "编辑开卡赠礼";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除ID等于' + row.id + '的数据项？').then(function() {
-        return deleteOpenGift(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/order/detail.vue b/fuintAdmin_zt/src/views/order/detail.vue
deleted file mode 100644
index 6b8d3091e..000000000
--- a/fuintAdmin_zt/src/views/order/detail.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-        <div class="panel">
-            <div class="title">基础信息</div>
-            <div class="content">
-                <el-row class="row">
-                    <el-col :span="8">
-                        <span class="head">订单号：</span>
-                        <span class="control-label">{{ orderInfo.orderSn }}</span>
-                    </el-col>
-                    <el-col :span="8">
-                      <span class="head">总金额：</span>
-                      <span class="control-label">￥{{ orderInfo.amount }}</span>
-                    </el-col>
-                    <el-col :span="8">
-                        <span class="head">订单状态：</span>
-                        <span class="control-label normal-status">{{ orderInfo.statusText }}</span>
-                    </el-col>
-                </el-row>
-                <el-row class="row">
-                    <el-col :span="8">
-                      <span class="head">订单类型：</span>
-                      <span class="control-label">{{ orderInfo.typeName }}</span>
-                    </el-col>
-                    <el-col :span="8">
-                        <span class="head">订单时间：</span>
-                        <span class="control-label">{{ orderInfo.createTime }}</span>
-                    </el-col>
-                    <el-col :span="8">
-                        <span class="head">备注信息：</span>
-                        <span class="control-text">{{ orderInfo.remark ? orderInfo.remark : '暂无'}}</span>
-                    </el-col>
-                </el-row>
-            </div>
-        </div>
-        <div class="panel">
-          <div class="title">支付信息</div>
-          <div class="content">
-            <el-row class="row">
-              <el-col :span="8">
-                <span class="head">支付金额：</span>
-                <span class="control-label">￥{{ orderInfo.payAmount.toFixed(2) }}</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">支付状态：</span>
-                <span class="control-label payed-status" v-if="orderInfo.payStatus == 'B'">{{ getName(payStatusList, orderInfo.payStatus) }}</span>
-                <span class="control-label normal-status" v-else>{{ getName(payStatusList, orderInfo.payStatus) }}</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">减免金额：</span>
-                <span class="control-label">￥{{ orderInfo.discount.toFixed(2) }}</span>
-              </el-col>
-            </el-row>
-            <el-row class="row">
-              <el-col :span="8">
-                <span class="head">支付方式：</span>
-                <span class="control-label">{{ getName(payTypeList, orderInfo.payType) }}</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">支付时间：</span>
-                <span class="control-label">{{ orderInfo.payTime ? orderInfo.payTime : '--' }}</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">使用卡券：</span>
-                <span class="control-label">{{ orderInfo.couponInfo ? '￥' + orderInfo.couponInfo.amount + '（' + orderInfo.couponInfo.name + '）' : '--' }}</span>
-              </el-col>
-            </el-row>
-            <el-row class="row">
-              <el-col :span="8">
-                <span class="head">使用积分：</span>
-                <span class="control-label">{{ orderInfo.usePoint ? orderInfo.usePoint : 0 }}</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">积分金额：</span>
-                <span class="control-label">￥{{ orderInfo.pointAmount.toFixed(2) }}</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">配送费用：</span>
-                <span class="control-label">￥{{ orderInfo.deliveryFee.toFixed(2) }}</span>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-        <div class="panel">
-          <div class="title">会员信息</div>
-          <div class="content">
-            <el-row class="row">
-              <el-col :span="8">
-                <span class="head">会员ID：</span>
-                <span class="control-label" v-if="orderInfo.userInfo && orderInfo.isVisitor == 'N'">{{ orderInfo.userInfo.id }}</span>
-                <span class="control-label" v-else>游客</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">会员名称：</span>
-                <span class="control-label" v-if="orderInfo.userInfo && orderInfo.isVisitor == 'N'">{{ orderInfo.userInfo.name }}</span>
-                <span class="control-label" v-else>游客<span v-if="orderInfo.userInfo">（管理员{{ orderInfo.userInfo.name }}代下单）</span></span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">手机号：</span>
-                <span class="control-label">{{ orderInfo.userInfo.mobile ? orderInfo.userInfo.mobile : '无' }}</span>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-        <div class="panel">
-            <div class="title">商品信息</div>
-            <div class="content">
-              <el-table ref="tables" v-loading="loading" :data="orderInfo.goods">
-                  <el-table-column label="商品ID" prop="id" width="66"/>
-                  <el-table-column label="图片" align="center" prop="name">
-                    <template slot-scope="scope">
-                      <img class="goods-logo" :src="scope.row.image"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="名称" align="left" prop="name">
-                     <template slot-scope="scope">
-                        <span class="goods-name">{{ scope.row.name }}</span>
-                     </template>
-                  </el-table-column>
-                  <el-table-column label="规格" align="center">
-                    <template slot-scope="scope">
-                       <span v-if="scope.row.specList">
-                          <span class="spec-item" v-for="spec in scope.row.specList">{{ spec.specValue }}</span>
-                       </span>
-                       <span v-else>--</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="价格" align="center" prop="price" />
-                  <el-table-column label="优惠金额" align="center" prop="discount" />
-                  <el-table-column label="数量" align="center" prop="num" />
-              </el-table>
-            </div>
-        </div>
-
-        <div class="panel" v-if="orderInfo.type=='goods'">
-          <div class="title">配送信息</div>
-          <div class="content">
-            <el-row class="row">
-              <el-col :span="8">
-                <span class="head">配送方式：</span>
-                <span class="control-label" v-if="orderInfo.orderMode == 'oneself'">门店自提</span>
-                <span class="control-label" v-else>物流配送</span>
-              </el-col>
-              <el-col :span="16" v-if="orderInfo.orderMode == 'oneself'">
-                <span class="head">自提地址：</span>
-                <span class="control-label">{{orderInfo.storeInfo.name}} {{orderInfo.storeInfo.phone}} {{orderInfo.storeInfo.address}}</span>
-              </el-col>
-              <el-col :span="8" v-if="orderInfo.orderMode == 'express' && orderInfo.address">
-                <span class="head">收货人：</span>
-                <span class="control-label">{{ orderInfo.address.name ? orderInfo.address.name : '--' }}</span>
-              </el-col>
-              <el-col :span="8" v-if="orderInfo.orderMode == 'express' && orderInfo.address">
-                <span class="head">联系电话：</span>
-                <span class="control-label">{{ orderInfo.address.mobile ? orderInfo.address.mobile : '无' }}</span>
-              </el-col>
-            </el-row>
-            <el-row class="row">
-              <el-col :span="24" v-if="orderInfo.orderMode == 'express' && orderInfo.address">
-                <span class="head">详细地址：</span>
-                <span class="control-label">{{orderInfo.address.provinceName}}{{orderInfo.address.cityName}}{{orderInfo.address.provinceName}}{{orderInfo.address.regionName}}{{orderInfo.address.detail}}</span>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-        <div class="panel" v-if="orderInfo.expressInfo">
-          <div class="title">物流信息</div>
-          <div class="content">
-            <el-row class="row">
-              <el-col :span="8">
-                <span class="head">物流公司：</span>
-                <span class="control-label" v-if="orderInfo.expressInfo.expressCompany">{{ orderInfo.expressInfo.expressCompany }}</span>
-                <span class="control-label" v-else>--</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">物流单号：</span>
-                <span class="control-label" v-if="orderInfo.expressInfo.expressNo">{{ orderInfo.expressInfo.expressNo }}</span>
-                <span class="control-label" v-else>--</span>
-              </el-col>
-              <el-col :span="8">
-                <span class="head">发货时间：</span>
-                <span class="control-label">{{orderInfo.expressInfo.expressTime}}</span>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-    </div>
-  </div>
-</template>
-
-<script>
-import { getOrderInfo } from "@/api/order";
-export default {
-  name: "OrderDetail",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      payTypeList: [],
-      payStatusList: [],
-      orderInfo: { payAmount: 0, discount: 0, pointAmount: 0, userInfo: {} }
-    };
-  },
-  created() {
-     const orderId = this.$route.query.orderId ? this.$route.query.orderId : ''
-     this.getOrderInfo(orderId)
-  },
-  activated() {
-     const orderId = this.$route.query.orderId ? this.$route.query.orderId : ''
-     this.getOrderInfo(orderId)
-  },
-  methods: {
-    // 查询配置
-    getOrderInfo(orderId) {
-      this.loading = true;
-      getOrderInfo(orderId).then(response => {
-          this.orderInfo = response.data.orderInfo;
-          this.payTypeList = response.data.payTypeList
-          this.payStatusList = response.data.payStatusList
-          this.loading = false;
-        }
-      );
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-    .main-panel {
-         margin: 0px;
-         padding: 5px;
-        .panel {
-            border: solid 1px #cccccc;
-            min-height: 100px;
-            border-radius: 2px;
-            margin-top: 10px;
-            .title {
-               font-weight: bold;
-               margin-top: 10px;
-               margin-left: 5px;
-               padding-left: 5px;
-               color: #333333;
-               border-left: 5px solid rgb(254,106,0);
-            }
-           .content {
-              padding: 20px;
-              .goods-logo {
-                 width: 45px;
-                 height: 45px;
-                 border: solid 1px #cccccc;
-              }
-             .spec-item {
-                 color: #666666;
-                 background: #ffffff;
-                 border: #666666 solid 1px;
-                 border-radius: 20px;
-                 padding: 2px 8px 2px 8px;
-                 margin-right: 5px;
-             }
-              .row {
-                min-height: 40px;
-                verticle-align: middle;
-                display: flex;
-                line-height: 40px;
-                .payed-status {
-                    color: #52c41a;
-                    background: #f6ffed;
-                    border: #b7eb8f solid 1px;
-                    border-radius: 20px;
-                    padding: 5px 8px 2px 8px;
-                    font-size: 90%;
-                }
-                .normal-status {
-                    color: #666666;
-                    background: #ffffff;
-                    border: #666666 solid 1px;
-                    border-radius: 20px;
-                    padding: 5px 8px 2px 8px;
-                    font-size: 90%;
-                }
-              }
-              .head {
-                 color: rgb(164,164,164);
-                 min-width: 120px;
-                 text-align: right;
-                 display: block;
-                 float: left;
-              }
-             .control-text {
-               display: block;
-               background: #f5f5f5;
-               border-radius: 10px;
-               margin-left: 120px;
-               margin-top: 5px;
-               line-height: 22px;
-               padding: 5px 10px 5px 10px;
-             }
-           }
-        }
-    }
-</style>
diff --git a/fuintAdmin_zt/src/views/order/index.vue b/fuintAdmin_zt/src/views/order/index.vue
deleted file mode 100644
index 9bb5b5724..000000000
--- a/fuintAdmin_zt/src/views/order/index.vue
+++ /dev/null
@@ -1,772 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="name">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单号" prop="orderSn">
-        <el-input
-          v-model="queryParams.orderSn"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          clearable
-          placeholder="订单类型"
-        >
-          <el-option v-for="orderType in typeList" :key="orderType.key" :label="orderType.name" :value="orderType.value"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="storeIds">
-        <el-select v-model="storeIds" multiple filterable clearable placeholder="请选择店铺" style="width: 100%;">
-          <el-option
-            v-for="item in storeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="订单状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择订单状态"
-          clearable
-        >
-          <el-option v-for="statusItem in statusList" :key="statusItem.key+''" :label="statusItem.name" :value="statusItem.key+''"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="支付状态" prop="payStatus">
-        <el-select
-          v-model="queryParams.payStatus"
-          placeholder="支付状态"
-          clearable
-        >
-          <el-option v-for="statusItem in payStatusList" :key="statusItem.key+''" :label="statusItem.name" :value="statusItem.key+''"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="配送方式">
-        <el-select
-          v-model="queryParams.orderMode"
-          placeholder="配送方式"
-          clearable
-        >
-          <el-option v-for="item in orderModeList" :key="item.key+''" :label="item.name" :value="item.key+''"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="下单时间">
-        <el-date-picker
-          v-model="queryParams.startTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width:190px"
-          placeholder="开始时间"
-        ></el-date-picker>
-        <span class="sp"> ~ </span>
-        <el-date-picker
-          v-model="queryParams.endTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width:190px"
-          placeholder="结束时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="订单ID" prop="id" min-width="80"/>
-      <el-table-column label="订单号"  align="center" width="200" prop="orderSn">
-        <template slot-scope="scope">
-          <span @click="handleView(scope.row)" style="color: #00afff;cursor: pointer;">{{ scope.row.orderSn }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="orderInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo && scope.row.isVisitor == 'N'">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>游客</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单类型" align="center" prop="typeName">
-         <template slot-scope="scope">
-             <span>{{ scope.row.typeName }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="所属店铺" align="center" width="140" prop="storeInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeInfo">{{ scope.row.storeInfo.name }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="总金额" align="center" prop="amount">
-        <template slot-scope="scope">
-          <span v-if="true">{{ scope.row.amount.toFixed(2) }}</span>
-          <span v-else>0.00</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付状态" align="center" width="80" prop="payStatus">
-        <template slot-scope="scope">
-          <span v-if="scope.row.payStatus == 'B'" class="status-active">{{ getName(payStatusList, scope.row.payStatus) }}</span>
-          <span v-else class="status-disabled">{{ getName(payStatusList, scope.row.payStatus) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单状态" align="center" width="80" prop="status">
-        <template slot-scope="scope">
-          <span class="status-normal">{{ getName(statusList, scope.row.status) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="配送方式" align="center" prop="orderMode">
-        <template slot-scope="scope">
-          <span>{{ getName(orderModeList, scope.row.orderMode) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="生成时间" align="center" width="130" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.createTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付金额" align="center" prop="payAmount">
-        <template slot-scope="scope">
-          <span v-if="true">{{ scope.row.payAmount.toFixed(2) }}</span>
-          <span v-else>0.00</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="优惠金额" align="center" prop="discount">
-        <template slot-scope="scope">
-          <span v-if="true">{{ scope.row.discount.toFixed(2) }}</span>
-          <span v-else>0.00</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="积分金额" align="center" prop="pointAmount">
-        <template slot-scope="scope">
-          <span v-if="true">{{ scope.row.pointAmount.toFixed(2) }}</span>
-          <span v-else>0.00</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" width="130" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.updateTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="left" width="130" fixed='right'>
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-hasPermi="['order:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-if="scope.row.orderMode == 'express'"
-            size="mini"
-            type="text"
-            v-hasPermi="['order:edit']"
-            @click="handleExpress(scope.row)"
-          >发货</el-button>
-          <el-button
-            v-if="scope.row.orderMode == 'oneself'"
-            type="text"
-            size="mini"
-            :disabled="scope.row.isVerify == true"
-            @click="handleVerify(scope.row)"
-            v-hasPermi="['order:edit']"
-          >核销</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['order:edit', 'order:delete']">
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleView" icon="el-icon-view" v-hasPermi="['order:index']">查看详情</el-dropdown-item>
-              <el-dropdown-item command="handlePrint" icon="el-icon-notebook-2" v-hasPermi="['order:index']">打印小票</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.payStatus == 'B'" command="handleRefund" icon="el-icon-s-order" v-hasPermi="['order:index']">立即退款</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.payStatus != 'B'" command="handleDelete" icon="el-icon-remove" v-hasPermi="['order:delete']">删除订单</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 修改对话框 start-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn">
-              <el-input v-model="form.orderSn" placeholder="订单号" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="form.orderMode && form.orderMode.length > 0">
-          <el-col :span="24">
-            <el-form-item label="订单模式" prop="orderMode">
-              <el-select v-model="form.orderMode" placeholder="订单模式">
-                <el-option v-for="item in orderModeList" :key="item.key+''" :label="item.name" :value="item.key+''"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单总金额" prop="amount">
-              <el-input v-model="form.amount" placeholder="请输入订单总金额" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="优惠金额" prop="discount">
-              <el-input v-model="form.discount" placeholder="请输入优惠金额" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入订单备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单状态">
-                <el-select v-model="form.status" placeholder="订单状态">
-                  <el-option v-for="statusItem in statusList" :key="statusItem.key+''" :label="statusItem.name" :value="statusItem.key+''"/>
-                </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 修改对话框 end-->
-
-    <!-- 核销对话框 start-->
-    <el-dialog title="核销订单" :visible.sync="openVerify" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="vForm" :model="vForm" :rules="vFormRules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn">
-              <el-input v-model="vForm.orderSn" placeholder="订单号" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="核销码" prop="verifyCode">
-              <el-input v-model="vForm.verifyCode" placeholder="请输入订单核销码，从会员端的订单详情获取" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单备注" prop="remark">
-              <el-input v-model="vForm.remark" type="textarea" placeholder="请输入订单备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitVForm">确定核销</el-button>
-        <el-button @click="cancelVForm">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 核销对话框 end-->
-
-    <!-- 发货对话框 start-->
-    <el-dialog title="填写物流信息" :visible.sync="openExpress" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="eForm" :model="eForm" :rules="eFormRules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn">
-              <el-input v-model="eForm.orderSn" placeholder="订单号" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="物流公司" prop="expressCompany">
-              <el-input v-model="eForm.expressCompany" placeholder="请输入物流公司" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="物流单号" prop="expressNo">
-              <el-input v-model="eForm.expressNo" placeholder="请输入物流单号"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitEForm">提交物流信息</el-button>
-        <el-button @click="cancelEForm">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 核销对话框 end-->
-
-    <!--打印订单对话框 start-->
-    <orderPrintDialog :show-dialog="openOrderPrintDialog" :storeInfo="storeInfo" :orderInfo="orderInfo" @closeDialog="closePrintDialog"/>
-    <!--打印订单对话框 end-->
-
-    <!-- 退款对话框 start -->
-    <el-dialog title="订单退款" :visible.sync="openRefundDialog" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="rForm" :model="rForm" :rules="rFormRules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn" style="width:450px;">
-              <el-input v-model="rForm.orderSn" placeholder="订单号" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="支付方式" prop="payType" style="width:450px;">
-              <el-input v-model="rForm.payType" placeholder="支付方式" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="实付金额" prop="payAmount" style="width:450px;">
-              <el-input v-model="'￥' + rForm.payAmount" placeholder="订单实付金额" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="退款金额" prop="refundAmount" style="width:450px;">
-              <el-input v-model="rForm.refundAmount" placeholder="请输入退款金额"></el-input>
-              <div class="form-tips">( 提示：单位元 )</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="退款备注" prop="remark">
-              <el-input v-model="rForm.remark" type="textarea" placeholder="请输入退款备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitRForm">确 定</el-button>
-        <el-button @click="cancelRForm">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 退款对话框 end -->
-  </div>
-</template>
-
-<script>
-import { getName } from "@/utils/fuint";
-import { getOrderList, updateOrderStatus, getOrderInfo, saveOrder, deleteOrder, verifyOrder, delivered } from "@/api/order";
-import { doRefund } from "@/api/refund";
-import orderPrintDialog from '../cashier/components/orderPrintDialog'
-export default {
-  name: "OrderIndex",
-  components: {
-    orderPrintDialog
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 店铺列表
-      storeList: [],
-      // 所属店铺
-      storeIds: [],
-      // 订单类型
-      typeList: [],
-      // 订单状态列表
-      statusList: [],
-      // 订单支付状态列表
-      payStatusList: [],
-      // 配送类型列表
-      orderModeList: [],
-      // 支付类型
-      payTypeList: [],
-      // 是否显示弹出层
-      open: false,
-      // 是否显示核销对话框
-      openVerify: false,
-      // 是否显示发货对话框
-      openExpress: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 打印订单对话框
-      openOrderPrintDialog: false,
-      // 退款对话框
-      openRefundDialog: false,
-      storeInfo: {},
-      orderInfo: {},
-      // 表单参数
-      form: { orderId: "", orderSn: 0, amount: "", orderMode: "oneself", discount: "", remark: "", status: "A" },
-      vForm: { orderId: "", orderSn: "", remark: "", verifyCode: "" },
-      eForm: { orderId: "", orderSn: "", expressCompany: "", expressNo: "" },
-      rForm: { orderId: "", orderSn: "", payType: '', payAmount: "", refundAmount: "", remark: ""},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        userId: '',
-        mobile: '',
-        status: '',
-        payStatus: '',
-        orderMode: '',
-        orderSn: '',
-        storeIds: ''
-      },
-      // 表单校验
-      rules: {
-        amount: [
-          { required: true, message: "总金额不能为空", trigger: "blur" },
-        ]
-      },
-      // 核销表单校验
-      vFormRules: {
-        verifyCode: [
-          { required: true, message: "核销码不能为空", trigger: "blur" },
-        ]
-      },
-      eFormRules: {
-        expressCompany: [
-          { required: true, message: "物流公司不能为空", trigger: "blur" },
-        ],
-        expressNo: [
-          { required: true, message: "物流单号不能为空", trigger: "blur" },
-        ]
-      },
-      rFormRules: {
-        refundAmount: [
-          { required: true, message: "退款金额不能为空", trigger: "blur" },
-          { pattern: /((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/, message: `请输入正确的退款金额`, trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询订单
-    getList() {
-      const app = this;
-      app.loading = true;
-      app.queryParams.storeIds = app.storeIds ? app.storeIds.join(",") : '';
-      getOrderList(app.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.typeList = response.data.typeList;
-          this.statusList = response.data.statusList;
-          this.payStatusList = response.data.payStatusList;
-          this.orderModeList = response.data.orderModeList;
-          this.payTypeList = response.data.payTypeList;
-          this.storeList = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams.status = '';
-      this.queryParams.mobile = '';
-      this.queryParams.orderMode = '';
-      this.queryParams.orderSn = '';
-      this.queryParams.storeIds = '';
-      this.storeIds = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.orderSn + '"吗？').then(function() {
-        return updateOrderStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        orderId: "",
-        orderSn: "",
-        status: "A",
-        amount: "",
-        discount: "",
-        remark: "",
-        orderMode: "oneself",
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消核销按钮
-    cancelVForm() {
-      this.openVerify = false;
-      this.vForm.orderId = '';
-      this.vForm.orderSn = '';
-      this.vForm.verifyCode = '';
-    },
-    // 提交核销按钮
-    submitVForm: function() {
-      this.$refs["vForm"].validate(valid => {
-        if (valid) {
-            verifyOrder(this.vForm).then(response => {
-              this.$modal.msgSuccess("核销成功！");
-              this.cancelVForm();
-              this.getList();
-            });
-        }
-      });
-    },
-    // 提交修改按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveOrder(this.form).then(response => {
-               this.$modal.msgSuccess("修改成功！");
-               this.open = false;
-               this.getList();
-            });
-        }
-      });
-    },
-    // 查看详情按钮操作
-    handleView(row) {
-      this.$router.push( { path: '/order/detail?orderId=' + row.id } )
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      const app = this;
-      app.reset();
-      const id = row.id || this.ids;
-      getOrderInfo(id).then(response => {
-        let orderInfo = response.data.orderInfo;
-        if (orderInfo) {
-            app.form.orderId = orderInfo.id;
-            app.form.orderSn = orderInfo.orderSn;
-            app.form.amount = orderInfo.amount;
-            app.form.discount = orderInfo.discount;
-            app.form.remark = orderInfo.remark;
-            app.form.status = orderInfo.status;
-            app.form.orderMode = orderInfo.orderMode+"";
-        }
-        this.open = true;
-        this.title = "修改订单";
-      });
-    },
-    // 核销按钮操作
-    handleVerify(row) {
-      const app = this;
-      const id = row.id || this.ids;
-      getOrderInfo(id).then(response => {
-        let orderInfo = response.data.orderInfo;
-        if (orderInfo) {
-            app.vForm.orderId = orderInfo.id;
-            app.vForm.orderSn = orderInfo.orderSn;
-            app.vForm.remark = orderInfo.remark;
-        }
-        app.openVerify = true;
-      });
-    },
-    // 发货按钮
-    handleExpress(row) {
-      const app = this;
-      const id = row.id || this.ids;
-      getOrderInfo(id).then(response => {
-        let orderInfo = response.data.orderInfo;
-        if (orderInfo) {
-            app.eForm.orderId = orderInfo.id;
-            app.eForm.orderSn = orderInfo.orderSn;
-            app.eForm.expressNo = orderInfo.expressInfo ? orderInfo.expressInfo.expressNo : "";
-            app.eForm.expressCompany = orderInfo.expressInfo? orderInfo.expressInfo.expressCompany : "";
-        }
-        app.openExpress = true;
-      });
-    },
-    // 取消发货按钮
-    cancelEForm() {
-      this.openExpress = false;
-      this.eForm.orderId = '';
-      this.eForm.orderSn = '';
-      this.eForm.expressCompany = '';
-      this.eForm.expressNo = '';
-    },
-    // 提交发货按钮
-    submitEForm: function() {
-      const app = this;
-      if (app.loading) {
-          app.$modal.msgError("请求处理中...");
-      }
-      app.$refs["eForm"].validate(valid => {
-        if (valid) {
-          app.loading = true;
-          delivered(this.eForm).then(response => {
-              app.$modal.msgSuccess("提交物流信息成功！");
-              app.cancelEForm();
-              app.getList();
-              app.loading = false;
-          });
-        }
-      });
-    },
-    // 取消退款按钮
-    cancelRForm() {
-      this.openRefundDialog = false;
-      this.rForm.orderId = '';
-      this.rForm.orderSn = '';
-      this.rForm.payAmount = '';
-      this.rForm.payType = '';
-      this.rForm.refundAmount = '';
-      this.rForm.remark = '';
-    },
-    // 提交退款按钮
-    submitRForm: function() {
-      const app = this;
-      if (app.loading) {
-          app.$modal.msgError("请求处理中...");
-      }
-      if (parseFloat(app.rForm.refundAmount) > parseFloat(app.rForm.amount)) {
-          app.$modal.msgError("退款金额不能大于订单总金额！");
-          return false;
-      }
-      app.$refs["rForm"].validate(valid => {
-        if (valid) {
-            app.loading = true;
-            doRefund(app.rForm).then(response => {
-                app.$modal.msgSuccess("提交退款成功！");
-                app.cancelRForm();
-                app.getList();
-                app.loading = false;
-            });
-        }
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.orderSn
-      this.$modal.confirm('是否确认删除订单号为"' + name + '"的数据项？').then(function() {
-        return deleteOrder(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    // 打印小票
-    handlePrint(row) {
-      const app = this;
-      app.orderInfo = {};
-      app.storeInfo = {};
-      const id = row.id || this.ids;
-      getOrderInfo(id).then(response => {
-        let orderInfo = response.data.orderInfo;
-        if (orderInfo) {
-            app.orderInfo = orderInfo;
-            app.storeInfo = orderInfo.storeInfo;
-        }
-        app.openOrderPrintDialog = true;
-      });
-    },
-    // 退款
-    handleRefund(row) {
-      const app = this;
-      app.rForm.orderId = row.id;
-      app.rForm.orderSn = row.orderSn;
-      app.rForm.payAmount = row.payAmount;
-      app.rForm.payType = getName(app.payTypeList, row.payType);
-      app.openRefundDialog = true;
-    },
-    // 关掉打印对话框
-    closePrintDialog() {
-      this.openOrderPrintDialog = false;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleDelete":
-          this.handleDelete(row);
-          break;
-        case "handlePrint":
-          this.handlePrint(row);
-          break;
-        case "handleRefund":
-          this.handleRefund(row);
-          break;
-        default:
-          this.handleView(row);
-          break;
-      }
-    },
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/order/setting.vue b/fuintAdmin_zt/src/views/order/setting.vue
deleted file mode 100644
index 65d625b6b..000000000
--- a/fuintAdmin_zt/src/views/order/setting.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-      <el-form ref="form" class="content" :model="form" :rules="rules" label-width="200px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item" prop="isClose" label="关闭系统交易功能">
-              <el-radio-group v-model="form.isClose">
-                <el-radio key="false" label="false" value="false">否</el-radio>
-                <el-radio key="true" label="true" value="true">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item" prop="deliveryFee" label="每笔订单配送费用">
-              <el-input v-model="form.deliveryFee" placeholder="每笔订单配送费用，单位：元" maxlength="10" />
-              <span class="tips">单位：元</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getSettingInfo, saveSetting } from "@/api/order";
-
-export default {
-  name: "OrderSetting",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 表单参数
-      form: { deliveryFee: '', isClose: 'false' },
-      // 表单校验
-      rules: {
-        deliveryFee: [
-          { required: true, message: "请输入", trigger: "blur" },
-          { min: 0, max: 4, message: `请输入1000以内数字`, trigger: 'blur' }
-        ],
-        isClose: [
-          { required: true, message: "请输入", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getSettingInfo();
-  },
-  activated() {
-    this.getSettingInfo();
-  },
-  methods: {
-    // 查询账户列表
-    getSettingInfo() {
-      this.loading = true;
-      getSettingInfo(this.queryParams).then(response => {
-          this.form.deliveryFee = response.data.deliveryFee;
-          this.form.isClose = response.data.isClose;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push( { path: '/point/list' } );
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveSetting(this.form).then(response => {
-              this.$modal.msgSuccess("保存成功");
-              this.getSettingInfo();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-.main-panel {
-  .content {
-    margin-left: 50px;
-    margin-top: 30px;
-  }
-  .footer {
-    margin-top: 10px;
-    margin-left: 250px;
-  }
-  .tips {
-    font-size: 12px;
-    color: #888888;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/point/list.vue b/fuintAdmin_zt/src/views/point/list.vue
deleted file mode 100644
index 1ea09ca60..000000000
--- a/fuintAdmin_zt/src/views/point/list.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="有效" value="A"/>
-          <el-option key="N" label="无效" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="80"/>
-      <el-table-column label="会员ID" align="center" prop="userId" />
-      <el-table-column label="手机号" align="center" prop="userInfo.mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.mobile">{{ scope.row.userInfo.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="userInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.name">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="变动数量" align="center" prop="amount">
-         <template slot-scope="scope">
-             <span v-if="scope.row.amount > 0" style="color:forestgreen">+{{ scope.row.amount }}</span>
-             <span v-else style="color:red">{{ scope.row.amount }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-        <template slot-scope="scope">
-          <span v-if="scope.row.description">{{ scope.row.description }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.operator">{{ scope.row.operator }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getPointList } from "@/api/point";
-export default {
-  name: "PointList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        orderSn: '',
-        status: ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getPointList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/point/setting.vue b/fuintAdmin_zt/src/views/point/setting.vue
deleted file mode 100644
index f0515ae57..000000000
--- a/fuintAdmin_zt/src/views/point/setting.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="main-panel">
-      <el-form ref="form" class="content" :model="form" :rules="rules" label-width="200px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item" prop="pointNeedConsume" label="返1积分所需消费金额">
-              <el-input v-model="form.pointNeedConsume" placeholder="返1积分所需消费金额" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item" prop="canUsedAsMoney" label="积分是否可当作现金使用">
-              <el-radio-group v-model="form.canUsedAsMoney">
-                <el-radio key="true" label="true" value="true">是</el-radio>
-                <el-radio key="false" label="false" value="false">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item" prop="exchangeNeedPoint" label="多少积分可抵扣1元现金">
-              <el-input v-model="form.exchangeNeedPoint" placeholder="多少积分可抵扣1元现金" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item class="recharge-item" prop="rechargePointSpeed" label="充值返积分倍数">
-              <el-input v-model="form.rechargePointSpeed" placeholder="充值返积分倍数" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getSettingInfo, saveSetting } from "@/api/point";
-
-export default {
-  name: "PointSetting",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 表单参数
-      form: { pointNeedConsume: '', canUsedAsMoney: 'false', exchangeNeedPoint: '', rechargePointSpeed: '', status: 'A' },
-      // 表单校验
-      rules: {
-        pointNeedConsume: [
-          { required: true, message: "请输入", trigger: "blur" },
-          { pattern: /^[1-9]*[1-9][0-9]*$/ , message: `必须大于0的数字`, trigger: 'blur' }
-        ],
-        canUsedAsMoney: [
-          { required: true, message: "请输入", trigger: "blur" }
-        ],
-        exchangeNeedPoint: [
-          { required: true, message: "请输入", trigger: "blur" },
-          { pattern: /^[1-9]*[1-9][0-9]*$/ , message: `必须大于0的数字`, trigger: 'blur' }
-        ],
-        rechargePointSpeed: [
-          { required: true, message: "请输入", trigger: "blur" },
-          { pattern: /^[1-9]*[1-9][0-9]*$/ , message: `必须大于0的数字`, trigger: 'blur' }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getSettingInfo();
-  },
-  activated() {
-    this.getSettingInfo();
-  },
-  methods: {
-    // 查询账户列表
-    getSettingInfo() {
-      this.loading = true;
-      getSettingInfo(this.queryParams).then(response => {
-          this.form.pointNeedConsume = response.data.pointNeedConsume;
-          this.form.canUsedAsMoney = response.data.canUsedAsMoney;
-          this.form.exchangeNeedPoint = response.data.exchangeNeedPoint;
-          this.form.rechargePointSpeed = response.data.rechargePointSpeed;
-          this.form.status = response.data.status;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push( { path: '/point/list' } );
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveSetting(this.form).then(response => {
-              this.$modal.msgSuccess("保存成功");
-              this.getSettingInfo();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-.main-panel {
-  .content {
-    margin-left: 50px;
-    margin-top: 30px;
-  }
-  .footer {
-    margin-top: 10px;
-    margin-left: 250px;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/redirect.vue b/fuintAdmin_zt/src/views/redirect.vue
deleted file mode 100644
index db4c1d66d..000000000
--- a/fuintAdmin_zt/src/views/redirect.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-export default {
-  created() {
-    const { params, query } = this.$route
-    const { path } = params
-    this.$router.replace({ path: '/' + path, query })
-  },
-  render: function(h) {
-    return h() // avoid warning message
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/refund/index.vue b/fuintAdmin_zt/src/views/refund/index.vue
deleted file mode 100644
index 0d7fec478..000000000
--- a/fuintAdmin_zt/src/views/refund/index.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单号" prop="name">
-        <el-input
-          v-model="queryParams.orderSn"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="name">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员ID" prop="name">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option v-for="statusItem in statusList" :key="statusItem.key+''" :label="statusItem.name" :value="statusItem.key+''"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="提交时间">
-        <el-date-picker
-          v-model="queryParams.startTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width:200px"
-          placeholder="开始时间"
-        ></el-date-picker>
-        <span class="sp"> ~ </span>
-        <el-date-picker
-          v-model="queryParams.endTime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          style="width:200px"
-          placeholder="结束时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="售后ID" prop="id" width="60"/>
-      <el-table-column label="订单ID" align="center" prop="orderId" />
-      <el-table-column label="会员ID" align="center" prop="userId" />
-      <el-table-column label="店铺ID" align="center" prop="storeId" />
-      <el-table-column label="售后类型" align="center" prop="type">
-         <template slot-scope="scope">
-             <span v-if="scope.row.type">{{ getName(refundTypeList, scope.row.type) }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="退款金额" align="center" prop="amount">
-        <template slot-scope="scope">
-          <span v-if="true">{{ scope.row.amount.toFixed(2) }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-        <template slot-scope="scope">
-          <span v-if="scope.row.remark">{{ scope.row.remark }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" width="80" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 'B'" class="status-active">{{ getName(statusList, scope.row.status) }}</span>
-          <span v-else-if="scope.row.status == 'A'" class="status-normal">{{ getName(statusList, scope.row.status) }}</span>
-          <span v-else class="status-disabled">{{ getName(statusList, scope.row.status) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="提交时间" align="center" width="140" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" width="140" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            v-hasPermi="['order:detail']"
-            @click="handleView(scope.row)"
-          >订单详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['refund:edit']"
-            @click="handleUpdate(scope.row)"
-          >立即审核</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 审核对话框 start-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn">
-              <el-input v-model="orderInfo.orderSn" placeholder="订单号" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="订单总金额" prop="amount">
-              <el-input v-model="'￥' + orderInfo.amount" placeholder="订单总金额" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="orderInfo.userInfo">
-          <el-col :span="24">
-            <el-form-item label="会员名称" prop="userInfo">
-              <el-input v-model="orderInfo.userInfo.name" placeholder="会员名称" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="申请时间" prop="createTime">
-              <el-input v-model="orderInfo.createTime" placeholder="申请时间" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="申请备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" maxlength="255" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-select v-model="form.status" placeholder="状态">
-                <el-option v-for="statusItem in statusList" :key="statusItem.key+''" :label="statusItem.name" :value="statusItem.key+''"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getRefundList, getRefundInfo, saveRefund } from "@/api/refund";
-import {parseTime} from "../../utils/fuint";
-export default {
-  name: "RefundIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 状态列表
-      statusList: [],
-      // 售后类型列表
-      refundTypeList: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', refundId: '', remark: '', status: "A", createTime: ''},
-      // 订单详情
-      orderInfo: {},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        orderSn: '',
-        status: '',
-        startTime: '',
-        endTime: ''
-      },
-      // 表单校验
-      rules: {
-        status: [
-          { required: true, message: "请选择状态", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询售后订单列表
-    getList() {
-      this.loading = true;
-      getRefundList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.statusList = response.data.statusList;
-          this.refundTypeList = response.data.refundTypeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
-      this.multiple = !selection.length;
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        refundId: "",
-        status: "A",
-        remark: "",
-        createTime: ""
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveRefund(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-        }
-      });
-    },
-    // 审核按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getRefundInfo(id).then(response => {
-        this.form = response.data.refundInfo;
-        this.form.refundId = this.form.id;
-        this.form.createTime = parseTime(this.form.createTime);
-        this.orderInfo = response.data.orderInfo;
-        this.open = true;
-        this.title = "审核售后订单";
-      });
-    },
-    // 查看详情按钮操作
-    handleView(row) {
-      this.$router.push( { path: '/order/detail?orderId=' + row.orderId } )
-    },
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
deleted file mode 100644
index d03f3c15e..000000000
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="legalRepresentativeContact">
-
-        <el-select
-          v-model="queryParams.orgId"
-          clearable
-          placeholder="所属机构"
-
-        >
-          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
-          </el-option>
-        </el-select>
-        </el-form-item>
-
-        <el-form-item label="" prop="legalRepresentativeContact">
-          <el-input
-            v-model="queryParams.legalRepresentativeContact"
-            placeholder="请输入法人联系方式"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="legalRepresentativeContact">
-
-        <el-select v-model="queryParams.appStatus" placeholder="请选择小程序状态">
-          <el-option label="停用" value="0" ></el-option>
-          <el-option label="启用" value="1" ></el-option>
-        </el-select>
-        </el-form-item>
-          <el-form-item style="float: right;margin-right: 0px">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            @click="handleAdd"
-            v-hasPermi="['setting:app:add']"
-          >新增小程序配置</el-button>
-        </el-form-item>
-      </el-form>
-<!--    </el-card>-->
-
-<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-<!--    <el-card style="margin-top: 20px" >-->
-      <el-table :data="tableData" style="width: 100%" border>
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="orgName" label="机构名称"></el-table-column>
-        <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码"></el-table-column>
-        <el-table-column prop="appId" label="小程序appID"></el-table-column>
-        <el-table-column prop="appKey" label="密钥"></el-table-column>
-        <el-table-column prop="legalRepresentativeName" label="法人姓名"></el-table-column>
-        <el-table-column prop="legalRepresentativeWechat" label="法人微信号"></el-table-column>
-        <el-table-column prop="legalRepresentativeContact" label="法人联系方式"></el-table-column>
-        <el-table-column prop="appStatus" label="小程序状态">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.appStatus"
-              @change="changeStatus(scope.row)"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createByName" label="创建人"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-              v-hasPermi="['setting:app:edit']"
-            >编辑</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-              v-hasPermi="['setting:app:delete']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
-<!--      <el-form ref="form" :model="deviceInfo" label-width="80px">-->
-        <el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
-<!--          <el-form-item label="机构名称" prop="orgName">-->
-<!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
-<!--          </el-form-item>-->
-
-<!--          <el-form-item label="机构名称" prop="orgName">-->
-<!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
-<!--          </el-form-item>-->
-<!--          -->
-          <el-form-item label="机构名称" prop="orgId">
-          <el-select
-            v-model="deviceInfo.orgId"
-            clearable
-            placeholder="机构名称"
-            style="width: 300px;"
-          >
-            <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"  :value="item.deptId">
-            </el-option>
-          </el-select>
-
-          </el-form-item>
-          <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-            <el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序appID" prop="appId">
-            <el-input v-model="deviceInfo.appId" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label="密钥" prop="appKey">
-            <el-input v-model="deviceInfo.appKey" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label="法人姓名" prop="legalRepresentativeName">
-            <el-input v-model="deviceInfo.legalRepresentativeName" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label="法人微信号" prop="legalRepresentativeWechat">
-            <el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label="法人联系方式" prop="legalRepresentativeContact">
-            <el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序状态" prop="appStatus">
-              <el-switch
-                v-model="deviceInfo.appStatus"
-                active-color="#13ce66"
-                inactive-color="#ff4949">
-              </el-switch>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
-          </el-form-item>
-        </el-form>
-<!--      </el-form>-->
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-
-import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
-import {updateBannerApi} from "@/api/sys/banner";
-import {getRunningWaterByTissueApi} from "@/api/allOrder";
-
-export default {
-  name: "printIndex",
-
-  data() {
-    return {
-      tableData: [],
-      deptList: [],
-
-      deviceInfo: {
-        id: null,            // 自增id
-        orgName: '',   // 机构名称
-        orgId: '',   // 机构名称
-        unifiedSocialCreditCode: '',   // 统一社会信用代码
-        appId: '',   // 小程序appID
-        appKey: '',   // 密钥
-        legalRepresentativeName: '',   // 法人姓名
-        legalRepresentativeWechat: '',   // 法人微信
-        legalRepresentativeContact: '',   // 法人联系方式
-        appStatus: false,   // 小程序状态
-        createByName: '',
-      },
-      rule: {
-        orgId: [{required: true, message: '请选择机构名称', trigger: 'blur'},],
-        unifiedSocialCreditCode: [{required: true, message: '请填写统一社会信用代码', trigger: 'blur'},],
-        appId: [{required: true, message: '请填写小程序appID', trigger: 'blur'},],
-        appKey: [{required: true, message: '请填写密钥', trigger: 'blur'},],
-        legalRepresentativeName: [{required: true, message: '请填写法人姓名', trigger: 'blur'},],
-        legalRepresentativeWechat: [{required: true, message: '请填写法人微信号', trigger: 'blur'},],
-        legalRepresentativeContact: [{required: true, message: '请填写法人联系方式', trigger: 'blur'},],
-      },
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        orgName:'',
-        orgId:'',
-        legalRepresentativeContact:'',
-        appStatus:'',
-      },
-    };
-  },
-  created() {
-    this.getList()
-    this.getDeptList()
-  },
-  methods: {
-    getDeptList() {
-      getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
-        this.deptList = response.data.records;
-      })
-    },
-    getList(){
-      getAppListApi(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-    getsSubmitDeviceInfo(){},
-
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          // 表单验证通过，可以提交数据
-          // 示例：调用 API 提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    submitDeviceInfo() {
-      // 在这里调用接口提交设备信息数据
-
-      let filter = this.deptList.filter(item => item.deptId == this.deviceInfo.orgId);
-
-      this.deviceInfo.orgName = filter[0].deptName
-
-      if (this.deviceInfo.id) {
-        updateAppApi(this.deviceInfo).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-
-        })
-      }else {
-        saveAppApi(this.deviceInfo).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    changeStatus(data){
-      console.log(123123123)
-      updateAppApi(data).then(res=>{
-        if(res.code === 200) {
-          this.$message({
-            type: 'success',
-            message: '修改状态成功!'
-          });
-          this.getList()
-        }
-
-      })
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-      this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.title = "新增小程序配置"
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "编辑小程序配置"
-      this.deviceInfo = e
-      console.log('提交设备信息数据:', this.deviceInfo);
-
-    },
-    del(e) {
-
-      this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteAppApi(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-
-
-
-    },
-    clean() {
-      this.deviceInfo= {
-        id: null,            // 自增id
-        orgName: '',   // 机构名称
-        unifiedSocialCreditCode: '',   // 统一社会信用代码
-        appId: '',   // 小程序appID
-        appKey: '',   // 密钥
-        legalRepresentativeName: '',   // 法人姓名
-        legalRepresentativeWeChat: '',   // 法人微信
-        legalRepresentativeContact: '',   // 法人联系方式
-        appStatus: false,   // 小程序状态
-        createByName: '',
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue
deleted file mode 100644
index 9327f08cf..000000000
--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ /dev/null
@@ -1,396 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="name">
-          <el-input
-            v-model="queryParams.bannerName"
-            placeholder="请输入banner图名称"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-<!--        <el-form-item style="float: right">-->
-          <el-form-item label="" prop="bannerName">
-            <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">
-              <el-option
-                v-for="item in systemPositionList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-            <el-form-item label="" prop="bannerName">
-              <el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
-                <el-option label="停用" value="0" ></el-option>
-                <el-option label="启用" value="1" ></el-option>
-<!--                <el-option-->
-<!--                  v-for="item in systemPositionList"-->
-<!--                  :key="item.value"-->
-<!--                  :label="item.label"-->
-<!--                  :value="item.value">-->
-<!--                </el-option>-->
-              </el-select>
-            </el-form-item>
-
-          <el-form-item style="float: right ;margin-right: 0px">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              @click="handleAdd"
-              v-hasPermi="['setting:banner:add']"
-            >新增banner图</el-button>
-        </el-form-item>
-      </el-form>
-<!--    </el-card>-->
-
-<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-<!--    <el-card style="margin-top: 20px" >-->
-
-
-    <el-table :data="tableData" style="width: 100%" border>
-      <el-table-column type="index" label="序号"></el-table-column>
-      <el-table-column prop="bannerName" label="banner名称"></el-table-column>
-      <el-table-column prop="productImage" label="图片">
-        <template slot-scope="scope">
-          <el-image
-            style="width: 50px; height: 50px"
-            :src="imagePath+scope.row.productImage"
-            :preview-src-list="[imagePath + scope.row.productImage]"
-            fit="cover">
-          </el-image>
-        </template>
-      </el-table-column>
-      <el-table-column prop="systemPosition" label="系统位置"></el-table-column>
-      <el-table-column prop="sortOrder" label="排序号"></el-table-column>
-      <el-table-column prop="bannerLink" label="banner图链接"></el-table-column>
-      <el-table-column prop="note" label="备注"></el-table-column>
-      <el-table-column prop="bannerStatus" label="banner图状态">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.bannerStatus"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            @change="changeStatus(scope.row)"
-          >
-          </el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createByName" label="创建人"></el-table-column>
-      <el-table-column prop="createTime" label="创建时间"></el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="edit(scope.row)"
-            v-hasPermi="['setting:banner:edit']"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="del(scope.row)"
-            v-hasPermi="['setting:banner:delete']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
-      <el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
-        <el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
-          <el-form-item label="banner名称" prop="bannerName">
-            <el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="图片" prop="uploadAction">
-            <el-upload
-              :action="uploadAction"
-              list-type="picture-card"
-              :class="{hide:hideUpload}"
-              :file-list="uploadFiles"
-              :auto-upload="true"
-              :show-file-list="false"
-              :headers="uploadHeader"
-              :on-success="handleUploadSuccessCover">
-              <img
-                v-if="this.deviceInfo.productImage"
-                :src="imagePath + this.deviceInfo.productImage"
-                class="list-img"
-                style="width: 100%; height: 100%"
-              />
-              <i v-if="!this.deviceInfo.productImage" class="el-icon-plus"></i>
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="系统位置" prop="systemPosition">
-            <el-select v-model="deviceInfo.systemPosition" placeholder="系统位置" style="width: 300px">
-              <el-option
-                v-for="item in systemPositionList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="排序号" prop="sortOrder">
-            <el-input v-model="deviceInfo.sortOrder" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="Banner链接" prop="bannerLink">
-            <el-input v-model="deviceInfo.bannerLink" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="Banner状态" prop="bannerStatus">
-            <el-switch
-              v-model="deviceInfo.bannerStatus"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
-          <el-form-item label="备注" prop="note">
-            <el-input v-model="deviceInfo.note" style="width: 300px" ></el-input>
-          </el-form-item>
-
-
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
-          </el-form-item>
-        </el-form>
-      </el-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import {deleteBannerApi, getBannerListApi, saveBannerApi, updateBannerApi} from "@/api/sys/banner";
-import { getToken } from '@/utils/auth'
-
-export default {
-  name: "printIndex",
-
-  data() {
-    return {
-      tableData: [],
-      deviceInfo: {
-        id: null,            // 自增id
-        bannerName: '',     // Banner名称
-        productImage: '',           // 商品图片
-        systemPosition: '',      // 系统位置
-        sortOrder: null,        // 排序号
-        bannerLink: '',          // Banner链接
-        bannerStatus: false,       // Banner状态
-        note: '',    // 备注
-        createByName: '', //
-
-      },
-      systemPositionList:[{
-        value: '首页',
-        label: '首页'
-      }, {
-        value: '系统首页',
-        label: '系统首页'
-      },],
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        bannerName:'',
-        systemPosition:'',
-        bannerStatus:'',
-      },
-      rules: {
-        bannerName:[
-            {required: true, message: '请填写banner名称', trigger: 'blur'},
-        ],
-        systemPosition:[
-            {required: true, message: '请填写系统位置', trigger: ''},
-        ],
-        sortOrder:[
-            {required: true, message: '请填写排序号', trigger: 'blur'},
-        ],
-        bannerLink:[
-            {required: true, message: '请填写链接', trigger: 'blur'},
-        ],
-        note:[
-            {required: true, message: '请选择备注', trigger: 'blur'},
-        ],
-      },
-
-      // 上传地址
-      uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },  // 上传文件列表
-      uploadFiles: [
-        {name:"nihao",
-          url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
-      ],
-      // 图片根目录
-      imagePath: process.env.VUE_APP_BASE_API,
-      // 隐藏上传
-      hideUpload: false,
-    };
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList(){
-      getBannerListApi(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          // 表单验证通过，可以提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    submitDeviceInfo() {
-      // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.deviceInfo);
-      if (this.deviceInfo.id) {
-        updateBannerApi(this.deviceInfo).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-
-        })
-      }else {
-        saveBannerApi(this.deviceInfo).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    changeStatus(data){
-      updateBannerApi(data).then(res=>{
-        if(res.code === 200) {
-          this.$message({
-            type: 'success',
-            message: '修改状态成功!'
-          });
-          this.getList()
-        }
-
-      })
-    },
-    // 上传封面
-    handleUploadSuccessCover(file) {
-      this.deviceInfo.productImage = file.data.fileName;
-      this.deviceInfo.productImage = file.data.fileName;
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-      this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.title = "新增banner图"
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "修改banner图"
-      this.deviceInfo = e
-    },
-    del(e) {
-      this.$confirm('此操作将永久删除该banner图, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteBannerApi({id:e.id}).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    clean() {
-      this.deviceInfo= {
-        id: null,            // 自增id
-        bannerName: '',     // Banner名称
-        productImage: '',           // 商品图片
-        systemPosition: '',      // 系统位置
-        sortOrder: null,        // 排序号
-        bannerLink: '',          // Banner链接
-        bannerStatus: false,       // Banner状态
-        note: '',    // 备注
-        createByName: '', //
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-.d-dialog >>> .el-upload--picture-card {
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-}
-
-.d-dialog >>> .avatar-uploader .el-upload {
-  width: 100px;
-  height: 100px;
-}
-.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
-  width: 100px;
-  height: 100px;
-}
-.list-img{
-  width: 98px;
-  height: 98px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue
deleted file mode 100644
index 56fec4312..000000000
--- a/fuintAdmin_zt/src/views/setting/hardware.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
-        <el-form-item label="" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入商品名称"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="请选择分类" prop="categoryName">
-          <el-select v-model="queryParams.categoryName" style="width: 150px" placeholder="全部">
-            <el-option
-              v-for="dict in dict.type.hardware_type"
-              :key="dict.label"
-              :label="dict.label"
-              :value="dict.label"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="请选择状态" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="全部">
-            <el-option
-              v-for="dict in dict.type.hardware_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item style="float: right;margin-right: 0px">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd"
-            v-hasPermi="['setting:hardware:add']"
-          >新增商品</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table :data="tableData" style="width: 100%" border>
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="name" label="商品名称"></el-table-column>
-        <el-table-column prop="categoryName" label="商品分类"></el-table-column>
-        <el-table-column prop="image" label="商品图片">
-          <template slot-scope="scope">
-            <ImagePreview :src="scope.row.image"></ImagePreview>
-          </template>
-        </el-table-column>
-        <el-table-column prop="formStore" label="采购商家"></el-table-column>
-        <el-table-column prop="content" label="商品介绍"></el-table-column>
-        <el-table-column prop="status" label="商品状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.status==0">
-              未上架
-            </div>
-            <div v-else>
-              已上架
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-              v-hasPermi="['setting:hardware:edit']"
-            >编辑</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-top"
-              v-if="scope.row.status == 0 "
-              @click="shangjia(scope.row)"
-              v-hasPermi="['setting:hardware:grounding']"
-            >上架</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-bottom"
-              v-if="scope.row.status == 1 "
-              @click="shangjia(scope.row)"
-              v-hasPermi="['setting:hardware:offShelf']"
-            >下架</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-              v-hasPermi="['setting:hardware:delete']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :rules="rules" :model="form" label-width="80px">
-
-          <el-form-item label="商品名称" prop="name">
-            <el-input v-model="form.name" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="商品分类" prop="categoryName">
-            <el-select v-model="form.categoryName" style="width: 150px" placeholder="全部">
-              <el-option
-                v-for="dict in dict.type.hardware_type"
-                :key="dict.label"
-                :label="dict.label"
-                :value="dict.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="采购商家" prop="formStore">
-            <el-input v-model="form.formStore" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="图片" prop="image">
-           <ImageUpload v-model="form.image"></ImageUpload>
-          </el-form-item>
-
-          <el-form-item label="商品介绍" prop="content">
-            <el-input type="textarea" v-model="form.content"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('form')">提交</el-button>
-          </el-form-item>
-        </el-form>
-
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import {deleteApi, getListApi, saveApi, updateApi} from "@/api/setting/hardware";
-import { getToken } from '@/utils/auth'
-
-export default {
-  name: "printIndex",
-  dicts: ['hardware_type','hardware_status'],
-  data() {
-    return {
-      tableData: [],
-      form: {
-
-      },
-      systemPositionList:[{
-        value: '首页',
-        label: '首页'
-      }, {
-        value: '系统首页',
-        label: '系统首页'
-      },],
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        bannerName:'',
-        systemPosition:'',
-        bannerStatus:'',
-      },
-
-      // 上传地址
-      uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },  // 上传文件列表
-      uploadFiles: [
-        {name:"nihao",
-          url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
-      ],
-      // 图片根目录
-      imagePath: process.env.VUE_APP_BASE_API,
-      // 隐藏上传
-      hideUpload: false,
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "商品名称不能为空", trigger: "blur" }
-        ],
-        categoryName: [
-          { required: true, message: "商品分类不能为空", trigger: "blur" }
-        ],
-        formStore: [
-          { required: true, message: "采购商家不能为空", trigger: "blur" }
-        ],
-        image: [
-          { required: true, message: "商品图片不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "商品介绍不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList(){
-      getListApi(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          // 表单验证通过，可以提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    submitDeviceInfo() {
-      // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.form);
-      if (this.form.id) {
-        updateApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-
-        })
-      }else {
-        saveApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    changeStatus(data){
-      updateApi(data).then(res=>{
-        if(res.code === 200) {
-          this.$message({
-            type: 'success',
-            message: '修改状态成功!'
-          });
-          this.getList()
-        }
-
-      })
-    },
-    // 上传封面
-    handleUploadSuccessCover(file) {
-      this.form.productImage = file.data.fileName;
-      this.form.productImage = file.data.fileName;
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-        this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.title = "新增商品"
-    },
-    shangjia(data){
-
-      if(data.status == 0){
-
-        data.status =1
-      }else {
-
-        data.status =0
-      }
-      this.changeStatus(data)
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "修改商品"
-      this.form = e
-    },
-    del(e) {
-      this.$confirm('此操作将永久删除该商品, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteApi(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    clean() {
-      this.form= {
-        id: null,            // 自增id
-        bannerName: '',     // Banner名称
-        productImage: '',           // 商品图片
-        systemPosition: '',      // 系统位置
-        sortOrder: null,        // 排序号
-        bannerLink: '',          // Banner链接
-        bannerStatus: false,       // Banner状态
-        note: '',    // 备注
-        createByName: '', //
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-.d-dialog >>> .el-upload--picture-card {
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-}
-
-.d-dialog >>> .avatar-uploader .el-upload {
-  width: 100px;
-  height: 100px;
-}
-.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
-  width: 100px;
-  height: 100px;
-}
-.list-img{
-  width: 98px;
-  height: 98px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue
deleted file mode 100644
index 86fb18fed..000000000
--- a/fuintAdmin_zt/src/views/setting/message.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
-        <el-form-item label="" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入短信名称"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-
-
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" style="width: 150px" placeholder="短信模版状态">
-            <el-option
-              v-for="dict in dict.type.message_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd"
-            v-hasPermi="['setting:message:add']"
-          >新增短信模板</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="messageId" label="短信模板ID"></el-table-column>
-        <el-table-column prop="name" label="短信名称"></el-table-column>
-        <el-table-column prop="content" label="短信模板内容"></el-table-column>
-<!--        <el-table-column prop="image" label="短信图片">-->
-<!--          <template slot-scope="scope">-->
-<!--            <ImagePreview :src="scope.row.image"></ImagePreview>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column prop="deptNames" label="适用范围"></el-table-column>
-<!--        <el-table-column prop="roleIds" label="接收角色"></el-table-column>-->
-
-        <el-table-column prop="status" label="短信状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.status==0">
-              停用
-            </div>
-            <div v-else>
-              启用
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-              v-hasPermi="['setting:message:edit']"
-            >编辑</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-              v-hasPermi="['setting:message:delete']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
-      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
-
-        <el-form-item label="短信模板ID" prop="messageId">
-          <el-input v-model="form.messageId" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="短信名称" prop="name">
-          <el-input v-model="form.name" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="适用范围" prop="deptIdList">
-          <el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px" >
-            <el-option
-              v-for="item in deptListSelect"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="状态" prop="status">
-          <el-switch
-            v-model="form.status"
-            active-value="1"
-            inactive-value="0">
-          </el-switch>
-
-        </el-form-item>
-
-<!--        <el-form-item label="适用角色" prop="categoryName">-->
-<!--          <el-select v-model="form.roleIds" style="width: 300px" placeholder="全部">-->
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.role_ids"-->
-<!--              :key="dict.label"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.label"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-        <el-form-item label="短信内容" prop="content"  >
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm('form')">提交</el-button>
-        </el-form-item>
-      </el-form>
-
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import {deleteApi, getListApi, saveApi, updateApi} from "@/api/setting/message";
-import { getToken } from '@/utils/auth'
-import {selectChildByDeptId} from "@/api/system/Site/site";
-
-export default {
-  name: "printIndex",
-  dicts: ['dept_ids','message_status'],
-  data() {
-    return {
-      tableData: [],
-      form: {},
-      deptListSelect:[],
-      systemPositionList:[{
-        value: '首页',
-        label: '首页'
-      }, {
-        value: '系统首页',
-        label: '系统首页'
-      },],
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        bannerName:'',
-        systemPosition:'',
-        bannerStatus:'',
-      },
-
-      // 上传地址
-      uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },  // 上传文件列表
-      uploadFiles: [
-        {name:"nihao",
-          url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
-      ],
-      // 图片根目录
-      imagePath: process.env.VUE_APP_BASE_API,
-      // 隐藏上传
-      hideUpload: false,
-      // 表单校验
-      rules: {
-        messageId: [
-          { required: true, message: "短信模板id不能为空", trigger: "blur" }
-        ],
-        name: [
-          { required: true, message: "短信名称不能为空", trigger: "blur" }
-        ],
-        deptIdList: [
-          { required: true, message: "适用范围不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "短信介绍不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList()
-    this.selectChildByDeptIdApi()
-  },
-  methods: {
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res => {
-        this.deptListSelect = res.data
-
-      })
-    },
-    getList(){
-      getListApi(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          // 表单验证通过，可以提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    submitDeviceInfo() {
-      // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.form);
-      if (this.form.id) {
-        updateApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }else {
-        saveApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    changeStatus(data){
-      updateApi(data).then(res=>{
-        if(res.code === 200) {
-          this.$message({
-            type: 'success',
-            message: '修改状态成功!'
-          });
-          this.getList()
-        }
-
-      })
-    },
-    // 上传封面
-    handleUploadSuccessCover(file) {
-      this.form.productImage = file.data.fileName;
-      this.form.productImage = file.data.fileName;
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-        this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.title = "新增短信"
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "修改短信"
-      this.form = e
-    },
-    del(e) {
-      this.$confirm('此操作将永久删除该短信, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteApi(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    clean() {
-      this.form= {
-        id: null,            // 自增id
-        bannerName: '',     // Banner名称
-        productImage: '',           // 短信图片
-        systemPosition: '',      // 系统位置
-        sortOrder: null,        // 排序号
-        bannerLink: '',          // Banner链接
-        bannerStatus: false,       // Banner状态
-        note: '',    // 备注
-        createByName: '', //
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-.d-dialog >>> .el-upload--picture-card {
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-}
-
-.d-dialog >>> .avatar-uploader .el-upload {
-  width: 100px;
-  height: 100px;
-}
-.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
-  width: 100px;
-  height: 100px;
-}
-.list-img{
-  width: 98px;
-  height: 98px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue
deleted file mode 100644
index 8381410dc..000000000
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ /dev/null
@@ -1,415 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="deptId">
-<!--          <el-input-->
-<!--            v-model="queryParams.deptId"-->
-<!--            placeholder="请选择机构名称"-->
-<!--            clearable-->
-<!--            style="width: 240px;"-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-          <el-select v-model="queryParams.deptId" placeholder="请选择机构名称" clearable>
-            <el-option
-              v-for="item in deptListSelect"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="deptType">
-          <el-select v-model="queryParams.deptType" placeholder="请选择机构类型" clearable>
-            <el-option label="代理商" value="1"></el-option>
-            <el-option label="连锁店" value="2"></el-option>
-            <el-option label="基本门店" value="3"></el-option>
-            <el-option label="三方机构" value="4"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="paymentChannel">
-          <el-select v-model="queryParams.paymentChannel" placeholder="请选择支付通道" clearable>
-            <el-option
-              v-for="dict in dict.type.payment_channel"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择支付通道状态" clearable style="width: 200px;margin-right: 15px;">
-            <el-option
-              v-for="dict in dict.type.zhzt"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            @click="handleAdd"
-            v-hasPermi="['setting:pay:add']"
-          >新增支付参数</el-button>
-        </el-form-item>
-      </el-form>
-<!--    </el-card>-->
-
-<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-<!--    <el-card style="margin-top: 20px" >-->
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="deptName" label="机构名称"></el-table-column>
-        <el-table-column prop="deptType" label="机构类型">
-          <template slot-scope="scope">
-            <div v-if="scope.row.deptType==1">代理商</div>
-            <div v-if="scope.row.deptType==2">连锁店</div>
-            <div v-if="scope.row.deptType==3">基本门店</div>
-            <div v-if="scope.row.deptType==4">三方机构</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="paymentChannel" label="支付通道"></el-table-column>
-        <el-table-column prop="appKey" label="密钥">
-          <el-table-column prop="insCd" label="机构号"> </el-table-column>
-          <el-table-column prop="publicKey" label="公钥">
-            <template slot-scope="scope">
-              <div class="single-row">{{scope.row.publicKey}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="privateKey" label="私钥">
-            <template slot-scope="scope">
-              <div class="single-row">{{scope.row.privateKey}}</div>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="contact" label="联系人"></el-table-column>
-        <el-table-column prop="information" label="联系方式"></el-table-column>
-        <el-table-column prop="paymentChannelType" label="支付通道状态">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              active-value="qy"
-              inactive-value="jy"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-
-          </template>
-        </el-table-column>
-        <el-table-column prop="realName" label="创建人"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-              v-hasPermi="['setting:pay:edit']"
-            >编辑</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-              v-hasPermi="['setting:pay:delete']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
-        <el-form :model="deviceInfo" ref="deviceForm" label-width="120px"  :rules="rules">
-
-          <el-form-item label="机构名称" prop="deptId" >
-            <el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 300px">
-              <el-option
-                v-for="item in deptListSelect"
-                :key="item.deptId"
-                :label="item.deptName"
-                :value="item.deptId"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="机构类型" prop="deptType">
-            <el-select v-model="deviceInfo.deptType" placeholder="请选择机构类型" clearable disabled style="width: 300px">
-              <el-option label="代理商" value="1"></el-option>
-              <el-option label="连锁店" value="2"></el-option>
-              <el-option label="基本门店" value="3"></el-option>
-              <el-option label="三方机构" value="4"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="支付通道" prop="paymentChannel">
-            <el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 300px">
-              <el-option
-                v-for="dict in dict.type.payment_channel"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="机构号" prop="">
-            <el-input v-model="deviceInfo.insCd" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="公钥" prop="publicKey">
-            <el-input v-model="deviceInfo.publicKey" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="私钥" prop="privateKey">
-            <el-input v-model="deviceInfo.privateKey" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="联系人" prop="contact">
-            <el-input v-model="deviceInfo.contact" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="联系方式" prop="information">
-            <el-input v-model="deviceInfo.information" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="支付状态" prop="appStatus" >
-            <el-switch
-              v-model="deviceInfo.status"
-              active-value="qy"
-              inactive-value="jy"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
-          </el-form-item>
-        </el-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-
-import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
-import {selectChildByDeptId} from "@/api/system/Site/site";
-import {addMerchantApi, editMerchantRemark, getMerchant, listMerchantPage} from "@/api/payConfig/merchantconfig";
-import {
-  addPaymentParameter, deletePaymentParameter,
-  editPaymentParameter,
-  getPaymentParameter,
-  listPaymentParameterPage
-} from "@/api/payConfig/paymentParameter";
-
-export default {
-  name: "printIndex",
-
-  dicts: ['zhzt','payment_channel'],
-  data() {
-    return {
-      tableData: [],
-      deviceInfo: {
-        deptId:'',
-        deptType:'',
-        paymentChannel:'',
-        publicKey:'',
-        contact:'',
-        information:'',
-        paymentChannelType:'',
-        status:"qy"
-      },
-      deptListSelect:[],
-
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-      },
-      rules: {
-        deptId: [
-          {required: true, message: '请选择机构名称', trigger: 'blur'},
-        ],
-        deptType: [
-          {required: true, message: '请选择机构类型', trigger: 'blur'},
-        ],
-        paymentChannel: [
-          {required: true, message: '请选择支付通道', trigger: 'blur'},
-        ],
-        insCd: [
-          {required: true, message: '请填写机构号', trigger: 'blur'},
-        ],
-        publicKey: [
-          {required: true, message: '请填写公钥信息', trigger: 'blur'},
-        ],
-        privateKey: [
-          {required: true, message: '请填写私钥信息', trigger: 'blur'},
-        ],
-        contact: [
-          {required: true, message: '请填写联系人信息', trigger: 'blur'},
-        ],
-        information: [
-          {required: true, message: '请填写联系人方式', trigger: 'blur'},
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList()
-    this.selectChildByDeptIdApi()
-  },
-  methods: {
-    chooseDept(deptId){
-      this.deptListSelect.forEach(item => {
-        if (item.deptId == deptId){
-          this.deviceInfo.deptType = item.deptType
-        }
-      })
-    },
-    getList(){
-      listPaymentParameterPage(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-    getsSubmitDeviceInfo(){},
-
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.deviceInfo.merchantName = this.deviceInfo.paymentChannel
-          // 表单验证通过，可以提交数据
-          // 示例：调用 API 提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    submitDeviceInfo() {
-      // 在这里调用接口提交支付参数信息数据
-      if (this.deviceInfo.id) {
-        editPaymentParameter(this.deviceInfo).then(res => {
-          if (res.data === 1) {
-            this.$modal.msgSuccess("修改成功")
-            this.getList()
-            this.open = false
-          } else {
-            this.$modal.msgError("修改失败，当前机构的支付通道已存在！")
-          }
-        })
-      }else {
-        addPaymentParameter(this.deviceInfo).then(res => {
-          if (res.data == 1) {
-            this.$modal.msgSuccess("添加成功");
-            this.getList()
-            this.open = false
-          } else {
-            this.$modal.msgError("添加失败，当前机构的支付通道已存在！")
-          }
-        })
-      }
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-      this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.title = "增加支付参数"
-      // this.selectChildByDeptIdApi();
-    },
-    edit(e) {
-      this.clean()
-      // this.open = true;
-      // this.title = "编辑支付参数"
-      // this.deviceInfo = e
-      getPaymentParameter(e.id).then(res => {
-        this.open = true;
-        this.title = "编辑支付参数"
-        this.deviceInfo = res.data
-      })
-    },
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res=>{
-        this.deptListSelect = res.data
-      })
-    },
-
-    del(e) {
-
-      this.$confirm('此操作将永久删除该支付参数, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deletePaymentParameter(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-
-
-
-    },
-    clean() {
-      this.deviceInfo= {
-        id: null,            // 自增id
-        deptId:'',
-        deptType:'',
-        paymentChannel:'',
-        publicKey:'',
-        contact:'',
-        information:'',
-        status:'qy'
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-.app-container{
-  height: 100%;
-}
-.single-row {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/setting/sysLog.vue b/fuintAdmin_zt/src/views/setting/sysLog.vue
deleted file mode 100644
index 559d0a268..000000000
--- a/fuintAdmin_zt/src/views/setting/sysLog.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <el-card >
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="中台系统" name="first"></el-tab-pane>
-        <el-tab-pane label="油站系统" name="second"></el-tab-pane>
-      </el-tabs>
-
-
-
-
-
-
-
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
-        <el-form-item label="" prop="createName">
-          <el-input
-            v-model="queryParams.createName"
-            placeholder="请输入用户名称"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="" prop="deptId">
-          <el-select
-            v-model="queryParams.deptId"
-            placeholder="请选择机构"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in deptListSelect"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="" prop="moudle">
-          <el-input
-            v-model="queryParams.moudle"
-            placeholder="请输入操作模块"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-            <el-form-item  label="" prop="turnoverType" >
-              <el-date-picker
-                v-model="queryParams.startTime"
-                style="width: 140px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="queryParams.endTime"
-                style="width: 140px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-
-        <el-form-item style="float: right">
-
-
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-
-        </el-form-item>
-      </el-form>
-
-      <el-table :data="tableData" style="width: 100%" border>
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="createAccount" label="登录账号"></el-table-column>
-        <el-table-column prop="createName" label="操作用户"></el-table-column>
-        <el-table-column prop="deptName" label="所属机构"></el-table-column>
-        <el-table-column prop="systemName" label="系统终端">
-          <template slot-scope="scope">
-            <div v-if="scope.row.systemName==1">
-              中台端
-            </div>
-            <div v-else>
-             油站端
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="moudle" label="操作模块"></el-table-column>
-        <el-table-column prop="content" label="操作内容" width="500"></el-table-column>
-        <el-table-column prop="ipAddr" label="IP地址"></el-table-column>
-        <el-table-column prop="createTime" label="操作时间"></el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :rules="rules" :model="form" label-width="80px">
-
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model="form.name" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="商品分类" prop="categoryName">
-          <el-select v-model="form.categoryName" style="width: 150px" placeholder="全部">
-            <el-option
-              v-for="dict in dict.type.hardware_type"
-              :key="dict.label"
-              :label="dict.label"
-              :value="dict.label"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="采购商家" prop="formStore">
-          <el-input v-model="form.formStore" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="图片" prop="image">
-          <ImageUpload v-model="form.image"></ImageUpload>
-        </el-form-item>
-
-        <el-form-item label="商品介绍" prop="content">
-          <el-input type="textarea" v-model="form.content"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm('form')">提交</el-button>
-        </el-form-item>
-      </el-form>
-
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import {deleteApi, getListApi, saveApi, updateApi} from "@/api/setting/sysLog";
-import { getToken } from '@/utils/auth'
-import {selectChildByDeptId} from "@/api/system/Site/site";
-
-export default {
-  name: "printIndex",
-  dicts: ['hardware_type','hardware_status'],
-  data() {
-    return {
-      tableData: [],
-      activeName:'first',
-      form: {
-
-      },
-      deptListSelect:[],
-      systemPositionList:[{
-        value: '首页',
-        label: '首页'
-      }, {
-        value: '系统首页',
-        label: '系统首页'
-      },],
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        bannerName:'',
-        systemPosition:'',
-        bannerStatus:'',
-      },
-
-      // 上传地址
-      uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },  // 上传文件列表
-      uploadFiles: [
-        {name:"nihao",
-          url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
-      ],
-      // 图片根目录
-      imagePath: process.env.VUE_APP_BASE_API,
-      // 隐藏上传
-      hideUpload: false,
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "商品名称不能为空", trigger: "blur" }
-        ],
-        categoryName: [
-          { required: true, message: "商品分类不能为空", trigger: "blur" }
-        ],
-        formStore: [
-          { required: true, message: "采购商家不能为空", trigger: "blur" }
-        ],
-        image: [
-          { required: true, message: "商品图片不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "商品介绍不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList()
-    this.selectChildByDeptIdApi()
-  },
-  methods: {
-    selectChildByDeptIdApi() {
-      selectChildByDeptId().then(res=>{
-        this.deptListSelect = res.data
-      })
-    },
-    handleClick(tab, event) {
-      if (tab.$options.propsData.name == 'first'){
-        this.queryParams.systemName ='1'
-      }else {
-        this.queryParams.systemName ='2'
-      }
-     this.getList()
-
-    },
-    getList(){
-      getListApi(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          // 表单验证通过，可以提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    submitDeviceInfo() {
-      // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.form);
-      if (this.form.id) {
-        updateApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-
-        })
-      }else {
-        saveApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    changeStatus(data){
-      updateApi(data).then(res=>{
-        if(res.code === 200) {
-          this.$message({
-            type: 'success',
-            message: '修改状态成功!'
-          });
-          this.getList()
-        }
-
-      })
-    },
-    // 上传封面
-    handleUploadSuccessCover(file) {
-      this.form.productImage = file.data.fileName;
-      this.form.productImage = file.data.fileName;
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-        this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.title = "新增商品"
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "修改商品"
-      this.form = e
-    },
-    del(e) {
-      this.$confirm('此操作将永久删除该商品, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteApi(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    clean() {
-      this.form= {
-        id: null,            // 自增id
-        bannerName: '',     // Banner名称
-        productImage: '',           // 商品图片
-        systemPosition: '',      // 系统位置
-        sortOrder: null,        // 排序号
-        bannerLink: '',          // Banner链接
-        bannerStatus: false,       // Banner状态
-        note: '',    // 备注
-        createByName: '', //
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-.d-dialog >>> .el-upload--picture-card {
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-}
-
-.d-dialog >>> .avatar-uploader .el-upload {
-  width: 100px;
-  height: 100px;
-}
-.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
-  width: 100px;
-  height: 100px;
-}
-.list-img{
-  width: 98px;
-  height: 98px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/smsManager/index.vue b/fuintAdmin_zt/src/views/smsManager/index.vue
deleted file mode 100644
index 8473d8dd8..000000000
--- a/fuintAdmin_zt/src/views/smsManager/index.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="关键字" prop="content">
-        <el-input
-          v-model="queryParams.content"
-          placeholder="请输入模板关键字"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['smsManager:send']"
-        >发送短信</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="logId" width="66"/>
-      <el-table-column label="手机号" align="center" width="150" prop="mobilePhone" />
-      <el-table-column label="短信内容" align="left" prop="content"/>
-      <el-table-column label="发送时间" align="center" width="150" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板名称" prop="name">
-               <el-input v-model="form.name" placeholder="请输入要模板名称" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="英文名称" prop="uname">
-              <el-input v-model="form.uname" placeholder="请输入模板英文名称" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板编码" prop="code">
-              <el-input v-model="form.code" placeholder="请输入模板编码，阿里云短信模板编码" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板内容" prop="content">
-              <el-input v-model="form.content" type="textarea" rows="3" placeholder="请输入模板内容，阿里云短信模板内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item class="recharge-status" label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getSmsList, sendSms } from "@/api/smsManager";
-export default {
-  name: "SmsManagerIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { mobile: '', status: "A" },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        content: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getSmsList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "发送短信";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        mobile: "",
-        status: "A"
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            sendSms(this.form).then(response => {
-              this.$modal.msgSuccess("短信发送成功");
-              this.open = false;
-              this.getList();
-            });
-        }
-      });
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/smsTemplate/index.vue b/fuintAdmin_zt/src/views/smsTemplate/index.vue
deleted file mode 100644
index d264fb582..000000000
--- a/fuintAdmin_zt/src/views/smsTemplate/index.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="模板代码" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入模板代码"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="关键字" prop="content">
-        <el-input
-          v-model="queryParams.content"
-          placeholder="请输入模板关键字"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['openGift:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="模板ID" prop="id" width="66"/>
-      <el-table-column label="模板名称" align="center" prop="name" />
-      <el-table-column label="模板编码" align="center" prop="uname" />
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            disabled
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['smsTemplate:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['smsTemplate:edit']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板名称" prop="name">
-               <el-input v-model="form.name" placeholder="请输入要模板名称" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="英文名称" prop="uname">
-              <el-input v-model="form.uname" placeholder="请输入英文名称" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板编码" prop="code">
-              <el-input v-model="form.code" placeholder="请输入模板编码，阿里云短信模板编码" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板内容" prop="content">
-              <el-input v-model="form.content" type="textarea" rows="3" placeholder="请输入模板内容，阿里云短信模板内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item class="recharge-status" label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getSmsTemplateList, getSmsTemplateInfo, saveSmsTemplate, deleteSmsTemplate } from "@/api/smsTemplate";
-export default {
-  name: "SmsTemplateIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', content: '', code: '', uname: '', name: '', status: "A" },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        code: '',
-        content: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "模板名称不能为空", trigger: "blur" },
-        ],
-        uname: [
-          { required: true, message: "模板英文名称不能为空", trigger: "blur" },
-        ],
-        code: [
-          { required: true, message: "模板编码不能为空，请登录短信平台查看", trigger: "blur" },
-        ],
-        content: [
-          { required: true, message: "模板内容不能为空，请登录短信平台查看", trigger: "blur" },
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getSmsTemplateList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增短信模板";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        name: "",
-        code: "",
-        uname: "",
-        content: "",
-        status: "A"
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveSmsTemplate(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveSmsTemplate(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getSmsTemplateInfo(id).then(response => {
-        this.form = response.data.smsTemplate;
-        this.open = true;
-        this.title = "编辑短信模板";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除ID等于' + row.id + '的数据项？').then(function() {
-        return deleteSmsTemplate(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/staff/list.vue b/fuintAdmin_zt/src/views/staff/list.vue
deleted file mode 100644
index 95b3af66b..000000000
--- a/fuintAdmin_zt/src/views/staff/list.vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="员工类别" prop="category">
-        <el-select v-model="queryParams.category" clearable placeholder="请选择员工类别">
-          <el-option
-            v-for="item in categoryOptions"
-            :key="item.key"
-            :label="item.name"
-            :value="item.key"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="姓名" prop="name">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入姓名"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="auditedStatus">
-        <el-select
-          v-model="queryParams.auditedStatus"
-          placeholder="状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['staff:list']"
-        >新增员工</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" align="center" prop="id" width="80" />
-      <el-table-column label="类别" align="center" prop="category">
-        <template slot-scope="scope">
-          <span v-if="scope.row.category">
-              <span>{{ getName(categoryOptions, scope.row.category) }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="姓名" align="center" prop="realName" />
-      <el-table-column label="手机号" align="center" prop="mobile" />
-      <el-table-column label="关联会员ID" align="center" prop="userId" />
-      <el-table-column label="所属店铺" align="center" prop="storeName">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeId">
-              <span>{{ getName(storeOptions, scope.row.storeId) }}</span>
-          </span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="storeName">
-      <template slot-scope="scope">
-        <el-switch
-          v-model="scope.row.auditedStatus"
-          active-value="A"
-          inactive-value="N"
-          @change="handleStatusChange(scope.row)"
-        ></el-switch>
-      </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['staff:list']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['staff:list']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="员工类别" prop="category">
-              <el-select v-model="form.category" placeholder="请选择员工类别">
-                <el-option key="0" label="请选择员工类别" value="0"></el-option>
-                <el-option
-                  v-for="item in categoryOptions"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属店铺" prop="storeId">
-              <el-select v-model="form.storeId" placeholder="请选择所属店铺">
-                <el-option :key="0" label="全部店铺" :value="0"></el-option>
-                <el-option
-                  v-for="item in storeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.auditedStatus">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-// import { getStaffList, getStaffInfo, updateStaffStatus, deleteStaff, saveStaff } from "@/api/staff";
-import { searchStore } from "@/api/store";
-
-export default {
-  name: "StaffList",
-  data() {
-    return {
-      // 标题
-      title: "",
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      categoryOptions: [],
-      storeOptions: [],
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', category: '0', realName: '', auditedStatus: 'A', mobile: '', storeId: '' },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        realName: '',
-        mobile: '',
-        auditedStatus: ''
-      },
-      // 表单校验
-      rules: {
-        realName: [
-          { required: true, message: "姓名不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '姓名长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
-          { min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur' }
-        ],
-        storeId: [
-          { required: true, message: "请选择所属店铺", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    // this.getList();
-    // this.getStoreList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getStaffList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.categoryOptions = response.data.categoryList;
-          this.loading = false;
-        }
-      );
-    },
-    // 店铺列表
-    getStoreList() {
-      searchStore().then( response => {
-          this.storeOptions = response.data.storeList;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.auditedStatus == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.realName + '"吗？').then(function() {
-          return updateStaffStatus(row.id, row.auditedStatus);
-      }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-          row.auditedStatus = row.auditedStatus === "A" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.operId)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增员工";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        name: "",
-        category: '0',
-        auditedStatus: "A",
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (!this.form.id) {
-            saveStaff(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            saveStaff(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getStaffInfo(id).then(response => {
-        this.form = response.data.staffInfo;
-        this.form.category = response.data.staffInfo.category + '';
-        this.open = true;
-        this.title = "编辑员工信息";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.realName || this.id;
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return deleteStaff(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/statistic/index.vue b/fuintAdmin_zt/src/views/statistic/index.vue
deleted file mode 100644
index 296e37151..000000000
--- a/fuintAdmin_zt/src/views/statistic/index.vue
+++ /dev/null
@@ -1,318 +0,0 @@
-<template>
-  <div class="app-container">
-      <div class="overview">
-          <div class="title">数据概况</div>
-          <div class="content" v-loading="loading">
-              <el-row class="line">
-                <div class="date-picker">
-                  <el-date-picker
-                    v-model="startTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    type="datetime"
-                    style="width:200px"
-                    placeholder="开始时间"
-                  ></el-date-picker>
-                  <span class="sp"> ~ </span>
-                  <el-date-picker
-                    v-model="endTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    type="datetime"
-                    style="width:200px"
-                    placeholder="结束时间"
-                  ></el-date-picker>
-                </div>
-                <div class="do-search">
-                  <el-button icon="el-icon-refresh" size="small" @click="reset">重置</el-button>
-                  <el-button type="primary" icon="el-icon-search" size="small" @click="getMainData">查询</el-button>
-                  <span class="ex" @click="setDay(3)">近3天</span>
-                  <span class="ex" @click="setDay(7)">近7天</span>
-                  <span class="ex" @click="setDay(15)">近15天</span>
-                  <span class="ex" @click="setDay(30)">近30天</span>
-                </div>
-              </el-row>
-              <el-row class="line">
-                <el-col class="item" :span="6">
-                   <div class="do">
-                       <svg t="1641957967018" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7597" width="64" height="64"><path d="M917.504 376.832c-20.48 0-36.864 16.384-36.864 36.864v450.56c0 4.096 0 16.384-12.288 28.672-8.192 8.192-16.384 12.288-28.672 12.288H180.224c-20.48 0-40.96-16.384-40.96-40.96V155.648c0-20.48 16.384-40.96 40.96-40.96h344.064c20.48 0 36.864-16.384 36.864-36.864s-16.384-36.864-36.864-36.864H180.224C118.784 40.96 65.536 90.112 65.536 155.648v708.608c0 61.44 49.152 114.688 114.688 114.688h663.552c28.672 0 57.344-12.288 81.92-32.768 28.672-28.672 32.768-65.536 32.768-81.92V409.6c-4.096-16.384-20.48-32.768-40.96-32.768z" fill="#8a8a8a" p-id="7598"></path><path d="M782.336 528.384c0-20.48-20.48-40.96-40.96-40.96H266.24c-24.576 0-40.96 20.48-40.96 40.96v8.192c0 20.48 16.384 40.96 40.96 40.96h475.136c20.48 0 40.96-20.48 40.96-40.96v-8.192zM741.376 712.704H266.24c-24.576 0-40.96 20.48-40.96 40.96v8.192c0 20.48 16.384 40.96 40.96 40.96h475.136c20.48 0 40.96-20.48 40.96-40.96v-8.192c0-20.48-16.384-40.96-40.96-40.96zM584.04864 304.08704l298.43456-262.30784 62.17728 70.73792-298.43456 262.30784zM532.48 413.696l90.112-20.48-61.44-69.632z" fill="#8a8a8a" p-id="7599"></path></svg>
-                       <p class="text">订单数（笔）</p>
-                       <p class="number">{{ mainData.orderCount }}</p>
-                   </div>
-                </el-col>
-                <el-col class="item" :span="6">
-                  <div class="do">
-                     <svg t="1641958321700" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10174" width="64" height="64"><path d="M204.8 438.528c-16.896 0-30.72-13.824-30.72-30.72 0-121.088 98.56-219.648 219.648-219.648 16.896 0 30.72 13.824 30.72 30.72s-13.824 30.72-30.72 30.72c-87.296 0-158.208 70.912-158.208 158.208 0 16.896-13.824 30.72-30.72 30.72zM393.728 856.064c-121.088 0-219.648-98.56-219.648-219.648 0-16.896 13.824-30.72 30.72-30.72s30.72 13.824 30.72 30.72c0 87.296 70.912 158.208 158.208 158.208 16.896 0 30.72 13.824 30.72 30.72 0 16.896-13.824 30.72-30.72 30.72zM622.336 856.064c-16.896 0-30.72-13.824-30.72-30.72 0-16.896 13.824-30.72 30.72-30.72 87.296 0 158.208-70.912 158.208-158.208 0-16.896 13.824-30.72 30.72-30.72 16.896 0 30.72 13.824 30.72 30.72 0 121.088-98.56 219.648-219.648 219.648zM811.264 438.528c-16.896 0-30.72-13.824-30.72-30.72 0-87.296-70.912-158.208-158.208-158.208-16.896 0-30.72-13.824-30.72-30.72s13.824-30.72 30.72-30.72c121.088 0 219.648 98.56 219.648 219.648 0 16.896-13.824 30.72-30.72 30.72z" fill="#8a8a8a" p-id="10175"></path><path d="M684.544 564.224H355.328c-16.896 0-30.72-13.824-30.72-30.72s13.824-30.72 30.72-30.72h329.216c16.896 0 30.72 13.824 30.72 30.72s-13.824 30.72-30.72 30.72z" fill="#8a8a8a" p-id="10176"></path></svg>
-                     <p class="text">交易金额（元）</p>
-                     <p class="number">{{ mainData.todayPayAmount ? mainData.todayPayAmount.toFixed(2) : 0.00.toFixed(2) }}</p>
-                  </div>
-                </el-col>
-                <el-col class="item" :span="6">
-                  <div class="do">
-                     <svg t="1641957839736" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6014" width="64" height="64"><path d="M624.6 211.8c58.3 0 105.7 46.3 105.7 103.2s-47.4 103.2-105.7 103.2S518.9 371.9 518.9 315s47.4-103.2 105.7-103.2m0-50c-86 0-155.7 68.6-155.7 153.2s69.7 153.2 155.7 153.2S780.3 399.6 780.3 315s-69.7-153.2-155.7-153.2zM427 314.9c0-24.3 5.9-47.3 16.5-67.7-22.8-19.5-52.9-31.4-85.8-31.4-71.2 0-128.9 55.2-128.9 123.4s57.7 123.4 128.9 123.4c43.2 0 81.4-20.3 104.8-51.6-22.3-26.2-35.5-59.6-35.5-96.1zM297.5 727.2v16.9c0-103.5 72.5-191.8 173.7-226.2-29.2-13.3-62.1-20.9-96.9-20.9h-28.5c-118.6 0-215.6 87.2-215.6 194.7v-13.6c0 56.3-4.5 102.3 57.6 102.3H298c-0.9-16.2-0.5-34.2-0.5-53.2z" p-id="6015" fill="#8a8a8a"></path><path d="M639.4 561c27.9 0 55.1 5.2 80.6 15.4 24.5 9.8 46.6 23.9 65.5 41.7 38.3 36.2 59.4 83.9 59.4 134.5h0.2c0.1 5.1 0.3 10 0.4 14.9 0.4 13 0.8 25.2 0.3 34.9-0.3 4.5-0.7 7.7-1.1 9.8-1.9 0.3-4.8 0.5-8.7 0.5H418.4c-8.1 0-12.1-1.1-13.7-1.6-0.7-1.6-2.3-5.9-3.4-15.6-1.3-11.8-1.3-26.8-1.2-42.8h0.1c0-50.6 21.1-98.3 59.4-134.5 18.9-17.9 40.9-31.9 65.5-41.7 25.5-10.2 52.6-15.4 80.6-15.4h33.7m0-50.1h-33.8c-140.5 0-255.5 108.3-255.5 241.6v-16.9c0 69.8-5.3 127 68.2 127H836c73.6 0 58.9-57.1 58.9-127v16.9c0-133.4-115-241.6-255.5-241.6z" p-id="6016" fill="#8a8a8a"></path><path d="M785.1 706.4c0 10.2-8.4 18.5-18.7 18.5h-37.9v36.4c0 10.2-8.4 18.5-18.7 18.5h-9.4c-10.3 0-18.7-8.3-18.7-18.5v-36.4h-39.8c-10.3 0-18.7-8.3-18.7-18.5v-9.2c0-10.2 8.4-18.5 18.7-18.5h39.8v-40.2c0-10.2 8.4-18.5 18.7-18.5h9.4c10.3 0 18.7 8.3 18.7 18.5v40.2h37.9c10.3 0 18.7 8.3 18.7 18.5v9.2z" p-id="6017" fill="#8a8a8a"></path></svg>
-                     <p class="text">新增会员数</p>
-                     <p class="number">{{ mainData.userCount }}</p>
-                  </div>
-                </el-col>
-                <el-col class="item" :span="6">
-                  <div class="do">
-                     <svg t="1641958094548" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9210" width="64" height="64"><path d="M888.34834 0.000284H127.658773A126.776854 126.776854 0 0 0 0.853475 126.777138v295.82214a126.776854 126.776854 0 0 0 126.805298 126.805298v169.045287a211.313719 211.313719 0 0 0 169.045287 207.075498v46.506653a42.268433 42.268433 0 0 0 84.508421 0V887.466705c0-23.324438-18.91555-42.268433-42.268433-42.268433a126.776854 126.776854 0 0 1-126.776854-126.776854v-169.045286h302.16525a241.3226 241.3226 0 0 0-42.268433 146.63107 42.268433 42.268433 0 1 0 84.536865 0c-1.706666-146.63107 120.433744-146.63107 120.433745-146.63107a42.268433 42.268433 0 0 0 42.268433-42.268433 54.527985 54.527985 0 0 0 0-8.021331 44.799988 44.799988 0 0 0 0-8.021331v-142.421294a48.611542 48.611542 0 0 1 42.268432-52.849763 48.611542 48.611542 0 0 1 42.268433 52.849763v369.777675a126.776854 126.776854 0 0 1-126.805298 126.776854c-23.324438 0-42.239988 18.91555-42.239988 42.268433v84.536865a42.268433 42.268433 0 0 0 84.508421 0v-46.506654a211.313719 211.313719 0 0 0 169.045286-207.075498v-169.045286a126.776854 126.776854 0 0 0 126.805298-126.776854v-295.82214A126.776854 126.776854 0 0 0 888.319895 0.000284z m42.268433 422.627439c0 23.324438-18.91555 42.239988-42.268433 42.239988v-116.195523a132.693296 132.693296 0 0 0-126.776854-137.386629 122.993744 122.993744 0 0 0-105.642637 62.151094 150.015958 150.015958 0 1 0-21.134216 76.060423v115.370635H127.630329c-23.324438 0-42.239988-18.91555-42.239988-42.239988v-295.82214c0-23.352882 18.91555-42.268433 42.268432-42.268433H888.319895c23.324438 0 42.268433 18.91555 42.268433 42.239988v295.82214z m-359.224789-147.91107a63.402649 63.402649 0 1 1-126.776854 0 63.402649 63.402649 0 0 1 126.776854 0z" p-id="9211" fill="#8a8a8a"></path></svg>
-                     <p class="text">活跃会员数</p>
-                     <p class="number">{{ mainData.activeUserCount }}</p>
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row class="line">
-                <el-col class="item second-line" :span="6">
-                  <div class="do">
-                    <svg t="1641957661068" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5770" width="64" height="64"><path d="M261.7 522.6h0.2c19.3 0 35-15.7 35-35s-15.7-35-35-35c-31.9 0-58.8-37.7-58.8-82.4s26.9-82.4 58.8-82.4c19.3 0 35-15.7 35-35s-15.7-35-35-35c-35.4 0-69.5 17.3-93.7 47.5-22.6 28.4-35.1 65.6-35.1 104.9s12.5 76.5 35.1 104.9c0.6 0.8 1.3 1.6 2 2.4-22.9 13.2-43.4 31-61.1 53.2-38.3 48-59.5 111.4-59.5 178.4 0 19.3 15.7 35 35 35s35-15.7 35-35c0-51.2 15.7-99.1 44.1-134.7 26.6-33.3 61.3-51.7 97.7-51.7 0.2 0 0.3-0.1 0.3-0.1zM914.8 530.7c-17.7-22.2-38.2-40-61.1-53.2 0.7-0.8 1.3-1.6 2-2.4 22.6-28.4 35.1-65.6 35.1-104.9s-12.5-76.5-35.1-104.9c-24.1-30.2-58.3-47.5-93.7-47.5-19.3 0-35 15.7-35 35s15.7 35 35 35c31.9 0 58.8 37.7 58.8 82.4s-26.9 82.4-58.8 82.4c-19.3 0-35 15.7-35 35s15.7 35 35 35H762.3c36.4 0 71.1 18.4 97.7 51.7 28.5 35.6 44.1 83.5 44.1 134.7 0 19.3 15.7 35 35 35s35-15.7 35-35c0.2-67-21-130.3-59.3-178.3z" p-id="5771" fill="#8a8a8a"></path><path d="M747.4 541c-30.9-30.8-66.9-54.7-106.1-70.8 40.3-34.7 65.8-86 65.8-143.2 0-104.2-84.8-188.9-188.9-188.9-104.2 0-188.9 84.8-188.9 188.9 0 57 25.4 108.2 65.4 142.9C355.2 486 318.9 510 287.8 541c-61.2 61.1-95.1 142.4-95.5 228.9V850.8c0 19.3 15.7 35 35 35h580.5c19.3 0 35-15.7 35-35v-80.2-0.8c-0.3-86.4-34.2-167.6-95.4-228.8zM518.2 208.1c65.6 0 118.9 53.4 118.9 118.9s-53.4 118.9-118.9 118.9S399.3 392.6 399.3 327s53.4-118.9 118.9-118.9z m254.7 607.8H262.3v-44.6-0.6c0.2-140.5 114.8-254.8 255.3-254.8s255 114.3 255.3 254.8v45.2z" p-id="5772" fill="#8a8a8a"></path></svg>
-                    <p class="text">总会员数</p>
-                    <p class="number">{{ mainData.totalUserCount }}</p>
-                  </div>
-                </el-col>
-                <el-col class="item second-line" :span="6">
-                  <div class="do">
-                    <svg t="1641969647517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3586" width="64" height="64"><path d="M128 544h128v288H128zM320 480h128v352H320zM512 320h128v512H512zM704 416h128v416H704z" p-id="3587" fill="#8a8a8a"></path><path d="M576 128L352 352h448L576 128z" p-id="3588" fill="#8a8a8a"></path></svg>
-                    <p class="text">总支付金额（元）</p>
-                    <p class="number">{{ mainData.totalPayAmount ? mainData.totalPayAmount : '0.00'}}</p>
-                  </div>
-                </el-col>
-                <el-col class="item second-line" :span="6">
-                  <div class="do">
-                    <svg t="1641957411945" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4780" width="64" height="64"><path d="M725.504 768C725.290667 768 725.333333 170.709333 725.333333 170.709333L640 170.666667V128h85.376C748.928 128 768 146.986667 768 170.709333v597.248A42.666667 42.666667 0 0 1 725.504 810.666667H170.496C147.029333 810.666667 128 791.68 128 767.957333V170.709333C128 147.114667 147.157333 128 170.624 128H256v42.666667H170.624L170.666667 767.957333 725.504 768z m124.949333-469.333333H810.666667v-42.666667h42.666666c23.573333 0 42.666667 18.986667 42.666667 42.709333v597.248A42.666667 42.666667 0 0 1 853.504 938.666667H298.496A42.453333 42.453333 0 0 1 256 896v-42.666667h42.666667v42.666667l554.666666-0.042667 0.021334-228.416c-0.042667-168.597333-0.021333-368.853333-0.021334-368.853333L850.453333 298.666667zM298.666667 341.333333h298.666666v42.666667H298.666667v-42.666667z m0 128h213.333333v42.666667H298.666667v-42.666667z m0-341.376C298.666667 104.405333 317.802667 85.333333 341.461333 85.333333h213.077334C578.176 85.333333 597.333333 104.490667 597.333333 127.957333v42.752A42.688 42.688 0 0 1 554.538667 213.333333h-213.077334A42.752 42.752 0 0 1 298.666667 170.709333V127.957333z m42.666666 42.752L554.538667 170.666667 554.666667 127.957333 341.461333 128 341.333333 170.709333z" fill="#8a8a8a" p-id="4781"></path></svg>
-                    <p class="text">总订单数（笔）</p>
-                    <p class="number">{{ mainData.totalOrderCount }}</p>
-                  </div>
-                </el-col>
-                <el-col class="item second-line" :span="6">
-                  <div class="do">
-                    <svg t="1641958462543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13815" width="64" height="64"><path d="M983.696 422.704A480 480 0 1 0 40.72 602.72a469.456 469.456 0 0 0 69.44 172.688 36.4 36.4 0 1 0 60.672-40.24 408.16 408.16 0 0 1 3.664-452.224 400.832 400.832 0 0 1 260.24-171.2 407.136 407.136 0 1 1-112.576 760.288 36.8 36.8 0 0 0-34.352 65.12 477.024 477.024 0 0 0 223.68 54.88 467.984 467.984 0 0 0 89.92-8.784A481.424 481.424 0 0 0 983.712 422.72z" p-id="13816" fill="#8a8a8a"></path><path d="M471.712 579.84h-130.768a36.944 36.944 0 0 0 0 73.888h130.768v116.8a36.944 36.944 0 1 0 73.888 0v-116.8h130.768a36.944 36.944 0 1 0 0-73.888H545.6v-71.664a22.784 22.784 0 0 0-0.736-7.392h131.504a36.944 36.944 0 1 0 0-73.888H341.68a36.944 36.944 0 1 0 0 73.888h131.504a25.152 25.152 0 0 0-0.736 7.392v71.664z" p-id="13817" fill="#8a8a8a"></path><path d="M405.968 383.312a37.104 37.104 0 0 0 52.464-52.464l-79.792-79.792a37.104 37.104 0 1 0-52.464 52.464z" p-id="13818" fill="#8a8a8a"></path><path d="M602.48 383.312l79.792-79.792a37.088 37.088 0 1 0-52.448-52.464l-79.792 79.792a36.576 36.576 0 0 0 0 52.464 37.936 37.936 0 0 0 52.448 0z" p-id="13819" fill="#8a8a8a"></path></svg>
-                    <p class="text">总支付人数</p>
-                    <p class="number">{{ mainData.totalPayUserCount }}</p>
-                  </div>
-                </el-col>
-              </el-row>
-          </div>
-      </div>
-      <div class="overview">
-        <div class="title">运营走势</div>
-        <div class="content">
-          <el-row>
-            <el-col class="item" :span="12">
-               <commonChart v-if="chartData1.length > 0" :title="chart1.title" :color="chart1.color" :chart-type="chart1.chartType" :head-list="chart1.header" :data-list="chartData1" width="100%" id="chart1" height="400px"/>
-            </el-col>
-            <el-col class="item" :span="12">
-               <commonChart v-if="chartData2.length > 0" :title="chart2.title" :color="chart2.color" :chart-type="chart2.chartType" :head-list="chart2.header" :data-list="chartData2" width="100%" id="chart2" height="400px"/>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="overview">
-        <div class="title">数据排行</div>
-        <div class="content">
-          <el-row>
-            <el-col class="item" :span="12">
-              <div class="title">商品销售排行</div>
-              <el-table v-loading="loading" :data="goodsList" style="border: solid 1px #cccccc;">
-                <el-table-column label="ID" prop="id" width="60"/>
-                <el-table-column label="商品名称" align="center">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.name }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="销售量" align="center" prop="num" />
-                <el-table-column label="销售金额（元）" align="center" prop="amount">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.amount.toFixed(2) }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-col>
-            <el-col class="item" :span="12">
-              <div class="title">用户消费排行</div>
-              <el-table v-loading="loading" :data="memberList" style="border: solid 1px #cccccc;">
-                <el-table-column label="ID" prop="id" width="60"/>
-                <el-table-column label="用户名" align="center" width="100">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.name }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="会员号" align="center" prop="userNo"/>
-                <el-table-column label="消费金额（元）" align="center" prop="amount" />
-              </el-table>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-  </div>
-</template>
-
-<script>
-import { getNumDayTime } from "@/utils/fuint";
-import { getStatisticData } from "@/api/home";
-import { getMainData, getTopData } from "@/api/statistic";
-import commonChart from '../components/charts/index';
-export default {
-  name: "Statistic",
-  components: {
-    commonChart
-  },
-  data() {
-    return {
-       loading: false,
-       startTime: getNumDayTime(30),
-       endTime: getNumDayTime(0),
-       mainData: { userCount: 0, totalUserCount: 0, orderCount: 0, totalOrderCount: 0, payAmount: 0, totalPayAmount: 0, activeUserCount: 0, totalPayUserCount: 0 },
-       chart1: { title: '近七日订单数量', color: '#ff5b57', chartType: 'bar', header: ['订单统计'] },
-       chart2: { title: '近七日会员活跃数', color: '#00acac', chartType: 'line', header: ['会员统计'] },
-       chartData1: [],
-       chartData2: [],
-       goodsList: [],
-       memberList: []
-    };
-  },
-  created() {
-    this.getMainData();
-    this.getChartsData();
-    this.getTopData();
-  },
-  methods: {
-    // 重置
-    reset() {
-       this.startTime = "";
-       this.endTime = "";
-    },
-    // 设置日期
-    setDay(day) {
-      this.startTime = getNumDayTime(day - 1);
-      this.endTime = getNumDayTime(0);
-      this.getMainData();
-      this.getTopData();
-    },
-    // 查询首页数据
-    getMainData() {
-      this.loading = true;
-      const param = { startTime: this.startTime, endTime: this.endTime }
-      getMainData(param).then(response => {
-          this.mainData = response.data;
-          this.loading = false
-        }
-      );
-    },
-    // 查询统计数据
-    getChartsData() {
-      const app = this;
-      app.loading = true;
-      // 近7日订单数量和活跃会员数量
-      getStatisticData({ tag : 'order,user_active' }).then(response => {
-          const data = response.data;
-          const labelData1 = data.data[0] ? data.data[0] : [];
-          const labelData2 = data.data[1] ? data.data[1] : [];
-          const dataList1 = [];
-          const dataList2 = [];
-
-          data.labels.forEach(function(label, index) {
-             const value1 = labelData1[index] ? labelData1[index] : 0;
-             const value2 = labelData2[index] ? labelData2[index] : 0;
-             dataList1.push( { name: label, value0: value1 } );
-             dataList2.push( { name: label, value0: value2 } );
-          })
-          app.chartData1 = dataList1;
-          app.chartData2 = dataList2;
-          app.loading = false;
-        }
-      )
-    },
-    // 查询排行榜数据
-    getTopData() {
-      const app = this;
-      app.loading = true;
-      const param = { startTime: this.startTime, endTime: this.endTime }
-      getTopData(param).then(response => {
-           app.loading = false;
-           app.goodsList = response.data.goodsList;
-           app.memberList = response.data.memberList;
-         }
-      );
-    }
-  }
-};
-</script>
-
-<style scoped lang="scss">
-   .overview {
-       min-height: 270px;
-       background: #FFFFFF;
-       margin-bottom: 0px;
-       box-shadow: 0 1px 2px #d5d7d8;
-       .title {
-         margin: 10px 0px 0px 0px;
-         padding: 10px 0px 0px 10px;
-         height: 44px;
-         border: 1px solid #e2e1e1;
-         background: #f4f4f4;
-         color: #333;
-         font-weight: bold;
-       }
-       .content {
-           padding: 15px;
-           border: solid 1px #d5d7d8;
-           .date-picker {
-             margin-left: 5px;
-             float: left;
-             margin-right: 10px;
-           }
-           .do-search {
-              margin-top: 2px;
-              float: left;
-              .ex {
-                color: #666666;
-                font-size: 12px;
-                width: 60px;
-                margin-left: 20px;
-                cursor: pointer;
-              }
-             .ex:hover {
-                color: #ff5b57;
-                font-weight: bold;
-             }
-           }
-           .item {
-               display: block;
-               border-right: none;
-               border-bottom: none;
-               min-height: 100px;
-               padding: 6px;
-               text-align: center;
-               cursor: pointer;
-               .do {
-                   border: solid 1px #cccccc;
-                   padding: 20px;
-                   border-radius: 2px;
-               }
-               .icon {
-                 height: 40px;
-                 width: 40px;
-                 display: block;
-                 padding: 5px;
-                 float: left;
-                 border: solid #8a8a8a 1px;
-                 border-radius: 30px;
-               }
-             .text {
-                 text-align: left;
-                 margin: 0px;
-                 text-indent: 10px;
-                 font-size: 14px;
-             }
-             .number {
-                 text-align: left;
-                 margin: 0px;
-                 font-weight: bold;
-                 text-indent: 10px;
-                 font-size: 18px;
-                 color: #ff5b57;
-             }
-           }
-       }
-   }
-</style>
-
diff --git a/fuintAdmin_zt/src/views/stock/index.vue b/fuintAdmin_zt/src/views/stock/index.vue
deleted file mode 100644
index a29c3472f..000000000
--- a/fuintAdmin_zt/src/views/stock/index.vue
+++ /dev/null
@@ -1,404 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" class="main-search" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="说明备注" prop="description">
-        <el-input
-          v-model="queryParams.description"
-          placeholder="请输入说明备注"
-          clearable
-          style="width: 180px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="操作类型"
-          clearable
-          style="width: 100px"
-        >
-          <el-option key="increase" label="入库" value="increase"/>
-          <el-option key="reduce" label="出库" value="reduce"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属店铺" prop="store">
-        <el-select
-          v-model="queryParams.storeId"
-          placeholder="所属店铺"
-          clearable
-          style="width: 180px"
-        >
-          <el-option :key="0" label="公共所有" v-if="!this.$store.getters.storeId" :value="0"/>
-          <el-option v-for="storeInfo in storeOptions" :key="storeInfo.id" :label="storeInfo.name" :value="storeInfo.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['goods:goods:index']"
-        >新增入库</el-button>
-        <el-button
-          type="common"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleReduce"
-          v-hasPermi="['goods:goods:index']"
-        >新增出库</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="80"/>
-      <el-table-column label="类型" align="center" width="80" prop="type">
-        <template slot-scope="scope">
-          <span v-if="scope.row.type == 'reduce'">出库</span>
-          <span v-if="scope.row.type == 'increase'">入库</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="所属店铺" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.storeName">{{ scope.row.storeName }}</span>
-          <span v-else>公共所有</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="说明备注" align="center" prop="description">
-        <template slot-scope="scope">
-           <span>{{ scope.row.description ? scope.row.description : '--' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            v-hasPermi="['goods:goods:index']"
-            v-if="storeId == scope.row.storeId || storeId == 0"
-            @click="handleDetail(scope.row)"
-          >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['goods:goods:index']"
-            v-if="storeId == scope.row.storeId || storeId == 0"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!--编辑商品库存-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属店铺" prop="storeId">
-              <el-select class="input" v-model="form.storeId" clearable placeholder="请选择所属店铺">
-                <el-option :key="0" label="公共所有" v-if="storeId == 0" :value="0"/>
-                <el-option
-                  v-for="item in storeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-              <div class="form-tips">提示：未选择则属于公共所有</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" rows="3" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="mb5">
-         <el-button v-if="!isView" type="primary" size="mini" @click="selectGoods()">添加商品</el-button>
-      </div>
-      <el-table ref="goodsTables" v-loading="loading" border :data="goodsList">
-        <el-table-column label="商品条码" prop="goodsNo"/>
-        <el-table-column label="主图" align="center" width="100">
-          <template slot-scope="scope">
-            <img class="list-img" :src="imagePath + scope.row.logo">
-          </template>
-        </el-table-column>
-        <el-table-column label="商品名称" align="center" prop="name">
-          <template slot-scope="scope">
-            <span>{{ scope.row.name ? scope.row.name : '--' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品规格" prop="spec">
-          <template slot-scope="scope">
-           <span v-if="scope.row.specList">
-              <span class="spec-item" v-for="spec in scope.row.specList">{{ spec.value }}</span>
-           </span>
-            <span v-else>--</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" prop="type">
-          <template slot-scope="scope">
-            <el-input-number :disabled="isView" style="width: 150px" v-model="scope.row.num" :min="0"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              v-hasPermi="['goods:goods:index']"
-              :disabled="isView"
-              v-if="storeId == scope.row.storeId || storeId == 0"
-              @click="deleteGoods(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="!isView" @click="submitForm">提交</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 选择商品组件 start-->
-    <selectGoodsDialog :show-dialog="openSelectGoodsDialog" :storeId="form.storeId" :dataList="goodsList" @submit="doSelectGoods" @closeDialog="closeSelectGoods"></selectGoodsDialog>
-    <!-- 选择商品组件 end-->
-  </div>
-</template>
-
-<script>
-import { getStockList, saveStock, deleteStock, getStockInfo } from "@/api/stock";
-import selectGoodsDialog from './selectGoodsDialog';
-export default {
-  name: "StockIndex",
-  components: {
-    selectGoodsDialog
-  },
-  data() {
-    return {
-      isView: false,
-      openSelectGoodsDialog: false,
-      storeId: this.$store.getters.storeId,
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 图片根目录
-      imagePath: "",
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      goodsList: [],
-      // 店铺列表
-      storeOptions: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'sort', order: 'descending'},
-      // 表单参数
-      form: { storeId: this.$store.getters.storeId, type: 'increase', id: '', description: '', status: "A", goodsList: [] },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        description: '',
-        type: ''
-      },
-      // 表单校验
-      rules: {}
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询分类列表
-    getList() {
-      this.loading = true;
-      getStockList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.imagePath = response.data.imagePath;
-          this.storeOptions = response.data.storeList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
-        return deleteStock(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增入库按钮操作
-    handleAdd() {
-      this.reset();
-      this.isView = false;
-      this.open = true;
-      this.form.type = 'increase';
-      this.title = "新增入库";
-    },
-    // 新增出库按钮操作
-    handleReduce() {
-      this.reset();
-      this.isView = false;
-      this.open = true;
-      this.form.type = 'reduce';
-      this.title = "新增出库";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        storeId: 0,
-        status: "A",
-        description: "",
-        goodsList: []
-      };
-      this.goodsList = [];
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 选择商品
-    selectGoods() {
-      this.openSelectGoodsDialog = true;
-    },
-    closeSelectGoods() {
-       this.openSelectGoodsDialog = false;
-    },
-    doSelectGoods(selectData) {
-      const app = this;
-      app.openSelectGoodsDialog = false;
-      app.goodsList = selectData;
-      app.goodsList.forEach(function(goods, key) {
-         if (!goods.num) {
-             app.$set(app.goodsList[key], 'num', 1);
-         }
-      })
-    },
-    // 删除商品操作
-    deleteGoods(row) {
-      const dataList = [];
-      this.goodsList.forEach(function(item) {
-         if (item.id != row.id || item.skuId != row.skuId) {
-             dataList.push(item);
-         }
-      })
-      this.goodsList = dataList;
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            if (!this.goodsList || this.goodsList.length < 1) {
-                this.$modal.alert("请先添加商品");
-                return false;
-            }
-            this.form.goodsList = this.goodsList;
-            saveStock(this.form).then(response => {
-               this.$modal.msgSuccess("新增成功");
-               this.open = false;
-               this.getList();
-               this.reset();
-            });
-        }
-      });
-    },
-    // 详情按钮操作
-    handleDetail(row) {
-       this.reset();
-       this.isView = true;
-       const id = row.id;
-        getStockInfo(id).then(response => {
-            this.form = response.data.stockInfo;
-            this.goodsList = response.data.goodsList;
-            this.open = true;
-            this.title = "记录详情";
-        });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.id
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-         return deleteStock(row.id, 'D');
-      }).then(() => {
-         this.getList();
-         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/stock/selectGoodsDialog.vue b/fuintAdmin_zt/src/views/stock/selectGoodsDialog.vue
deleted file mode 100644
index dd5e9752b..000000000
--- a/fuintAdmin_zt/src/views/stock/selectGoodsDialog.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <el-dialog class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
-    <el-form :model="params" ref="queryForm" class="main-search" size="small" :inline="true" label-width="100px">
-      <el-form-item label="商品关键字" prop="keyword">
-        <el-input
-          v-model="params.keyword"
-          placeholder="请输入商品关键字"
-          clearable
-          style="width: 200px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查找商品</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="goodsTables" v-loading="loading" border :data="goodsList">
-      <el-table-column width="55" align="center" prop="checked" label="选择">
-        <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.checked" @change="checkRow($event, scope.$index, scope.row)" ></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column label="主图" align="center" width="100">
-        <template slot-scope="scope">
-          <img class="list-img" :src="imagePath + scope.row.logo">
-        </template>
-      </el-table-column>
-      <el-table-column label="商品条码" width="180" prop="goodsNo"/>
-      <el-table-column label="商品名称" align="center" prop="name">
-        <template slot-scope="scope">
-          <span>{{ scope.row.name ? scope.row.name : '--' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品规格" prop="spec">
-        <template slot-scope="scope">
-           <span v-if="scope.row.specList">
-              <span class="spec-item" v-for="spec in scope.row.specList">{{ spec.value }}</span>
-           </span>
-          <span v-else>--</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="库存数量" align="center" width="120" prop="type">
-        <template slot-scope="scope">
-          <span>{{ scope.row.stock ? scope.row.stock : '0' }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="params.page"
-      :limit.sync="params.pageSize"
-      @pagination="getGoodsList"
-    />
-
-    <div class="clearfix"></div>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doSave()">保存</el-button>
-      <el-button @click="close()">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { selectGoodsList } from "@/api/goods";
-export default {
-  props: {
-    showDialog: {
-      type:[Boolean],
-      default:()=>false
-    },
-    storeId: {
-      type:[Number],
-      default:()=>"0"
-    },
-    dataList: {
-      type:[Array],
-      default:()=> []
-    }
-  },
-  watch: {
-    showDialog(value) {
-      if (value) {
-          this.getGoodsList();
-      }
-    }
-  },
-  data(){
-    return {
-      params:  {
-        page: 1,
-        pageSize: 10,
-        keyword: ''
-      },
-      selectData: [],
-      loading: false,
-      goodsList: [],
-      // 图片根目录
-      imagePath: "",
-      // 总条数
-      total: 0
-    }
-  },
-  methods: {
-    // 获取商品列表
-    getGoodsList() {
-      const app = this;
-      app.params.storeId = app.storeId;
-      selectGoodsList(this.params).then( response => {
-        if (response.data) {
-            app.goodsList = response.data.paginationResponse.content;
-            app.goodsList.forEach(function(goods) {
-                app.$set(goods, 'checked', false);
-            })
-            // 回显
-            app.goodsList.forEach(function(item, key) {
-                app.dataList.forEach(function(row) {
-                    if (item.id == row.id && item.skuId == row.skuId) {
-                        app.$set(app.goodsList[key], 'checked', true);
-                    }
-                })
-            })
-            app.total = response.data.paginationResponse.totalElements;
-            app.imagePath = response.data.imagePath;
-        }
-      })
-    },
-    // 选择一行
-    checkRow(checked, index, row) {
-       const app = this;
-       if (checked) {
-           let isExist  = false;
-           app.selectData.forEach(function(item) {
-              if (item.id == row.id && item.skuId == row.skuId) {
-                  isExist = true;
-              }
-           })
-           if (!isExist) {
-               app.selectData.push(row);
-           }
-       } else {
-           // 删除
-           const dataList = [];
-           app.$set(app.goodsList[index], 'checked', false);
-           app.goodsList.forEach(function(item) {
-              if (item.checked) {
-                  dataList.push(item);
-              }
-           })
-           app.selectData = dataList;
-       }
-    },
-    // 查询商品
-    handleQuery() {
-      this.getGoodsList();
-    },
-    close() {
-      this.$emit('closeDialog');
-    },
-    doSave() {
-      this.$emit('submit', this.selectData);
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.spec-item {
-   display: block;
-   float: left;
-   margin-right: 5px;
-}
-.common-dialog >>> .el-upload--picture-card {
-   width: 60px;
-   height: 50px;
-   line-height: 60px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/store/list.vue b/fuintAdmin_zt/src/views/store/list.vue
deleted file mode 100644
index 26cf87ea4..000000000
--- a/fuintAdmin_zt/src/views/store/list.vue
+++ /dev/null
@@ -1,512 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="店铺名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入店铺名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['store:add']"
-        >新增店铺</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id"  width="55"/>
-      <el-table-column label="所属商户" align="center" prop="merchantName" width="160">
-        <template slot-scope="scope">
-          <span>{{ scope.row.merchantName ? scope.row.merchantName : '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="店铺名称" align="center" prop="name" />
-      <el-table-column label="默认店铺" align="center" prop="isDefault">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.isDefault"
-            active-value="Y"
-            inactive-value="N"
-            disabled
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="联系人" align="center" prop="contact"/>
-      <el-table-column label="手机号" align="center" prop="phone"/>
-      <el-table-column label="地址" align="center" prop="address"/>
-      <el-table-column label="营业时间" align="center" prop="hours" />
-      <el-table-column label="创建时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-      <template slot-scope="scope">
-        <el-switch
-          v-model="scope.row.status"
-          active-value="A"
-          inactive-value="N"
-          v-hasPermi="['store:add']"
-          @change="handleStatusChange(scope.row)"
-        ></el-switch>
-      </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['store:add']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['store:add']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="店铺名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入店铺名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="9">
-            <el-form-item label="商户logo" prop="logo">
-              <el-upload
-                :action="uploadAction"
-                list-type="picture-card"
-                :class="{hide:hideUpload}"
-                :file-list="uploadFiles"
-                :auto-upload="true"
-                :show-file-list="false"
-                :headers="uploadHeader"
-                :on-success="handleUploadSuccess">
-                <img
-                  v-if="form.logo"
-                  :src="imagePath + form.logo"
-                  class="list-img"
-                />
-                <i v-if="!form.logo" class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改）</p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="是否默认店铺">
-              <el-radio-group v-model="form.isDefault">
-                <el-radio key="N" label="N" value="N">否</el-radio>
-                <el-radio key="Y" label="Y" value="Y">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属商户" prop="merchantId">
-              <el-select v-model="form.merchantId" placeholder="请选择所属商户">
-                <el-option
-                  v-for="item in merchantOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="联系人姓名" prop="contact">
-              <el-input v-model="form.contact" placeholder="请输入联系人姓名" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="联系人电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系人电话" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="店铺详细地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入店铺详细地址" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="营业时间" prop="hours">
-              <el-input v-model="form.hours" placeholder="请输入店铺营业时间" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="店铺纬度" prop="latitude">
-              <el-input v-model="form.latitude" placeholder="请输入店铺纬度，为空则程序自己计算" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="店铺经度" prop="longitude">
-              <el-input v-model="form.longitude" placeholder="请输入店铺经度，为空则程序自己计算" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="9">
-            <el-form-item label="营业执照" prop="license">
-              <el-upload
-                :action="uploadAction"
-                list-type="picture-card"
-                :class="{hide:hideUpload}"
-                :file-list="uploadFiles"
-                :auto-upload="true"
-                :show-file-list="false"
-                :headers="uploadHeader"
-                :on-success="handleUploadLicenseSuccess">
-                <img
-                  v-if="form.license"
-                  :src="imagePath + form.license"
-                  class="list-img"
-                />
-                <i v-if="!form.license" class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <p class="form-tips">（提示：点击图片修改）</p>
-          <p class="form-tips"><a v-if="form.license" class="link" target="_blank" :href="imagePath + form.license">（查看大图）</a></p>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="统一社会信用码" prop="creditCode">
-              <el-input v-model="form.creditCode" placeholder="请输入统一社会信用代码" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="银行名称" prop="bankName">
-              <el-input v-model="form.bankName" placeholder="请输入银行名称" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="银行卡账户名" prop="bankCardName">
-              <el-input v-model="form.bankCardName" placeholder="请输入银行卡账户名" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="银行卡卡号" prop="bankCardNo">
-              <el-input v-model="form.bankCardNo" placeholder="请输入银行卡卡号" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
-          <el-col :span="24">
-            <el-form-item label="微信支付商户号" prop="wxMchId">
-              <el-input v-model="form.wxMchId" placeholder="请输入微信商户号，为空则资金进入平台账户" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
-          <el-col :span="24">
-            <el-form-item label="微信支付APIv2" prop="wxMchId">
-              <el-input v-model="form.wxApiV2" placeholder="请输入微信支付APIv2，为空则资金进入平台账户" maxlength="32"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row v-hasPermi="['store:paySetting']">
-          <el-col :span="24">
-            <el-form-item label="支付宝appId" prop="alipayAppId">
-              <el-input v-model="form.alipayAppId" placeholder="请输入微信商户号，为空则资金进入平台账户" maxlength="100"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
-          <el-col :span="24">
-            <el-form-item label="支付宝应用私钥" prop="alipayPrivateKey">
-              <el-input v-model="form.alipayPrivateKey" placeholder="请输入微信支付APIv2，为空则资金进入平台账户" maxlength="10000"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-hasPermi="['store:paySetting']">
-          <el-col :span="24">
-            <el-form-item label="支付宝公钥" prop="alipayPublicKey">
-              <el-input v-model="form.alipayPublicKey" placeholder="请输入微信支付APIv2，为空则资金进入平台账户" maxlength="10000"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注信息">
-              <el-input v-model="form.description" type="textarea" placeholder="请输入备注信息内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { getStoreList, updateStoreStatus, getStoreInfo, saveStore } from "@/api/store";
-export default {
-  name: "StoreList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 默认排序
-      defaultSort: {prop: 'operTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', name: '', logo: '', merchantId: this.$store.getters.merchantId, wxMchId: '', wxApiV2: '', alipayAppId: '', alipayPrivateKey: '', alipayPublicKey: '' ,license: '', creditCode:'', bankName: '', bankCardName: '', bankCardNo: '', isDefault: "N", status: "A" },
-      // 上传地址
-      uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
-      // 隐藏上传
-      hideUpload: false,
-      // 上传文件列表
-      uploadFiles: [],
-      uploadHeader: { 'Access-Token' : getToken() },
-      merchantOptions: [],
-      // 图片根目录
-      imagePath: "",
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        name: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "店铺名称不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '店铺名称长度必须介于 2 和 30 之间', trigger: 'blur' }
-        ],
-        merchantId: [
-          { required: true, message: "所属商户不能为空", trigger: "blur" },
-        ],
-        contact: [
-          { required: true, message: "联系人姓名不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '联系人姓名长度必须介于 2 和 30 之间', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, message: "联系人电话不能为空", trigger: "blur" },
-          { min: 6, max: 30, message: '联系人电话长度必须介于 6 和 30 之间', trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getStoreList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.merchantOptions = response.data.merchantList;
-          this.imagePath = response.data.imagePath;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "1" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"店铺吗？').then(function() {
-        return updateStoreStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.operId)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增店铺";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        name: "",
-        merchantId: this.$store.getters.merchantId,
-        status: "A",
-        isDefault: "N"
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveStore(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveStore(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getStoreInfo(id).then(response => {
-        this.form = response.data.storeInfo;
-        this.open = true;
-        this.title = "编辑店铺";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.name || this.id;
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return updateStoreStatus(row.id, 'D');
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleUploadSuccess(file) {
-      this.form.logo = file.data.fileName;
-    },
-    handleUploadLicenseSuccess(file) {
-      this.form.license = file.data.fileName;
-    }
-  }
-};
-</script>
-<style scoped lang="scss">
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/subMessage/index.vue b/fuintAdmin_zt/src/views/subMessage/index.vue
deleted file mode 100644
index 76a9e7918..000000000
--- a/fuintAdmin_zt/src/views/subMessage/index.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键字" prop="content">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="消息类型" prop="title">
-        <template slot-scope="scope">
-          <span class="msg-type">
-            <svg-icon icon-class="wechat" class="wechat-icon" />{{ scope.row.title }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="消息键值" align="center" prop="key">
-        <template slot-scope="scope">
-          <span v-if="scope.row.key">
-              <span>{{ scope.row.key }}</span>
-          </span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" width="100" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 'A'" class="status-active">启用</span>
-          <span v-else>禁用</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['subMessage:edit']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="消息类型" prop="name">
-               <el-input v-model="form.name" placeholder="请输入消息类型" disabled maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板ID" prop="templateId">
-              <el-input v-model="form.templateId" placeholder="请输入模板ID，小程序订阅消息模板templateId" maxlength="120" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="模板编号" prop="tid">
-              <el-input v-model="form.tid" placeholder="请输入模板编号，小程序订阅消息模板编号tid" maxlength="100" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-for="(para, key) in form.params" :key="key">
-          <el-col :span="24">
-            <el-form-item :label="para.name + '参数'" :prop="para.key">
-              <el-input v-model="para.value" :placeholder="paramTips" maxlength="259" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getSubMessageList, getSubMessageInfo, saveSubMessage, deleteSubMessage } from "@/api/subMessage";
-export default {
-  name: "SubMessageIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { key: '', templateId: '', tid: '', name: '', params: [] },
-      paramTips: "格式如：{{thing1.DATA}}，详见小程序模板消息详情",
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        title: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "模板名称不能为空", trigger: "blur" },
-        ],
-        templateId: [
-          { required: true, message: "模板ID不能为空", trigger: "blur" },
-        ],
-        tid: [
-          { required: true, message: "模板编号不能为空", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getSubMessageList(this.queryParams).then( response => {
-          this.list = response.data.dataList;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增订阅消息模板";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        key: "",
-        name: "",
-        tid: "",
-        templateId: "",
-        params: []
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-            saveSubMessage(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const key = row.key;
-      getSubMessageInfo(key).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "编辑订阅消息";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除ID等于' + row.id + '的数据项？').then(function() {
-        return deleteSubMessage(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-.msg-type {
-  padding: 20px;
-  display: block;
-  border:1px solid #cccccc;
-  width: 140px;
-  border-radius: 2px;
-  color:#080808;
-  .wechat-icon {
-    color: #52c41a;
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/system/account/authRole.vue b/fuintAdmin_zt/src/views/system/account/authRole.vue
deleted file mode 100644
index bc5bbfaf0..000000000
--- a/fuintAdmin_zt/src/views/system/account/authRole.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <div class="app-container">
-    <h4 class="form-header h4">基本信息</h4>
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-row>
-        <el-col :span="8" :offset="2">
-          <el-form-item label="用户昵称" prop="nickName">
-            <el-input v-model="form.nickName" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" :offset="2">
-          <el-form-item label="登录账号" prop="userName">
-            <el-input  v-model="form.userName" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <h4 class="form-header h4">角色信息</h4>
-    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((page-1)*pageSize,page*pageSize)">
-      <el-table-column label="序号" type="index" align="center">
-        <template slot-scope="scope">
-          <span>{{(page - 1) * pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-      <el-table-column label="角色编号" align="center" prop="roleId" />
-      <el-table-column label="角色名称" align="center" prop="roleName" />
-      <el-table-column label="权限字符" align="center" prop="roleKey" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="page" :limit.sync="pageSize" />
-
-    <el-form label-width="100px">
-      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
-        <el-button type="primary" @click="submitForm()">提交</el-button>
-        <el-button @click="close()">返回</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { getAuthRole, updateAuthRole } from "@/api/system/account";
-
-export default {
-  name: "AuthRole",
-  data() {
-    return {
-       // 遮罩层
-      loading: true,
-      // 分页信息
-      total: 0,
-      page: 1,
-      pageSize: 10,
-      // 选中角色编号
-      roleIds:[],
-      // 角色信息
-      roles: [],
-      // 用户信息
-      form: {}
-    };
-  },
-  created() {
-    const userId = this.$route.params && this.$route.params.userId;
-    if (userId) {
-      this.loading = true;
-      getAuthRole(userId).then((response) => {
-        this.form = response.user;
-        this.roles = response.roles;
-        this.total = this.roles.length;
-        this.$nextTick(() => {
-          this.roles.forEach((row) => {
-            if (row.flag) {
-              this.$refs.table.toggleRowSelection(row);
-            }
-          });
-        });
-        this.loading = false;
-      });
-    }
-  },
-  methods: {
-    /** 单击选中行数据 */
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.roleIds = selection.map((item) => item.roleId);
-    },
-    // 保存选中的数据编号
-    getRowKey(row) {
-      return row.roleId;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      const userId = this.form.userId;
-      const roleIds = this.roleIds.join(",");
-      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
-        this.$modal.msgSuccess("授权成功");
-        this.close();
-      });
-    },
-    /** 关闭按钮 */
-    close() {
-      const obj = { path: "/system/user" };
-      this.$tab.closeOpenPage(obj);
-    },
-  },
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/account/index.vue b/fuintAdmin_zt/src/views/system/account/index.vue
deleted file mode 100644
index 33df1debc..000000000
--- a/fuintAdmin_zt/src/views/system/account/index.vue
+++ /dev/null
@@ -1,504 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--用户数据-->
-      <el-col :span="24" :xs="24">
-        <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名" prop="accountName">
-            <el-input
-              v-model="queryParams.accountName"
-              placeholder="请输入用户名"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="真实姓名" prop="accountName">
-            <el-input
-              v-model="queryParams.realName"
-              placeholder="请输入真实姓名"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="状态" prop="accountStatus">
-            <el-select
-              v-model="queryParams.accountStatus"
-              placeholder="用户状态"
-              clearable
-              style="width: 240px"
-            >
-              <el-option key="1" label="启用" value="1"/>
-              <el-option key="0" label="禁用" value="0"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:account:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              v-hasPermi="['system:account:edit']"
-              @click="handleUpdate"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              v-hasPermi="['system:account:delete']"
-              @click="handleDelete"
-            >删除</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="ID" align="center" key="id" prop="id" v-if="columns[0].visible" />
-          <el-table-column label="用户名" align="center" key="accountName" prop="accountName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="真实姓名" align="center" key="realName" prop="realName" />
-          <el-table-column label="所属商户" align="center" prop="merchantName" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.merchantName ? scope.row.merchantName : '-' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="所属店铺" align="center" prop="storeName" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.storeName ? scope.row.storeName : '-' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" align="center" key="accountStatus" v-if="columns[2].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.accountStatus"
-                :active-value="1"
-                :inactive-value="0"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createDate" v-if="columns[3].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createDate) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                v-hasPermi="['system:account:edit']"
-                @click="handleUpdate(scope.row)"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                v-hasPermi="['system:account:delete']"
-                @click="handleDelete(scope.row)"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:account:resetPwd', 'system:account:edit']">
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:account:edit']">重置密码</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-
-    <!-- 添加或修改管理员配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="用户名" prop="accountName">
-              <el-input v-model="form.accountName" placeholder="请输入用户名" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item v-if="form.id == undefined" label="登录密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入登录密码" maxlength="30" show-password/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item v-if="form.id == undefined" label="确认密码" prop="password1">
-              <el-input v-model="form.password1" placeholder="请输入确认密码" type="password" maxlength="30" show-password/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="真实姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入真实姓名" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.accountStatus">
-                <el-radio :key="1" :label="1" :value="1">启用</el-radio>
-                <el-radio :key="0" :label="0" :value="0">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="分配角色">
-              <el-select v-model="form.roleIds" multiple @change="$forceUpdate()" placeholder="请选择角色">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属商户">
-              <el-select v-model="form.merchantId" placeholder="请选择所属商户">
-                <el-option
-                  v-for="item in merchantOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="所属店铺">
-              <el-select v-model="form.storeId" placeholder="请选择所属店铺" @change="getStaffList()">
-                <el-option :key="0" label="全部店铺" :value="0"></el-option>
-                <el-option
-                  v-for="item in storeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  :disabled="item.status !== 'A'"
-                ></el-option>
-              </el-select>
-              <p class="form-tips">（提示：不选择则可管理所有店铺的数据）</p>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="店铺员工">
-              <el-select v-model="form.staffId" placeholder="请选择店铺员工">
-                <el-option :key="0" label="请选择员工" :value="0"
-                ></el-option>
-                <el-option
-                  v-for="item in staffOptions"
-                  :key="item.id"
-                  :label="item.realName"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getStoreStaffList } from "@/api/staff";
-import { getAccountList, getAccount, delAccount, addAccount, updateAccount, resetAccountPwd, changeAccountStatus } from "@/api/system/account";
-import { getToken } from "@/utils/auth";
-
-export default {
-  name: "Account",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: null,
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 角色选项
-      roleOptions: [],
-      storeOptions: [],
-      staffOptions: [],
-      merchantOptions: [],
-      // 表单参数
-      form: { id: "", accountName: "", realName: "", accountStatus: 1, roleIds: [], merchantId: this.$store.getters.merchantId, storeId: this.$store.getters.storeId, staffId: 0 },
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { 'Access-Token': getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/account/importData"
-      },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        accountName: "",
-        realName: "",
-        accountStatus: ""
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `状态`, visible: true },
-        { key: 4, label: `创建时间`, visible: true }
-      ],
-      // 表单校验
-      rules: {
-        accountName: [
-          { required: true, message: "用户名不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '用户名长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 30, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        password1: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { min: 5, max: 30, message: '确认密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询账户列表
-    getList() {
-      this.loading = true;
-      getAccountList(this.queryParams).then(response => {
-          this.userList = response.data.records;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.accountStatus == "1" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.accountName + '"用户吗？').then(function() {
-        return changeAccountStatus(row.id, row.accountStatus);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.accountStatus = row.accountStatus === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        accountName: "",
-        password: "",
-        accountStatus: 1,
-        realName: "",
-        roleIds: [],
-        storeId: this.$store.getters.storeId,
-        merchantId: this.$store.getters.merchantId
-      };
-      this.resetForm("form");
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.queryParams.accountName = '';
-      this.queryParams.accountStatus = '';
-      this.queryParams.realName = '';
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleResetPwd":
-          this.handleResetPwd(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      getAccount(-1).then(response => {
-        this.roleOptions = response.data.roles;
-        this.storeOptions = response.data.stores;
-        this.merchantOptions = response.data.merchants;
-        this.open = true;
-        this.title = "新增管理员";
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      const app = this;
-      app.reset();
-      const id = row.id || this.ids;
-      getAccount(id).then(response => {
-          app.form = response.data.account
-          app.form.roleIds = response.data.roleIds;
-          app.roleOptions = response.data.roles;
-          app.storeOptions = response.data.stores;
-          app.merchantOptions = response.data.merchants;
-          app.getStaffList();
-          app.open = true;
-          app.title = "修改管理员";
-          app.form.password = "";
-      });
-    },
-    // 重置密码按钮操作
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.accountName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
-      }).then(({ value }) => {
-          resetAccountPwd(row.id, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
-    },
-    // 店铺员工列表
-    getStaffList() {
-      const storeId = this.form.storeId ? this.form.storeId : 0;
-      getStoreStaffList(storeId).then(response => {
-         this.staffOptions = response.data.staffList;
-      });
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-            updateAccount(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addAccount(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const userIds = row.id || this.ids;
-      this.$modal.confirm('您确认删除用户ID为"' + userIds + '"的账户？').then(function() {
-        return delAccount(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/account/profile/index.vue b/fuintAdmin_zt/src/views/system/account/profile/index.vue
deleted file mode 100644
index e73984cf6..000000000
--- a/fuintAdmin_zt/src/views/system/account/profile/index.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <el-col :span="6" :xs="24">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>个人信息</span>
-          </div>
-          <div>
-            <div class="text-center">
-              <userAvatar :user="user" />
-            </div>
-            <ul class="list-group list-group-striped">
-              <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
-                <div class="pull-right">{{ user.userName }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ user.phonenumber }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="email" />用户邮箱
-                <div class="pull-right">{{ user.email }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
-                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="peoples" />所属角色
-                <div class="pull-right">{{ roleGroup }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="date" />创建日期
-                <div class="pull-right">{{ user.createTime }}</div>
-              </li>
-            </ul>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="18" :xs="24">
-        <el-card>
-          <div slot="header" class="clearfix">
-            <span>基本资料</span>
-          </div>
-          <el-tabs v-model="activeTab">
-            <el-tab-pane label="基本资料" name="userinfo">
-              <userInfo :user="user" />
-            </el-tab-pane>
-            <el-tab-pane label="修改密码" name="resetPwd">
-              <resetPwd :user="user" />
-            </el-tab-pane>
-          </el-tabs>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import userAvatar from "./userAvatar";
-import userInfo from "./userInfo";
-import resetPwd from "./resetPwd";
-import { getAccountProfile } from "@/api/system/account";
-
-export default {
-  name: "Profile",
-  components: { userAvatar, userInfo, resetPwd },
-  data() {
-    return {
-      user: {},
-      roleGroup: {},
-      postGroup: {},
-      activeTab: "userinfo"
-    };
-  },
-  created() {
-    this.getUser();
-  },
-  methods: {
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data;
-        this.roleGroup = response.roleGroup;
-        this.postGroup = response.postGroup;
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/account/profile/resetPwd.vue b/fuintAdmin_zt/src/views/system/account/profile/resetPwd.vue
deleted file mode 100644
index 96db74ad8..000000000
--- a/fuintAdmin_zt/src/views/system/account/profile/resetPwd.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import { updateAccountPwd } from "@/api/system/account";
-
-export default {
-  data() {
-    const equalToPassword = (rule, value, callback) => {
-      if (this.user.newPassword !== value) {
-        callback(new Error("两次输入的密码不一致"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      user: {
-        oldPassword: undefined,
-        newPassword: undefined,
-        confirmPassword: undefined
-      },
-      // 表单校验
-      rules: {
-        oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
-        ],
-        newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
-        ],
-        confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
-        ]
-      }
-    };
-  },
-  methods: {
-    submit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
-          });
-        }
-      });
-    },
-    close() {
-      this.$tab.closePage();
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/account/profile/userAvatar.vue b/fuintAdmin_zt/src/views/system/account/profile/userAvatar.vue
deleted file mode 100644
index bbcbb80f5..000000000
--- a/fuintAdmin_zt/src/views/system/account/profile/userAvatar.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div>
-    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
-      <el-row>
-        <el-col :xs="24" :md="12" :style="{height: '350px'}">
-          <vue-cropper
-            ref="cropper"
-            :img="options.img"
-            :info="true"
-            :autoCrop="options.autoCrop"
-            :autoCropWidth="options.autoCropWidth"
-            :autoCropHeight="options.autoCropHeight"
-            :fixedBox="options.fixedBox"
-            @realTime="realTime"
-            v-if="visible"
-          />
-        </el-col>
-        <el-col :xs="24" :md="12" :style="{height: '350px'}">
-          <div class="avatar-upload-preview">
-            <img :src="previews.url" :style="previews.img" />
-          </div>
-        </el-col>
-      </el-row>
-      <br />
-      <el-row>
-        <el-col :lg="2" :md="2">
-          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
-            <el-button size="small">
-              选择
-              <i class="el-icon-upload el-icon--right"></i>
-            </el-button>
-          </el-upload>
-        </el-col>
-        <el-col :lg="{span: 1, offset: 2}" :md="2">
-          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
-        </el-col>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
-          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
-        </el-col>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
-          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
-        </el-col>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
-          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
-        </el-col>
-        <el-col :lg="{span: 2, offset: 6}" :md="2">
-          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import store from "@/store";
-import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/system/account";
-
-export default {
-  components: { VueCropper },
-  props: {
-    user: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      // 是否显示弹出层
-      open: false,
-      // 是否显示cropper
-      visible: false,
-      // 弹出层标题
-      title: "修改头像",
-      options: {
-        img: store.getters.avatar, //裁剪图片的地址
-        autoCrop: true, // 是否默认生成截图框
-        autoCropWidth: 200, // 默认生成截图框宽度
-        autoCropHeight: 200, // 默认生成截图框高度
-        fixedBox: true // 固定截图框大小 不允许改变
-      },
-      previews: {}
-    };
-  },
-  methods: {
-    // 编辑头像
-    editCropper() {
-      this.open = true;
-    },
-    // 打开弹出层结束时的回调
-    modalOpened() {
-      this.visible = true;
-    },
-    // 覆盖默认的上传行为
-    requestUpload() {
-    },
-    // 向左旋转
-    rotateLeft() {
-      this.$refs.cropper.rotateLeft();
-    },
-    // 向右旋转
-    rotateRight() {
-      this.$refs.cropper.rotateRight();
-    },
-    // 图片缩放
-    changeScale(num) {
-      num = num || 1;
-      this.$refs.cropper.changeScale(num);
-    },
-    // 上传预处理
-    beforeUpload(file) {
-      if (file.type.indexOf("image/") == -1) {
-        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
-      } else {
-        const reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = () => {
-          this.options.img = reader.result;
-        };
-      }
-    },
-    // 上传图片
-    uploadImg() {
-      this.$refs.cropper.getCropBlob(data => {
-        let formData = new FormData();
-        formData.append("avatarfile", data);
-        uploadAvatar(formData).then(response => {
-          this.open = false;
-          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
-          store.commit('SET_AVATAR', this.options.img);
-          this.$modal.msgSuccess("修改成功");
-          this.visible = false;
-        });
-      });
-    },
-    // 实时预览
-    realTime(data) {
-      this.previews = data;
-    },
-    // 关闭窗口
-    closeDialog() {
-      this.options.img = store.getters.avatar
-      this.visible = false;
-    }
-  }
-};
-</script>
-<style scoped lang="scss">
-.user-info-head {
-  position: relative;
-  display: inline-block;
-  height: 120px;
-}
-
-.user-info-head:hover:after {
-  content: '+';
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  color: #eee;
-  background: rgba(0, 0, 0, 0.5);
-  font-size: 24px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  cursor: pointer;
-  line-height: 110px;
-  border-radius: 50%;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/system/account/profile/userInfo.vue b/fuintAdmin_zt/src/views/system/account/profile/userInfo.vue
deleted file mode 100644
index 3c8138b5e..000000000
--- a/fuintAdmin_zt/src/views/system/account/profile/userInfo.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
-      <el-input v-model="user.nickName" maxlength="30" />
-    </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="user.phonenumber" maxlength="11" />
-    </el-form-item>
-    <el-form-item label="邮箱" prop="email">
-      <el-input v-model="user.email" maxlength="50" />
-    </el-form-item>
-    <el-form-item label="性别">
-      <el-radio-group v-model="user.sex">
-        <el-radio label="1">男</el-radio>
-        <el-radio label="0">女</el-radio>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import { updateAccountProfile } from "@/api/system/account";
-
-export default {
-  props: {
-    user: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      // 表单校验
-      rules: {
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
-    };
-  },
-  methods: {
-    submit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          updateUserProfile(this.user).then(response => {
-            this.$modal.msgSuccess("修改成功");
-          });
-        }
-      });
-    },
-    close() {
-      this.$tab.closePage();
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/config/index.vue b/fuintAdmin_zt/src/views/system/config/index.vue
deleted file mode 100644
index 1502a726f..000000000
--- a/fuintAdmin_zt/src/views/system/config/index.vue
+++ /dev/null
@@ -1,343 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="参数名称" prop="configName">
-        <el-input
-          v-model="queryParams.configName"
-          placeholder="请输入参数名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参数键名" prop="configKey">
-        <el-input
-          v-model="queryParams.configKey"
-          placeholder="请输入参数键名"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="系统内置" prop="configType">
-        <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:config:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:config:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:config:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:config:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:config:remove']"
-        >刷新缓存</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="参数主键" align="center" prop="configId" />
-      <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键值" align="center" prop="configValue" />
-      <el-table-column label="系统内置" align="center" prop="configType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.configType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:config:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:config:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="参数名称" prop="configName">
-          <el-input v-model="form.configName" placeholder="请输入参数名称" />
-        </el-form-item>
-        <el-form-item label="参数键名" prop="configKey">
-          <el-input v-model="form.configKey" placeholder="请输入参数键名" />
-        </el-form-item>
-        <el-form-item label="参数键值" prop="configValue">
-          <el-input v-model="form.configValue" placeholder="请输入参数键值" />
-        </el-form-item>
-        <el-form-item label="系统内置" prop="configType">
-          <el-radio-group v-model="form.configType">
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from "@/api/system/config";
-
-export default {
-  name: "Config",
-  dicts: ['sys_yes_no'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 参数表格数据
-      configList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        configName: undefined,
-        configKey: undefined,
-        configType: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        configName: [
-          { required: true, message: "参数名称不能为空", trigger: "blur" }
-        ],
-        configKey: [
-          { required: true, message: "参数键名不能为空", trigger: "blur" }
-        ],
-        configValue: [
-          { required: true, message: "参数键值不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询参数列表 */
-    getList() {
-      this.loading = true;
-      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.configList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        configId: undefined,
-        configName: undefined,
-        configKey: undefined,
-        configValue: undefined,
-        configType: "Y",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加参数";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.configId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const configId = row.configId || this.ids
-      getConfig(configId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改参数";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.configId != undefined) {
-            updateConfig(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addConfig(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const configIds = row.configId || this.ids;
-      this.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？').then(function() {
-          return delConfig(configIds);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/config/export', {
-        ...this.queryParams
-      }, `config_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/dict/data.vue b/fuintAdmin_zt/src/views/system/dict/data.vue
deleted file mode 100644
index b9729388a..000000000
--- a/fuintAdmin_zt/src/views/system/dict/data.vue
+++ /dev/null
@@ -1,383 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="字典名称" prop="dictType">
-        <el-select v-model="queryParams.dictType">
-          <el-option
-            v-for="item in typeOptions"
-            :key="item.dictId"
-            :label="item.dictName"
-            :value="item.dictType"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="字典标签" prop="dictLabel">
-        <el-input
-          v-model="queryParams.dictLabel"
-          placeholder="请输入字典标签"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    </el-card>
-
-
-    <el-card  style="margin-top: 20px">
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-
-        >新增</el-button>
-      </el-col>
-
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="dictCode" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel">
-        <template slot-scope="scope">
-          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    </el-card>
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典类型">
-          <el-input v-model="form.dictType" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="数据标签" prop="dictLabel">
-          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
-        </el-form-item>
-        <el-form-item label="数据键值" prop="dictValue">
-          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
-        </el-form-item>
-        <el-form-item label="样式属性" prop="cssClass">
-          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
-        </el-form-item>
-        <el-form-item label="显示排序" prop="dictSort">
-          <el-input-number v-model="form.dictSort" :min="0" />
-        </el-form-item>
-        <el-form-item label="回显样式" prop="listClass">
-          <el-select v-model="form.listClass">
-            <el-option
-              v-for="item in listClassOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listType, getType } from "@/api/system/dict/type";
-
-export default {
-  name: "Data",
-  dicts: ['sys_normal_disable'],
-  props:{
-    id:{
-      type:String,
-      default:""
-    }
-
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      dataList: [],
-      // 默认字典类型
-      defaultDictType: "",
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 数据标签回显样式
-      listClassOptions: [
-        {
-          value: "default",
-          label: "默认"
-        },
-        {
-          value: "primary",
-          label: "主要"
-        },
-        {
-          value: "success",
-          label: "成功"
-        },
-        {
-          value: "info",
-          label: "信息"
-        },
-        {
-          value: "warning",
-          label: "警告"
-        },
-        {
-          value: "danger",
-          label: "危险"
-        }
-      ],
-      // 类型数据字典
-      typeOptions: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictLabel: [
-          { required: true, message: "数据标签不能为空", trigger: "blur" }
-        ],
-        dictValue: [
-          { required: true, message: "数据键值不能为空", trigger: "blur" }
-        ],
-        dictSort: [
-          { required: true, message: "数据顺序不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-
-    const dictId = this.$route.query && this.$route.query.dictId;
-    this.getType(dictId);
-    this.getTypeList();
-  },
-  mounted() {
-    console.log(this.$route.query)
-  },
-  methods: {
-    /** 查询字典类型详细 */
-    getType(dictId) {
-      getType(dictId).then(response => {
-        this.queryParams.dictType = response.data.dictType;
-        this.defaultDictType = response.data.dictType;
-        this.getList();
-      });
-    },
-    /** 查询字典类型列表 */
-    getTypeList() {
-      listType().then(response => {
-        this.typeOptions = response.rows;
-      });
-    },
-    /** 查询字典数据列表 */
-    getList() {
-      this.loading = true;
-      listData(this.queryParams).then(response => {
-        this.dataList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictCode: undefined,
-        dictLabel: undefined,
-        dictValue: undefined,
-        cssClass: undefined,
-        listClass: 'default',
-        dictSort: 0,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 返回按钮操作 */
-    handleClose() {
-      const obj = { path: "/system/dict" };
-      this.$tab.closeOpenPage(obj);
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.queryParams.dictType = this.defaultDictType;
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典数据";
-      this.form.dictType = this.queryParams.dictType;
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictCode)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictCode = row.dictCode || this.ids
-      getData(dictCode).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典数据";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictCode != undefined) {
-            updateData(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addData(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictCodes = row.dictCode || this.ids;
-      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
-        return delData(dictCodes);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/data/export', {
-        ...this.queryParams
-      }, `data_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
-<style scoped>
-  .app-container{
-    width: 100%;
-    height: 100vh;
-    background: #f6f8f9;
-  }
-</style>
-
diff --git a/fuintAdmin_zt/src/views/system/dict/index.vue b/fuintAdmin_zt/src/views/system/dict/index.vue
deleted file mode 100644
index 7c7d7a267..000000000
--- a/fuintAdmin_zt/src/views/system/dict/index.vue
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
-  <div  class="app-container">
-    <el-card >
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="" prop="dictName">
-        <el-input
-          size="medium"
-          v-model="queryParams.dictName"
-          placeholder="请输入字典名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dictType">
-        <el-input
-          v-model="queryParams.dictType"
-          size="medium"
-          placeholder="请输入字典类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="status">
-        <el-select
-          size="medium"
-          v-model="queryParams.status"
-          placeholder="字典状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          size="medium"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    </el-card>
-
-    <el-card style="margin-top: 20px" >
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleAdd"
-        >新增</el-button>
-
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-<!--          <router-link :to="'/system/dict/data/' + scope.row.dictId" class="link-type">-->
-<!--            <span>{{ scope.row.dictType }}</span>-->
-<!--          </router-link>-->
-
-            <span style="color: #409EFF;cursor: pointer  " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
-
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-
-          >修改</el-button>
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-card>
-
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
-        </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
-          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/dict/type";
-
-  export default {
-    name: "Dict",
-    dicts: ['sys_normal_disable'],
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 字典表格数据
-        typeList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 日期范围
-        dateRange: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          dictName: undefined,
-          dictType: undefined,
-          status: undefined
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          dictName: [
-            { required: true, message: "字典名称不能为空", trigger: "blur" }
-          ],
-          dictType: [
-            { required: true, message: "字典类型不能为空", trigger: "blur" }
-          ]
-        }
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询字典类型列表 */
-      getList() {
-        this.loading = true;
-        listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            this.typeList = response.data.records;
-            this.total = response.data.total;
-            this.loading = false;
-          }
-        );
-      },
-      goDedi(id){
-        console.log('id:',id)
-        this.$router.push({
-          path:"/system/dict/data",
-          query:{
-            dictId:id
-          }
-        })
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          dictId: undefined,
-          dictName: undefined,
-          dictType: undefined,
-          status: "0",
-          remark: undefined
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加字典类型";
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.dictId)
-        this.single = selection.length!=1
-        this.multiple = !selection.length
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const dictId = row.dictId || this.ids
-        getType(dictId).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改字典类型";
-        });
-      },
-      /** 提交按钮 */
-      submitForm: function() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.dictId != undefined) {
-              updateType(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addType(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const dictIds = row.dictId || this.ids;
-        this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-          return delType(dictIds);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('system/dict/type/export', {
-          ...this.queryParams
-        }, `type_${new Date().getTime()}.xlsx`)
-      },
-      /** 刷新缓存按钮操作 */
-      handleRefreshCache() {
-        refreshCache().then(() => {
-          this.$modal.msgSuccess("刷新成功");
-          this.$store.dispatch('dict/cleanDict');
-        });
-      }
-    }
-  };
-</script>
-<style scoped>
-  .app-container{
-    width: 100%;
-    height: 100vh;
-    background: #f6f8f9;
-  }
-  .pagin-box{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-  }
-  .baoguo{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-    margin-bottom: 20px;
-  }
-
-
-
-</style>
-
diff --git a/fuintAdmin_zt/src/views/system/logs/index.vue b/fuintAdmin_zt/src/views/system/logs/index.vue
deleted file mode 100644
index f1f46d5b4..000000000
--- a/fuintAdmin_zt/src/views/system/logs/index.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" class="main-search" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="操作内容" prop="title">
-        <el-input
-          v-model="queryParams.keyword"
-          placeholder="请输入操作内容关键字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作账号" prop="operName">
-        <el-input
-          v-model="queryParams.accountName"
-          placeholder="请输入操作账号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作IP" prop="ip">
-        <el-input
-          v-model="queryParams.ip"
-          placeholder="请输入操作IP"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 300px"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetimerange"
-          range-separator="-"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:logs:delete']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="80"/>
-      <el-table-column label="操作内容" align="center" prop="module" width="200" :show-overflow-tooltip="true" />
-      <el-table-column label="耗时" align="center" prop="timeConsuming"/>
-      <el-table-column label="IP" align="center" prop="clientIp" width="150"/>
-      <el-table-column label="操作账号" align="center" prop="acctName" />
-      <el-table-column label="请求URL" align="center" prop="url" width="200" :show-overflow-tooltip="true"/>
-      <el-table-column label="客户端信息" align="center" prop="userAgent" width="250" :show-overflow-tooltip="true" />
-      <el-table-column label="时间" align="center" prop="actionTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.actionTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px" size="mini">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="操作模块：">{{ form.title }}</el-form-item>
-            <el-form-item
-              label="登录信息："
-            >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
-            <el-form-item label="请求方式：">{{ form.requestMethod }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="操作方法：">{{ form.method }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="操作状态：">
-              <div v-if="form.status === 0">正常</div>
-              <div v-else-if="form.status === 1">失败</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="open = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { list, delOperlog } from "@/api/system/logs";
-export default {
-  name: "Logs",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: {},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        keyword: '',
-        accountName: '',
-        status: 'A'
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      list(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.data.content;
-          this.total = response.data.totalElements;
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams.accountName = '';
-      this.queryParams.keyword = '';
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.operId)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 详细按钮操作
-    handleView(row) {
-      this.open = true;
-      this.form = row;
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const operIds = row.operId || this.ids;
-      this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function() {
-        return delOperlog(operIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/src/views/system/menu/index.vue b/fuintAdmin_zt/src/views/system/menu/index.vue
deleted file mode 100644
index e397a4cbe..000000000
--- a/fuintAdmin_zt/src/views/system/menu/index.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="menuList"
-      row-key="id"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'childrens', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
-        <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="path" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="sort" label="排序" width="80"></el-table-column>
-      <el-table-column prop="status" label="状态" width="80">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="D"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="上级菜单">
-              <treeselect
-                v-model="form.parentId"
-                :options="menuOptions"
-                :normalizer="normalizer"
-                :show-count="true"
-                placeholder="选择上级菜单"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="菜单类型" prop="isMenu">
-              <el-radio-group v-model="form.isMenu">
-                <el-radio :label="1">菜单</el-radio>
-                <el-radio :label="0">按钮</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="菜单角色" prop="merchantId">
-              <el-radio-group v-model="form.merchantId">
-                <el-radio :label="0">暂未设置</el-radio>
-                <el-radio :label="1">油站端菜单</el-radio>
-                <el-radio :label="2">中台端菜单</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="菜单图标" prop="icon">
-              <el-popover
-                placement="bottom-start"
-                width="460"
-                trigger="click"
-                @show="$refs['iconSelect'].reset()"
-              >
-                <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
-                  <svg-icon
-                    v-if="form.icon"
-                    slot="prefix"
-                    :icon-class="form.icon"
-                    class="el-input__icon"
-                    style="height: 32px;width: 16px;"
-                  />
-                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
-                </el-input>
-              </el-popover>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="菜单名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入菜单名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="sort">
-              <el-input-number v-model="form.sort" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="path">
-              <span slot="label">
-                <el-tooltip content="访问的组件路径，如：`system/account/index`，默认在`views`目录下" placement="top">
-                <i class="el-icon-question"></i>
-                </el-tooltip>
-                组件路径
-              </span>
-              <el-input v-model="form.path" placeholder="请输入组件路径" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item>
-              <span slot="label">
-                <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                <i class="el-icon-question"></i>
-                </el-tooltip>
-                菜单状态
-              </span>
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A">启用</el-radio>
-                <el-radio key="D" label="D">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import IconSelect from "@/components/IconSelect";
-
-export default {
-  name: "Menu",
-  components: { Treeselect, IconSelect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 菜单表格树数据
-      menuList: [],
-      // 菜单树选项
-      menuOptions: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否展开，默认全部折叠
-      isExpandAll: false,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 查询参数
-      queryParams: {
-        name: undefined,
-        visible: undefined
-      },
-      // 表单参数
-      form: { id : '' },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
-        ],
-        path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 选择图标
-    selected(name) {
-      this.form.icon = name;
-    },
-    // 查询菜单列表
-    getList() {
-      this.loading = true;
-      listMenu(this.queryParams).then(response => {
-        this.menuList = this.handleTree(response.data, "id", "pId", "childrens");
-        this.loading = false;
-      });
-    },
-    // 转换菜单数据结构
-    normalizer(node) {
-      if (node.childrens && !node.childrens.length) {
-        delete node.childrens;
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.childrens
-      };
-    },
-    // 查询菜单下拉树结构
-    getTreeSelect() {
-      listMenu().then(response => {
-        this.menuOptions = [];
-        const menu = { id: 0, name: '根目录', childrens: [] };
-        menu.childrens = this.handleTree(response.data, "id", "pId", "childrens");
-        this.menuOptions.push(menu);
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        parentId: 0,
-        name: '',
-        icon: '',
-        isMenu: 1,
-        sort: '',
-        visible: "0",
-        status: "A"
-      };
-      this.resetForm("form");
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 新增按钮操作
-    handleAdd(row) {
-      this.reset();
-      this.getTreeSelect();
-      if (row != null && row.id) {
-          this.form.parentId = row.id;
-      } else {
-          this.form.parentId = 0;
-      }
-      this.open = true;
-      this.title = "添加菜单";
-    },
-    // 展开/折叠操作
-    toggleExpandAll() {
-      this.refreshTable = false;
-
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeSelect();
-      getMenu(row.id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改菜单";
-      });
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-            updateMenu(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            if(!this.form.merchantId) this.form.merchantId = "0"
-            addMenu(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项？').then(function() {
-        return delMenu(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-<style scoped>
-.app-container{
-  width: 100%;
-  height: 100%;
-  //background: #f6f8f9;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/system/notice/index.vue b/fuintAdmin_zt/src/views/system/notice/index.vue
deleted file mode 100644
index b5ac56717..000000000
--- a/fuintAdmin_zt/src/views/system/notice/index.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公告标题" prop="noticeTitle">
-        <el-input
-          v-model="queryParams.noticeTitle"
-          placeholder="请输入公告标题"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作人员" prop="createBy">
-        <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入操作人员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_notice_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:notice:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:notice:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:notice:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
-      <el-table-column
-        label="公告标题"
-        align="center"
-        prop="noticeTitle"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:notice:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:notice:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择公告类型">
-                <el-option
-                  v-for="dict in dict.type.sys_notice_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_notice_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="内容">
-              <editor v-model="form.noticeContent" :min-height="192"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
-
-export default {
-  name: "Notice",
-  dicts: ['sys_notice_status', 'sys_notice_type'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 公告表格数据
-      noticeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        noticeTitle: undefined,
-        createBy: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
-        ],
-        noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "change" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询公告列表 */
-    getList() {
-      this.loading = true;
-      listNotice(this.queryParams).then(response => {
-        this.noticeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        noticeId: undefined,
-        noticeTitle: undefined,
-        noticeType: undefined,
-        noticeContent: undefined,
-        status: "0"
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.noticeId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加公告";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const noticeId = row.noticeId || this.ids
-      getNotice(noticeId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改公告";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.noticeId != undefined) {
-            updateNotice(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addNotice(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const noticeIds = row.noticeId || this.ids
-      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
-        return delNotice(noticeIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/notify/index.vue b/fuintAdmin_zt/src/views/system/notify/index.vue
deleted file mode 100644
index 746f585b4..000000000
--- a/fuintAdmin_zt/src/views/system/notify/index.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<script >
-import NotifyMode from "@/views/system/notify/page/mode.vue";
-import NotifyRecord from "@/views/system/notify/page/record.vue";
-
-export default {
-  components: {NotifyRecord, NotifyMode},
-  data(){
-    return{
-      activeindex:0,
-      tablist:[
-        {
-          name:'通知模板',
-        },
-        {
-          name:'通知记录',
-        },
-      ]
-    }
-  }
-}
-</script>
-
-<template>
-  <div class="container">
-    <div class="tab-box">
-      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
-    </div>
-    <notify-mode v-if="activeindex == 0"></notify-mode>
-    <notify-record v-else></notify-record>
-
-  </div>
-</template>
-
-<style scoped lang="scss">
-.tab-box{
-  width: 100%;
-  background: #fff;
-  display: flex;
-  box-sizing: border-box;
-  padding: 0px 50px;
-}
-
-.f-box{
-  height: 40px;
-  color: #999999;
-  margin-right: 50px;
-  display: flex;
-  align-items: center;
-
-}
-.active{
-  color: #FF9655 !important;
-  border-bottom: 2px solid #FF9655 !important;
-}
-.container{
-  background: #F4F5F9;
-  height: 100vh;
-  box-sizing: border-box;
-  padding: 20px;
-}
-.tabder-box{
-  width: 85%;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/system/notify/page/img/icon-adduser.png b/fuintAdmin_zt/src/views/system/notify/page/img/icon-adduser.png
deleted file mode 100644
index b480225f9..000000000
Binary files a/fuintAdmin_zt/src/views/system/notify/page/img/icon-adduser.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/system/notify/page/img/icon-adduser@3x.png b/fuintAdmin_zt/src/views/system/notify/page/img/icon-adduser@3x.png
deleted file mode 100644
index c0de18f8b..000000000
Binary files a/fuintAdmin_zt/src/views/system/notify/page/img/icon-adduser@3x.png and /dev/null differ
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
deleted file mode 100644
index f070232f1..000000000
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ /dev/null
@@ -1,386 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="notificationName">
-          <el-input
-            v-model="queryParams.notificationName"
-            placeholder="请输入通知名称"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="notificationType">
-          <el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable style="width: 240px;">
-            <el-option label="到期提醒" value="到期提醒"></el-option>
-            <el-option label="库存预警" value="库存预警"></el-option>
-            <!-- 添加其他选项 -->
-          </el-select>
-        </el-form-item>
-<!--        <el-form-item label="" prop="recipientRoles">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.recipientRoles"-->
-<!--            placeholder="请选择接收角色"-->
-<!--            clearable-->
-<!--            style="width: 240px;"-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-        <el-form-item label="" prop="templateStatus">
-          <el-select v-model="queryParams.templateStatus" placeholder="请选择通知状态" clearable style="width: 240px;">
-            <el-option label="启用" value="1"></el-option>
-            <el-option label="禁用" value="0"></el-option>
-            <!-- 添加其他选项 -->
-          </el-select>
-        </el-form-item>
-
-        <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            @click="handleAdd"
-            v-hasPermi="['system:notify:addTemplate']"
-          >新增通知模板</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <!--    列表信息-->
-    <el-card style="margin-top: 20px" >
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="notificationName" label="通知名称"></el-table-column>
-        <el-table-column prop="notificationType" label="通知类型"></el-table-column>
-        <el-table-column prop="templateContent" label="模板内容"></el-table-column>
-        <el-table-column prop="recipientRolesName" label="接收角色">
-        </el-table-column>
-        <el-table-column prop="templateStatus" label="模板状态">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.templateStatus" @change="clickSwitch(scope.row)" active-color="#13ce66" inactive-color="#ff4949">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-              v-hasPermi="['system:notify:editTemplate']"
-            >编辑</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-              v-hasPermi="['system:notify:deleteTemplate']"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
-      <el-form :model="form" label-width="120px">
-        <!-- 通知名称 -->
-        <el-form-item label="通知名称" :required="true">
-          <el-input v-model="form.notificationName" placeholder="请输入通知名称"></el-input>
-        </el-form-item>
-
-        <!-- 通知类型 -->
-        <el-form-item label="通知类型" :required="true">
-          <el-select v-model="form.notificationType" placeholder="请选择通知类型">
-            <el-option label="到期提醒" value="到期提醒"></el-option>
-            <!-- 添加其他选项 -->
-          </el-select>
-        </el-form-item>
-
-        <!-- 通知模板 -->
-        <el-form-item label="通知模板" :required="true">
-          <el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200" show-word-limit></el-input>
-        </el-form-item>
-
-        <!-- 接收角色 -->
-        <el-form-item label="接收角色" :required="true">
-          <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色">
-            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <!-- 模板状态 -->
-        <el-form-item label="模板状态" :required="true">
-          <el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
-        </el-form-item>
-
-        <!-- 发送条件 -->
-        <el-form-item label="发送条件" style="margin-bottom: 10px">
-          <div v-for="(condition, index) in form.conditions" :key="index" class="condition-group">
-            <el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px">
-              <el-option label="系统到期日期" value="系统到期日期"></el-option>
-              <el-option label="剩余交易量" value="剩余交易量"></el-option>
-              <el-option label="系统服务费统计" value="系统服务费统计"></el-option>
-              <!-- 添加其他选项 -->
-            </el-select>
-<!--            <el-select v-if="condition.field == '系统到期日期'" v-model="condition.operator" placeholder="请选择" style="width: 100px;margin-right: 10px">-->
-<!--              <el-option label="当日日期" value="当日日期"></el-option>-->
-<!--              <el-option label="大于" value="大于"></el-option>-->
-<!--              <el-option label="小于" value="小于"></el-option>-->
-<!--              &lt;!&ndash; 添加其他选项 &ndash;&gt;-->
-<!--            </el-select>-->
-            <el-input v-model="condition.value" placeholder="请输入数值" style="width: 150px;margin-right: 10px">
-              <template slot="append">{{ condition.field === '剩余交易量' || condition.field === '系统服务有效期' ? '万元' : '天' }}</template>
-            </el-input>
-            <el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>
-          </div>
-          <el-button @click="addCondition" type="primary" icon="el-icon-plus">添加条件</el-button>
-        </el-form-item>
-
-        <!-- 操作按钮 -->
-        <el-form-item>
-          <el-button type="primary" @click="handleSubmit">保存</el-button>
-          <el-button @click="handleReset">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-
-import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
-import {dutyList, selectyDutyIdsApi} from "@/api/duty/duty";
-import {getSysNotifyList, saveSysNotifyApi, updateSysNotifyApi} from "@/api/sys/sysNotify";
-
-export default {
-  name: "notify-mode",
-
-  data() {
-    return {
-      tableData: [],
-      dutyList1: [],
-
-      form: {
-        id: null,
-        notificationName: '',
-        notificationType: '',
-        templateContent: '',
-        recipientRoles: [],
-        dutyList: [],
-        templateStatus: true,
-        conditions: [
-          { field: '', operator: '', value: '' }
-        ]
-      },
-      deviceInfo: {
-        id: null,            // 自增id
-        notificationName: '',//通知名称，字符长度最多100，不能为空
-        notificationType: '',//通知类型
-        templateContent: '',//模板内容
-        recipientRoles: '', // 接收角色，字符长度最多255，不能为空
-        templateStatus: true //模板状态
-      },
-      dutyNames: {}, // 用于存储每行的 dutyNames
-      // 是否显示弹出层
-      open: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        orgName:'',
-        legalRepresentativeContact:'',
-        appStatus:'',
-      },
-    };
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList(){
-      getSysNotifyList(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-
-
-    // submitForm(formName) {
-    //   this.$refs[formName].validate(valid => {
-    //     if (valid) {
-    //       // 表单验证通过，可以提交数据
-    //       // 示例：调用 API 提交数据
-    //       this.submitDeviceInfo();
-    //     } else {
-    //       // 表单验证失败，不执行任何操作
-    //       return false;
-    //     }
-    //   });
-    // },
-
-    handleSubmit() {
-      this.open = false
-
-      // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.form);
-      this.form.conditions = JSON.stringify(this.form.conditions)
-      this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
-      if (this.form.id) {
-        updateSysNotifyApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }else {
-        saveSysNotifyApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    handleReset() {
-      this.open = false
-
-    },
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-      this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.getDutyList()
-
-      this.title = "增加设备"
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "编辑设备"
-      this.getDutyList()
-
-      this.form = e
-      this.form.conditions = JSON.parse(this.form.conditions)
-      if (!this.form.conditions) {
-        this.form.conditions = []
-      }
-      this.form.recipientRoles = JSON.parse(this.form.recipientRoles)
-      console.log('提交设备信息数据:', this.deviceInfo);
-
-    },
-    del(e) {
-
-      this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteAppApi(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    addCondition() {
-      this.form.conditions.push({ field: '', operator: '', value: '' });
-    },
-    removeCondition(index) {
-      this.form.conditions.splice(index, 1);
-    },
-    getDutyList(){
-      // this.loading = true;
-      let queryParams1={
-        page: 1,
-        pageSize: 10000
-      }
-      dutyList(queryParams1).then(res => {
-        this.dutyList1 = res.data.records;
-        // this.total1 = res.data.total;
-        // this.loading = false;
-      })
-    },
-    xunhuanbanduan() {
-      this.dutyList.forEach(item => {
-        this.form.recipientRoles.forEach(res=>{
-          if(item.id === this.form.dutyId) {
-            this.form.dutyName = item.dutyName
-          }
-        })
-
-      })
-    },
-
-
-    clickSwitch(data){
-      updateSysNotifyApi(data).then(res=>{
-        if(res.code === 200) {
-          this.$message({
-            type: 'info',
-            message: '修改成功'
-          });
-          this.getList()
-          this.open = false
-        }
-      })
-    },
-    clean() {
-      this.deviceInfo= {
-        id: null,            // 自增id
-        notificationName: '',
-        notificationType: '',
-        templateContent: '',
-        recipientRoles: [],
-        dutyList1: [],
-        templateStatus: true,
-        conditions: [
-          { field: '', operator: '', value: '' }
-        ]
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
deleted file mode 100644
index a7766c453..000000000
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ /dev/null
@@ -1,418 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="deptName">
-          <el-input
-            v-model="queryParams.notificationName"
-            placeholder="请输入选择通知名称"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="notificationType">
-          <el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable style="width: 240px;">
-            <el-option label="到期提醒" value="到期提醒"></el-option>
-            <el-option label="库存预警" value="库存预警"></el-option>
-            <!-- 添加其他选项 -->
-          </el-select>
-        </el-form-item>
-
-<!--        <el-form-item label="" prop="appStatus">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.appStatus"-->
-<!--            placeholder="请选择接受角色"-->
-<!--            clearable-->
-<!--            style="width: 240px;"-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-        <el-form-item label="" prop="templateStatus">
-          <el-select v-model="queryParams.templateStatus" placeholder="请选择通知状态" clearable style="width: 240px;">
-            <el-option label="启用" value="1"></el-option>
-            <el-option label="禁用" value="0"></el-option>
-            <!-- 添加其他选项 -->
-          </el-select>
-        </el-form-item>
-        <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          <el-button
-            type="primary"
-            @click="handleAdd"
-            v-hasPermi="['system:notify:addRecord']"
-          >新增通知</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <!--          -->
-    <!--    列表信息-->
-    <el-card style="margin-top: 20px" >
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="notificationName" label="通知名称"></el-table-column>
-        <el-table-column prop="notificationType" label="通知类型"></el-table-column>
-        <el-table-column prop="templateContent" label="通知内容"></el-table-column>
-        <el-table-column prop="recipientRolesName" label="接收角色"></el-table-column>
-        <el-table-column prop="sendStatus" label="通知状态"></el-table-column>
-
-        <el-table-column prop="createByName" label="创建人"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column prop="createTime" label="发送时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-              v-hasPermi="['system:notify:editRecord']"
-            >编辑</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-              v-hasPermi="['system:notify:deleteRecord']"
-            >删除</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="send(scope.row.id)"
-              v-hasPermi="['system:notify:send']"
-            >发送通知</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" label-width="80px">
-        <!-- 通知名称 -->
-        <el-form-item label="通知名称" :required="true">
-          <el-input v-model="form.notificationName" placeholder="请输入通知名称"></el-input>
-        </el-form-item>
-
-        <!-- 通知类型 -->
-        <el-form-item label="通知类型" :required="true">
-          <el-select v-model="form.notificationType" placeholder="请选择通知类型">
-            <el-option label="到期提醒" value="到期提醒"></el-option>
-            <el-option label="库存预警" value="库存预警"></el-option>
-            <!-- 添加其他选项 -->
-          </el-select>
-        </el-form-item>
-
-        <!-- 通知模板 -->
-        <el-form-item label="通知模板" :required="true">
-          <el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200" show-word-limit></el-input>
-        </el-form-item>
-
-        <!-- 接收角色 -->
-        <el-form-item label="接收角色" :required="true">
-          <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色">
-            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="接收用户" :required="true">
-          <div style="border: 1px solid #DCDFE6;;width: 100%;height: 100px;    border-radius: 4px;">
-            <div @click="clickAdd" style="  display: flex;margin: 10px">
-              <div style="height: 32px;display: flex;
-                justify-content: center; /* 水平居中 */
-                align-items: center; /* 垂直居中 */ ">
-                <img src="../../notify/page/img/icon-adduser@3x.png">
-              </div>
-              <div v-for="item in form.recipientUser" :key="item.id">
-                <el-badge   value="x" class="item" style="margin-left: 10px">
-                  <el-button @click="clickUser(item.id)" size="mini" >{{item.userName}}</el-button>
-                </el-badge>
-              </div>
-            </div>
-          </div>
-        </el-form-item>
-
-        <!-- 模板状态 -->
-        <el-form-item label="模板状态" :required="true">
-          <el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
-        </el-form-item>
-
-      </el-form>
-
-      <el-button type="primary" @click="userEnter1">确定</el-button>
-      <el-button @click="userCe2">取消</el-button>
-    </el-dialog>
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
-      <el-table v-loading="" :data="userList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="50" align="center" />
-
-        <el-table-column label="用户名" align="center" key="accountName" prop="accountName"  />
-        <el-table-column label="真实姓名" align="center" key="realName" prop="realName" />
-        <el-table-column label="用户角色" align="center" key="roleName" prop="roleName" />
-
-        <el-table-column label="所属机构" align="center" prop="storeName" width="160">
-          <template slot-scope="scope">
-            <span>{{ scope.row.deptName ? scope.row.deptName : '-' }}</span>
-          </template>
-        </el-table-column>
-
-      </el-table>
-      <el-button type="primary" @click="userEnter">确定</el-button>
-      <el-button @click="userCe">取消</el-button>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-
-import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
-import {listUser} from "@/api/system/Site/site";
-import {dutyList} from "@/api/duty/duty";
-import {getNotificationlogList, saveSysNotificationApi, updateSysNotificationApi} from "@/api/sys/sysNotificationlog";
-import {getSendNotifyApi, getSysNotifyList} from "@/api/sys/sysNotify";
-
-export default {
-  name: "notify-record",
-
-  data() {
-    return {
-      tableData: [],
-      form: {
-        notificationName: '',
-        notificationType: '',
-        templateContent: '',
-        recipientRoles: [],
-        templateStatus: true,
-
-        // conditions: [
-        //   { field: '', operator: '', value: '' }
-        // ],
-        recipientUser:[
-
-        ]
-      },
-      // dutyList:[],
-      dutyList1:[],
-
-      // 用户表格数据
-      userList: null,
-
-      // 是否显示弹出层
-      open: false,
-      open1: false,
-      title:"",
-      total:0,
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        deptName:'',
-        legalRepresentativeContact:'',
-        appStatus:'',
-      },
-      // 查询参数
-      queryParamsUser: {
-        page: 1,
-        pageSize: 10000
-
-      },
-      linshicunshu:[],
-    };
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList(){
-      getSysNotifyList(this.queryParams).then(res=>{
-        this.tableData = res.data.records;
-        this.total = res.data.total
-      })
-    },
-
-    submitForm(formName) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          // 表单验证通过，可以提交数据
-          // 示例：调用 API 提交数据
-          this.submitDeviceInfo();
-        } else {
-          // 表单验证失败，不执行任何操作
-          return false;
-        }
-      });
-    },
-    // 发送通知
-    send(data) {
-      getSendNotifyApi({id :data}).then(res=>{
-        if(res.code === 200) {
-          this.getList()
-        }
-      })
-    },
-
-
-    handleQuery(){
-      this.getList()
-    },
-    resetQuery(){
-      this.queryParams = {
-        page: 1,
-        pageSize: 10,
-        deviceName:'',
-      },
-      this.getList()
-    },
-    handleAdd(e) {
-      this.clean()
-      this.open = true;
-      this.getDutyList()
-
-      this.title = "增加设备"
-    },
-    userEnter1(){
-      // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.form);
-      JSON.stringify(this.form.recipientUser)
-      if (this.form.id) {
-        updateSysNotificationApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-
-          }
-
-        })
-      }else {
-        saveSysNotificationApi(this.form).then(res=>{
-          if(res.code === 200) {
-            this.getList()
-            this.open = false
-          }
-        })
-      }
-    },
-    userCe2(){
-
-    },
-    edit(e) {
-      this.clean()
-      this.open = true;
-      this.title = "编辑设备"
-      this.form = e
-      this.form.recipientUser = JSON.parse(this.form.recipientUser)
-      this.getDutyList()
-
-      console.log('提交设备信息数据:', this.deviceInfo);
-
-    },
-    del(e) {
-
-      this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteAppApi(e.id).then(res=>{
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-          }
-        })
-
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    handleSelectionChange(val) {
-      console.log("val",val)
-      val.forEach(item => {
-        this.linshicunshu.push(
-          {
-            staffId:val.staffId,
-            userName:val.realName
-          }
-        )
-      })
-    },
-    onlyGetUser(){
-      // this.loading = true;
-      // console.log(this.queryParams,222)
-      // this.addDateRange(this.queryParams, this.dateRange)
-      listUser(this.queryParamsUser).then(response => {
-          this.userList = response.data.records;
-          // this.total = response.data.total;
-          // this.total = response.data.total;
-          // this.loading = false;
-        }
-      );
-    },
-    clickUser(id) {
-      this.form.recipientUser = this.form.recipientUser.filter(item => item.id !== id);
-    },
-    clickAdd() {
-      this.linshicunshu = []
-      this.open1  = true;
-      this.onlyGetUser()
-    },
-    userEnter(){
-      this.open1 = false
-      this.form.recipientUser = this.linshicunshu
-    } ,
-    userCe(){
-      this.open1 = false
-      this.linshicunshu = []
-    },
-    getDutyList(){
-      // this.loading = true;
-      let queryParams1={
-        page: 1,
-        pageSize: 10000
-      }
-      dutyList(queryParams1).then(res => {
-        this.dutyList1 = res.data.records;
-        // this.total1 = res.data.total;
-        // this.loading = false;
-      })
-    },
-    clean() {
-      this.deviceInfo= {
-        id: null,            // 自增id
-        orgName: '',   // 机构名称
-        unifiedSocialCreditCode: '',   // 统一社会信用代码
-        appId: '',   // 小程序appID
-        appKey: '',   // 密钥
-        legalRepresentativeName: '',   // 法人姓名
-        legalRepresentativeWeChat: '',   // 法人微信
-        legalRepresentativeContact: '',   // 法人联系方式
-        appStatus: false,   // 小程序状态
-        createByName: '',
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-.common-dialog >>> .el-upload--picture-card {
-  width: 60px;
-  height: 50px;
-  line-height: 60px;
-}
-</style>
-
diff --git a/fuintAdmin_zt/src/views/system/role/authUser.vue b/fuintAdmin_zt/src/views/system/role/authUser.vue
deleted file mode 100644
index a35aceaa9..000000000
--- a/fuintAdmin_zt/src/views/system/role/authUser.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <div class="app-container">
-     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="openSelectUser"
-          v-hasPermi="['system:role:add']"
-        >添加用户</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-circle-close"
-          size="mini"
-          :disabled="multiple"
-          @click="cancelAuthUserAll"
-          v-hasPermi="['system:role:remove']"
-        >批量取消授权</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-close"
-          size="mini"
-          @click="handleClose"
-        >关闭</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="status"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-circle-close"
-            @click="cancelAuthUser(scope.row)"
-            v-hasPermi="['system:role:remove']"
-          >取消授权</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <select-user ref="select" :roleId="queryParams.roleId" @ok="handleQuery" />
-  </div>
-</template>
-
-<script>
-import { getRoleUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
-import selectUser from "./selectUser";
-
-export default {
-  name: "AuthUser",
-  components: { selectUser },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中用户组
-      userIds: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        roleId: undefined,
-        userName: undefined,
-      }
-    };
-  },
-  created() {
-    const roleId = this.$route.params && this.$route.params.roleId;
-    if (roleId) {
-      this.queryParams.roleId = roleId;
-      this.getList();
-    }
-  },
-  methods: {
-    // 查询授权用户列表
-    getList() {
-      this.loading = true;
-      getRoleUserList(this.queryParams).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 返回按钮
-    handleClose() {
-      const obj = { path: "/system/role" };
-      this.$tab.closeOpenPage(obj);
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.userIds = selection.map(item => item.userId)
-      this.multiple = !selection.length
-    },
-    // 打开授权用户表弹窗
-    openSelectUser() {
-      this.$refs.select.show();
-    },
-    // 取消授权按钮操作
-    cancelAuthUser(row) {
-      const roleId = this.queryParams.roleId;
-      this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function() {
-        return authUserCancel({ userId: row.userId, roleId: roleId });
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("取消授权成功");
-      }).catch(() => {});
-    },
-    // 批量取消授权按钮操作
-    cancelAuthUserAll(row) {
-      const roleId = this.queryParams.roleId;
-      const userIds = this.userIds.join(",");
-      this.$modal.confirm('是否取消选中用户授权数据项？').then(function() {
-        return authUserCancelAll({ roleId: roleId, userIds: userIds });
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("取消授权成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/role/index.vue b/fuintAdmin_zt/src/views/system/role/index.vue
deleted file mode 100644
index 2cb70f947..000000000
--- a/fuintAdmin_zt/src/views/system/role/index.vue
+++ /dev/null
@@ -1,404 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入角色名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="角色状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:role:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:role:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="100" align="center" />
-      <el-table-column label="ID" prop="id" width="100" />
-      <el-table-column label="角色名称" prop="name" :show-overflow-tooltip="true" width="200" />
-      <el-table-column label="角色类型" prop="type" :show-overflow-tooltip="true" width="200" />
-      <el-table-column label="状态" align="center" width="200">
-        <template slot-scope="scope">
-          <span v-if="roleList.length==3">
-            {{scope.row.status=='A'?'启用':'禁用'}}
-          </span>
-          <el-switch
-            v-else
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.id !== 1">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:delete']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" class="common-dialog" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input :disabled="roleList.length==3" v-model="form.roleName" style="width: 300px" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item label="角色类型" prop="roleType">
-          <el-select
-            :disabled="roleList.length==3"
-            v-model="form.roleType"
-            placeholder="角色类型"
-            style="width: 300px"
-          >
-          <el-option key="1" label="超级管理员" value="1"/>
-          <el-option key="2" label="普通管理员" value="2"/>
-           <el-option key="3" label="用户角色" value="3"/>
-          <el-option key="4" label="员工角色" value="4"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status" :disabled="roleList.length==3">
-            <el-radio key="A" label="A" value="A">启用</el-radio>
-            <el-radio key="N" label="N" value="N">禁用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入备注信息"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listRole, getRole, delRole, addRole, updateRole, changeRoleStatus } from "@/api/system/role";
-import { treeselect as menuTreeselect } from "@/api/system/menu";
-
-export default {
-  name: "Role",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        name: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: { id: '', status: 'A', roleType: '1', description: '' },
-      defaultProps: {
-        children: "childrens",
-        label: "label"
-      },
-      // 表单校验
-      rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        roleType: [
-          { required: true, message: "角色类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询角色列表
-    getList() {
-      this.loading = true;
-      listRole(this.queryParams).then(response => {
-          this.roleList = response.data.content;
-          this.total = response.data.totalElements;
-          this.loading = false;
-        }
-      );
-    },
-    // 查询菜单树结构
-    getMenuTreeselect() {
-      return menuTreeselect().then(response => {
-          this.menuOptions = response.data;
-          return response
-      });
-    },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      let text = row.status === "N" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"角色吗？').then(function() {
-        return changeRoleStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-          this.$refs.menu.setCheckedKeys([]);
-      }
-      this.menuExpand = false,
-      this.menuNodeAll = false,
-      this.form = {
-        id: undefined,
-        roleName: '',
-        roleType: '1',
-        status: "A",
-        menuIds: [],
-        menuCheckStrictly: true,
-        description: ''
-      };
-      this.resetForm("form");
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams.name = '';
-      this.queryParams.status = '';
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-          let treeList = this.menuOptions;
-          for (let i = 0; i < treeList.length; i++) {
-               this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-          }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-          this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-          this.form.menuCheckStrictly = value ? true: false;
-      }
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.getMenuTreeselect();
-      this.open = true;
-      this.title = "添加角色";
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const roleMenu = this.getMenuTreeselect();
-      const roleId = row.id || this.ids
-      getRole(roleId).then(response => {
-        this.form.roleName = response.data.roleInfo.name;
-        this.form.roleType = response.data.roleInfo.type;
-        this.form.status = response.data.roleInfo.status;
-        this.form.id = response.data.roleInfo.id;
-        this.form.description = response.data.roleInfo.description;
-        this.open = true;
-        this.title = "修改角色";
-        let checkedKeys = response.data.checkedKeys
-
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            checkedKeys.forEach((v) => {
-              this.$nextTick(()=>{
-                  this.$refs.menu.setChecked(v, true ,false);
-              })
-            })
-          });
-        });
-      });
-    },
-    // 分配用户操作
-    handleAuthUser: function(row) {
-      const roleId = row.id;
-      this.$router.push("/system/role-auth/account/" + roleId);
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const roleIds = row.id || this.ids;
-      this.$modal.confirm('是否确认删除角色ID为"' + roleIds + '"的数据项？').then(function() {
-        return delRole(roleIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/system/role/selectUser.vue b/fuintAdmin_zt/src/views/system/role/selectUser.vue
deleted file mode 100644
index d85e3faa6..000000000
--- a/fuintAdmin_zt/src/views/system/role/selectUser.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <!-- 授权用户 -->
-  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="ID" align="center" prop="id"/>
-        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template slot-scope="scope"></template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleSelectUser">确 定</el-button>
-      <el-button @click="visible = false">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
-export default {
-  props: {
-    // 角色编号
-    roleId: {
-      type: [Number, String]
-    }
-  },
-  data() {
-    return {
-      // 遮罩层
-      visible: false,
-      // 选中数组值
-      userIds: [],
-      // 总条数
-      total: 0,
-      // 未授权用户数据
-      userList: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        roleId: undefined,
-        userName: undefined,
-        phonenumber: undefined
-      }
-    };
-  },
-  methods: {
-    // 显示弹框
-    show() {
-      this.queryParams.roleId = this.roleId;
-      this.getList();
-      this.visible = true;
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.userIds = selection.map(item => item.userId);
-    },
-    // 查询表数据
-    getList() {
-      unallocatedUserList(this.queryParams).then(res => {
-        this.userList = res.rows;
-        this.total = res.total;
-      });
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 选择授权用户操作
-    handleSelectUser() {
-      const roleId = this.queryParams.roleId;
-      const userIds = this.userIds.join(",");
-      if (userIds == "") {
-        this.$modal.msgError("请选择要分配的用户");
-        return;
-      }
-      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
-        this.$modal.msgSuccess(res.msg);
-        if (res.code === 200) {
-          this.visible = false;
-          this.$emit("ok");
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tag/oilTag/api/tag.js b/fuintAdmin_zt/src/views/tag/oilTag/api/tag.js
deleted file mode 100644
index a7f6fbcdc..000000000
--- a/fuintAdmin_zt/src/views/tag/oilTag/api/tag.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import request from '@/utils/request'
-
-// 查询码牌配置列表
-export function listTag(query) {
-  return request({
-    url: '/business/tag/oilTag',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询码牌配置详细
-export function getTag(id) {
-  return request({
-    url: '/business/tag/oilTag/' + id,
-    method: 'get'
-  })
-}
-
-// 新增码牌配置
-export function addTag(data) {
-  return request({
-    url: '/business/tag/oilTag',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改码牌配置
-export function updateTag(data) {
-  return request({
-    url: '/business/tag/oilTag',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除码牌配置
-export function delTag(id) {
-  return request({
-    url: '/business/tag/oilTag/' + id,
-    method: 'delete'
-  })
-}
-
-export function storeName(text) {
-  return request({
-    url: '/backendApi/store/getByStroeName?name='+text,
-    method: 'get'
-  })
-}
-
-export function tagCodeRecord(data) {
-  return request({
-    url: '/business/tag/tagCodeRecord',
-    method: 'post',
-    data:data
-  })
-}
-
-export function getListByParentIdApi(data) {
-  return request({
-    url: '/system/dept/getListByParentId',
-    method: 'get',
-    params:data
-  })
-}
-export function exportOilTagApi(data) {
-  return request({
-    url: '/business/tag/oilTag/export',
-    method: 'post',
-    responseType: 'blob', // 表明响应类型为二进制流
-    data:data
-  })
-}
diff --git a/fuintAdmin_zt/src/views/tag/oilTag/index.vue b/fuintAdmin_zt/src/views/tag/oilTag/index.vue
deleted file mode 100644
index 24b3c98c6..000000000
--- a/fuintAdmin_zt/src/views/tag/oilTag/index.vue
+++ /dev/null
@@ -1,450 +0,0 @@
- <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="二维码ID" prop="tagCodeSn">
-        <el-input
-          v-model="queryParams.tagCodeSn"
-          placeholder="请输入二维码ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="码牌SN号" prop="snCode">
-        <el-input
-          v-model="queryParams.snCode"
-          placeholder="请输入码牌SN号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:tag:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:tag:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-<!--        v-hasPermi="['system:tag:export']"-->
-
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="tagList" @selection-change="handleSelectionChange">
-      <el-table-column label="序号" type="index" width="55" align="center" />
-
-      <el-table-column label="厂家名字" align="center" prop="companyName" />
-      <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
-      <el-table-column label="码牌SN号" align="center" prop="snCode" />
-      <el-table-column label="码牌终端号" align="center" prop="terminalNumber" />
-      <el-table-column label="是否已绑定油站" align="center" prop="status" >
-      <template slot-scope="scope">
-        <el-tag type="success" v-if="scope.row.status == 1">已绑</el-tag>
-
-        <el-tag  v-if="scope.row.status == 0">未绑</el-tag>
-      </template>
-      </el-table-column>
-      <el-table-column label="所绑油站" align="center" prop="storeName" />
-      <el-table-column label="是否已绑定员工" align="center" prop="mtStatus" >
-      <template slot-scope="scope">
-        <el-tag type="success" v-if="scope.row.mtStatus == 1">已绑</el-tag>
-
-        <el-tag  v-if="scope.row.mtStatus == 0">未绑</el-tag>
-      </template>
-      </el-table-column>
-      <el-table-column label="所绑员工" align="center" prop="staffName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="oilUpdate(scope.row)"
-
-          >一键绑定</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-if="scope.row.status == 1"
-          >解绑</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改码牌配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="厂家名字" prop="companyName">
-          <el-input v-model="form.companyName" placeholder="请输入厂家名字" />
-        </el-form-item>
-
-        <el-form-item label="二维码ID" prop="tagCodeSn">
-          <el-input v-model="form.tagCodeSn" placeholder="请输入二维码ID" />
-        </el-form-item>
-        <el-form-item label="码牌SN号" prop="snCode">
-          <el-input v-model="form.snCode" placeholder="请输入码牌SN号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="一键绑定" :visible.sync="openShow" width="800px" append-to-body>
-<!--      <div style="margin-bottom: 10px;font-weight: bold"> 油站名称： </div>-->
-<!--      <div style="display: flex;">-->
-<!--        <el-input v-model="filterText" placeholder="请输入油站名称" @input="getfilterText()"></el-input>-->
-<!--        <div style="width: 10px ; height: 10px;"></div>-->
-<!--        <el-button type="primary" @click="getfilterText()">查询</el-button>-->
-<!--      </div>-->
-<!--      <div class="wrap-box">-->
-<!--          <div class="gang-box" :class="{'oilid' :oilid == item.id }" v-for="(item,index) in arrList" :key="index">-->
-<!--            <div>-->
-<!--              {{item.name}}-->
-<!--            </div>-->
-<!--          <div style="color: #00afff;cursor: pointer;margin-right: 15px" v-if="oilid != item.id" @click="getoil(item.id)">-->
-<!--            选择-->
-<!--          </div>-->
-<!--            <div style="color: #adadad;cursor: pointer;margin-right: 15px" v-if="oilid == item.id">-->
-<!--              已选择-->
-<!--            </div>-->
-<!--          </div>-->
-<!--      </div>-->
-
-<!--      <el-form-item label="机构：" prop="deptId">-->
-        <el-select
-          v-model="deptId"
-          clearable
-          placeholder="全部"
-        >
-          <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-          </el-option>
-        </el-select>
-<!--      </el-form-item>-->
-
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="yesyesyes">确定绑定</el-button>
-        <el-button @click="openShow=false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  listTag,
-  getTag,
-  delTag,
-  addTag,
-  updateTag,
-  storeName,
-  tagCodeRecord,
-  getListByParentIdApi,
-  exportOilTagApi
-} from "./api/tag";
-import {deptTreeSelect} from "@/api/system/Site/site";
-import {exportExcelTissueApi} from "@/api/allOrder";
-
-export default {
-  name: "Tag",
-  dicts: ['node_type'],
-  data() {
-    return {
-      oilTagList:[],
-      oilid:null,
-      deptIds:'',
-      deptId:'',
-      arrList:[],
-      filterText:"",
-      defaultProps: {
-        checkStrictly : 'true',
-        children: "childrens",
-        label: "label",
-        value:"id"
-      },
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 码牌配置表格数据
-      tagList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      openShow:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        companyName: null,
-        tagCodeId: null,
-        tagCodeSn: null,
-        snCode: null,
-        status: null,
-        mtStatus: null,
-      },
-      deptList:[],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        companyName: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" },
-        ],
-        tagCodeSn: [
-          { required: true, message: "二维码ID不能为空", trigger: "blur" },
-        ],
-        snCode: [
-          { required: true, message: "码牌SN不能为空", trigger: "blur" },
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getDeptList();
-
-  },
-  methods: {
-    getDeptList() {
-      getListByParentIdApi().then(res=>{
-        this.deptList = res.data
-      })
-    },
-    yesyesyes(){
-      let data = {
-        oilTagList :this.oilTagList,
-        storeId:this.oilid,
-        status:1,
-        deptId:this.deptId
-      }
-      tagCodeRecord(data).then(res=>{
-          if(res.code == 200){
-            this.$modal.msgSuccess("绑定成功");
-            this.openShow = false
-            this.oilTagList = []
-            this.storeId = null
-            this.filterText = ""
-            this.arrList = []
-            this.getList()
-          }
-      })
-    },
-    getoil(id){
-      this.oilid = id
-      this.filterText=""
-    },
-    getfilterText(){
-
-      storeName(this.filterText).then(res=>{
-        console.log(res)
-        this.arrList = res.data
-      })
-    },
-    activecilck(data){
-      console.log(data)
-    },
-    handleSelect(item) {
-      console.log('进')
-      console.log(item);
-    },
-    // 修改树
-    handleChange(value) {
-      console.log(value);
-    },
-
-    /** 查询码牌配置列表 */
-    getList() {
-      this.loading = true;
-      listTag(this.queryParams).then(response => {
-        this.tagList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        companyName: null,
-        tagCodeId: null,
-        tagCodeSn: null,
-        snCode: null,
-        status: null,
-        mtStatus: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加码牌配置";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getTag(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改码牌配置";
-      });
-    },
-    oilUpdate(row){
-      console.log(row)
-      this.oilTagList.push(row.id)
-      this.openShow = true
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateTag(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTag(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除码牌配置编号为"' + ids + '"的数据项？').then(function() {
-        return delTag(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("操作成功!");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      exportOilTagApi(this.queryParams).then(res=>{
-        const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-        this.$download.saveAs(blob,'流水订单统计.xLsx')
-      })
-    }
-  }
-};
-</script>
-<style >
-.wrap-box{
-
-  width: 100%;
-  height: 300px;
-  overflow: auto;
-  margin: 10px auto;
-}
-.gang-box{
-  box-sizing: border-box;
-  padding: 10px 0px;
-  border-bottom: 1px solid #dcdfe6;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.oilid{
-  background: #f6f8f9 !important;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/tag/tagCode/api/code.js b/fuintAdmin_zt/src/views/tag/tagCode/api/code.js
deleted file mode 100644
index ec4a76b44..000000000
--- a/fuintAdmin_zt/src/views/tag/tagCode/api/code.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询码牌二维码列表
-export function listCode(query) {
-  return request({
-    url: '/business/tag/tagCode',
-    method: 'GET',
-    params: query
-  })
-}
-
-// 查询码牌二维码详细
-export function getCode(id) {
-  return request({
-    url: '/system/code/' + id,
-    method: 'get'
-  })
-}
-
-// 新增码牌二维码
-export function addCode(data) {
-  return request({
-    url: '/business/tag/tagCode',
-    method: 'post',
-    responseType: 'blob', // 表明返回服务器返回的数据类型
-    data: data
-  })
-}
-
-  export function exportZipApi(data) {
-  return request({
-    url: '/business/tag/tagCode/exportZip',
-    method: 'post',
-    responseType: 'blob', // 表明返回服务器返回的数据类型
-    data: data
-  })
-}
-
-// 修改码牌二维码
-export function updateCode(data) {
-  return request({
-    url: '/system/code',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除码牌二维码
-export function delCode(id) {
-  return request({
-    url: '/system/code/' + id,
-    method: 'delete'
-  })
-}
diff --git a/fuintAdmin_zt/src/views/tag/tagCode/index.vue b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
deleted file mode 100644
index daa9694bd..000000000
--- a/fuintAdmin_zt/src/views/tag/tagCode/index.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="二维码ID"  prop="tagCodeSn">
-        <el-input
-          v-model="queryParams.tagCodeSn"
-          placeholder="二维码ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:code:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:code:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-    <el-table v-loading="loading" :data="codeList" @selection-change="handleSelectionChange">
-      <el-table-column label="序号" type="index" >
-      </el-table-column>
-<!--      <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
-<!--      <el-table-column label="二维码ID" align="center" prop="id" />-->
-      <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="二维码" align="center" prop="imageUrl" >
-        <template slot-scope="scope">
-
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="baseUrl + scope.row.imageUrl"
-            fit="fill"></el-image>
-<!--          <div>{{baseUrl+scope.row.imageUrl}}</div>-->
-        </template>
-        </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改码牌二维码对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="请输入生产数量" prop="collection">
-          <el-input v-model="form.total" placeholder="请输入生产数量" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {listCode, getCode, delCode, addCode, updateCode, exportZipApi} from "./api/code";
-
-export default {
-  name: "Code",
-  data() {
-    return {
-      imgUrl:this.pcUrl,
-      baseUrl:process.env.VUE_APP_BASE_API,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 码牌二维码表格数据
-      codeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 5,
-        collection: null,
-        tagCodeSn: null,
-        imageUrl: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询码牌二维码列表 */
-    getList() {
-      this.loading = true;
-      listCode(this.queryParams).then(response => {
-        this.codeList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        collection: null,
-        tagCodeSn: null,
-        imageUrl: null,
-        createTime: null,
-        updateTime: null,
-        createBy: null,
-        updateBy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加码牌二维码";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCode(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改码牌二维码";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateCode(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCode(this.form).then(response => {
-
-              const blob = new Blob([response], { type: 'application/zip' });
-              const url = window.URL.createObjectURL(blob);
-
-              const link = document.createElement('a');
-              link.href = url;
-
-// 设置下载文件的名称
-              link.setAttribute('download', '1');
-
-// 模拟点击链接进行下载
-              link.click();
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除码牌二维码编号为"' + ids + '"的数据项？').then(function() {
-        return delCode(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      exportZipApi(this.form).then(response => {
-
-        const blob = new Blob([response], { type: 'application/zip' });
-        const url = window.URL.createObjectURL(blob);
-
-        const link = document.createElement('a');
-        link.href = url;
-
-        // 设置下载文件的名称
-        link.setAttribute('download', '1');
-
-        // 模拟点击链接进行下载
-        link.click();
-        this.$modal.msgSuccess("新增成功");
-        this.open = false;
-        this.getList();
-      })
-    },
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tag/tagCodeRecord/api/record.js b/fuintAdmin_zt/src/views/tag/tagCodeRecord/api/record.js
deleted file mode 100644
index 084918242..000000000
--- a/fuintAdmin_zt/src/views/tag/tagCodeRecord/api/record.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询码牌绑定记录列表
-export function listRecord(query) {
-  return request({
-    url: '/system/record/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询码牌绑定记录详细
-export function getRecord(id) {
-  return request({
-    url: '/system/record/' + id,
-    method: 'get'
-  })
-}
-
-// 新增码牌绑定记录
-export function addRecord(data) {
-  return request({
-    url: '/system/record',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改码牌绑定记录
-export function updateRecord(data) {
-  return request({
-    url: '/system/record',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除码牌绑定记录
-export function delRecord(id) {
-  return request({
-    url: '/system/record/' + id,
-    method: 'delete'
-  })
-}
diff --git a/fuintAdmin_zt/src/views/tag/tagCodeRecord/index.vue b/fuintAdmin_zt/src/views/tag/tagCodeRecord/index.vue
deleted file mode 100644
index e8bb9a482..000000000
--- a/fuintAdmin_zt/src/views/tag/tagCodeRecord/index.vue
+++ /dev/null
@@ -1,319 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属连锁店id" prop="chainStorId">
-        <el-input
-          v-model="queryParams.chainStorId"
-          placeholder="请输入所属连锁店id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="店铺id" prop="storeId">
-        <el-input
-          v-model="queryParams.storeId"
-          placeholder="请输入店铺id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油站名称" prop="storeName">
-        <el-input
-          v-model="queryParams.storeName"
-          placeholder="请输入油站名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="码牌id" prop="oilTagId">
-        <el-input
-          v-model="queryParams.oilTagId"
-          placeholder="请输入码牌id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工id" prop="staffId">
-        <el-input
-          v-model="queryParams.staffId"
-          placeholder="请输入员工id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工名字" prop="staffName">
-        <el-input
-          v-model="queryParams.staffName"
-          placeholder="请输入员工名字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:record:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:record:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:record:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:record:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="所属连锁店id" align="center" prop="chainStorId" />
-      <el-table-column label="店铺id" align="center" prop="storeId" />
-      <el-table-column label="油站名称" align="center" prop="storeName" />
-      <el-table-column label="码牌id" align="center" prop="oilTagId" />
-      <el-table-column label="员工id" align="center" prop="staffId" />
-      <el-table-column label="员工名字" align="center" prop="staffName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:record:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改码牌绑定记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属连锁店id" prop="chainStorId">
-          <el-input v-model="form.chainStorId" placeholder="请输入所属连锁店id" />
-        </el-form-item>
-        <el-form-item label="店铺id" prop="storeId">
-          <el-input v-model="form.storeId" placeholder="请输入店铺id" />
-        </el-form-item>
-        <el-form-item label="油站名称" prop="storeName">
-          <el-input v-model="form.storeName" placeholder="请输入油站名称" />
-        </el-form-item>
-        <el-form-item label="码牌id" prop="oilTagId">
-          <el-input v-model="form.oilTagId" placeholder="请输入码牌id" />
-        </el-form-item>
-        <el-form-item label="员工id" prop="staffId">
-          <el-input v-model="form.staffId" placeholder="请输入员工id" />
-        </el-form-item>
-        <el-form-item label="员工名字" prop="staffName">
-          <el-input v-model="form.staffName" placeholder="请输入员工名字" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "./api/record";
-
-export default {
-  name: "Record",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 码牌绑定记录表格数据
-      recordList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        chainStorId: null,
-        storeId: null,
-        storeName: null,
-        oilTagId: null,
-        staffId: null,
-        staffName: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询码牌绑定记录列表 */
-    getList() {
-      this.loading = true;
-      listRecord(this.queryParams).then(response => {
-        this.recordList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        chainStorId: null,
-        storeId: null,
-        storeName: null,
-        oilTagId: null,
-        staffId: null,
-        staffName: null,
-        createTime: null,
-        updateTime: null,
-        createBy: null,
-        updateBy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加码牌绑定记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getRecord(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改码牌绑定记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateRecord(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRecord(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除码牌绑定记录编号为"' + ids + '"的数据项？').then(function() {
-        return delRecord(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/record/export', {
-        ...this.queryParams
-      }, `record_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/build/CodeTypeDialog.vue b/fuintAdmin_zt/src/views/tool/build/CodeTypeDialog.vue
deleted file mode 100644
index b5c2e2e49..000000000
--- a/fuintAdmin_zt/src/views/tool/build/CodeTypeDialog.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-bind="$attrs"
-      width="500px"
-      :close-on-click-modal="false"
-      :modal-append-to-body="false"
-      v-on="$listeners"
-      @open="onOpen"
-      @close="onClose"
-    >
-      <el-row :gutter="15">
-        <el-form
-          ref="elForm"
-          :model="formData"
-          :rules="rules"
-          size="medium"
-          label-width="100px"
-        >
-          <el-col :span="24">
-            <el-form-item label="生成类型" prop="type">
-              <el-radio-group v-model="formData.type">
-                <el-radio-button
-                  v-for="(item, index) in typeOptions"
-                  :key="index"
-                  :label="item.value"
-                  :disabled="item.disabled"
-                >
-                  {{ item.label }}
-                </el-radio-button>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item v-if="showFileName" label="文件名" prop="fileName">
-              <el-input v-model="formData.fileName" placeholder="请输入文件名" clearable />
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-
-      <div slot="footer">
-        <el-button @click="close">
-          取消
-        </el-button>
-        <el-button type="primary" @click="handleConfirm">
-          确定
-        </el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-export default {
-  inheritAttrs: false,
-  props: ['showFileName'],
-  data() {
-    return {
-      formData: {
-        fileName: undefined,
-        type: 'file'
-      },
-      rules: {
-        fileName: [{
-          required: true,
-          message: '请输入文件名',
-          trigger: 'blur'
-        }],
-        type: [{
-          required: true,
-          message: '生成类型不能为空',
-          trigger: 'change'
-        }]
-      },
-      typeOptions: [{
-        label: '页面',
-        value: 'file'
-      }, {
-        label: '弹窗',
-        value: 'dialog'
-      }]
-    }
-  },
-  computed: {
-  },
-  watch: {},
-  mounted() {},
-  methods: {
-    onOpen() {
-      if (this.showFileName) {
-        this.formData.fileName = `${+new Date()}.vue`
-      }
-    },
-    onClose() {
-    },
-    close(e) {
-      this.$emit('update:visible', false)
-    },
-    handleConfirm() {
-      this.$refs.elForm.validate(valid => {
-        if (!valid) return
-        this.$emit('confirm', { ...this.formData })
-        this.close()
-      })
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/build/DraggableItem.vue b/fuintAdmin_zt/src/views/tool/build/DraggableItem.vue
deleted file mode 100644
index e881778f0..000000000
--- a/fuintAdmin_zt/src/views/tool/build/DraggableItem.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script>
-import draggable from 'vuedraggable'
-import render from '@/utils/generator/render'
-
-const components = {
-  itemBtns(h, element, index, parent) {
-    const { copyItem, deleteItem } = this.$listeners
-    return [
-      <span class="drawing-item-copy" title="复制" onClick={event => {
-        copyItem(element, parent); event.stopPropagation()
-      }}>
-        <i class="el-icon-copy-document" />
-      </span>,
-      <span class="drawing-item-delete" title="删除" onClick={event => {
-        deleteItem(index, parent); event.stopPropagation()
-      }}>
-        <i class="el-icon-delete" />
-      </span>
-    ]
-  }
-}
-const layouts = {
-  colFormItem(h, element, index, parent) {
-    const { activeItem } = this.$listeners
-    let className = this.activeId === element.formId ? 'drawing-item active-from-item' : 'drawing-item'
-    if (this.formConf.unFocusedComponentBorder) className += ' unfocus-bordered'
-    return (
-      <el-col span={element.span} class={className}
-        nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
-        <el-form-item label-width={element.labelWidth ? `${element.labelWidth}px` : null}
-          label={element.label} required={element.required}>
-          <render key={element.renderKey} conf={element} onInput={ event => {
-            this.$set(element, 'defaultValue', event)
-          }} />
-        </el-form-item>
-        {components.itemBtns.apply(this, arguments)}
-      </el-col>
-    )
-  },
-  rowFormItem(h, element, index, parent) {
-    const { activeItem } = this.$listeners
-    const className = this.activeId === element.formId ? 'drawing-row-item active-from-item' : 'drawing-row-item'
-    let child = renderChildren.apply(this, arguments)
-    if (element.type === 'flex') {
-      child = <el-row type={element.type} justify={element.justify} align={element.align}>
-              {child}
-            </el-row>
-    }
-    return (
-      <el-col span={element.span}>
-        <el-row gutter={element.gutter} class={className}
-          nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
-          <span class="component-name">{element.componentName}</span>
-          <draggable list={element.children} animation={340} group="componentsGroup" class="drag-wrapper">
-            {child}
-          </draggable>
-          {components.itemBtns.apply(this, arguments)}
-        </el-row>
-      </el-col>
-    )
-  }
-}
-
-function renderChildren(h, element, index, parent) {
-  if (!Array.isArray(element.children)) return null
-  return element.children.map((el, i) => {
-    const layout = layouts[el.layout]
-    if (layout) {
-      return layout.call(this, h, el, i, element.children)
-    }
-    return layoutIsNotFound()
-  })
-}
-
-function layoutIsNotFound() {
-  throw new Error(`没有与${this.element.layout}匹配的layout`)
-}
-
-export default {
-  components: {
-    render,
-    draggable
-  },
-  props: [
-    'element',
-    'index',
-    'drawingList',
-    'activeId',
-    'formConf'
-  ],
-  render(h) {
-    const layout = layouts[this.element.layout]
-
-    if (layout) {
-      return layout.call(this, h, this.element, this.index, this.drawingList)
-    }
-    return layoutIsNotFound()
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/build/IconsDialog.vue b/fuintAdmin_zt/src/views/tool/build/IconsDialog.vue
deleted file mode 100644
index 958be50c5..000000000
--- a/fuintAdmin_zt/src/views/tool/build/IconsDialog.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <div class="icon-dialog">
-    <el-dialog
-      v-bind="$attrs"
-      width="980px"
-      :modal-append-to-body="false"
-      v-on="$listeners"
-      @open="onOpen"
-      @close="onClose"
-    >
-      <div slot="title">
-        选择图标
-        <el-input
-          v-model="key"
-          size="mini"
-          :style="{width: '260px'}"
-          placeholder="请输入图标名称"
-          prefix-icon="el-icon-search"
-          clearable
-        />
-      </div>
-      <ul class="icon-ul">
-        <li
-          v-for="icon in iconList"
-          :key="icon"
-          :class="active===icon?'active-item':''"
-          @click="onSelect(icon)"
-        >
-          <i :class="icon" />
-          <div>{{ icon }}</div>
-        </li>
-      </ul>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import iconList from '@/utils/generator/icon.json'
-
-const originList = iconList.map(name => `el-icon-${name}`)
-
-export default {
-  inheritAttrs: false,
-  props: ['current'],
-  data() {
-    return {
-      iconList: originList,
-      active: null,
-      key: ''
-    }
-  },
-  watch: {
-    key(val) {
-      if (val) {
-        this.iconList = originList.filter(name => name.indexOf(val) > -1)
-      } else {
-        this.iconList = originList
-      }
-    }
-  },
-  methods: {
-    onOpen() {
-      this.active = this.current
-      this.key = ''
-    },
-    onClose() {},
-    onSelect(icon) {
-      this.active = icon
-      this.$emit('select', icon)
-      this.$emit('update:visible', false)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.icon-ul {
-  margin: 0;
-  padding: 0;
-  font-size: 0;
-  li {
-    list-style-type: none;
-    text-align: center;
-    font-size: 14px;
-    display: inline-block;
-    width: 16.66%;
-    box-sizing: border-box;
-    height: 108px;
-    padding: 15px 6px 6px 6px;
-    cursor: pointer;
-    overflow: hidden;
-    &:hover {
-      background: #f2f2f2;
-    }
-    &.active-item{
-      background: #e1f3fb;
-      color: #7a6df0
-    }
-    > i {
-      font-size: 30px;
-      line-height: 50px;
-    }
-  }
-}
-.icon-dialog {
-  ::v-deep .el-dialog {
-    border-radius: 8px;
-    margin-bottom: 0;
-    margin-top: 4vh !important;
-    display: flex;
-    flex-direction: column;
-    max-height: 92vh;
-    overflow: hidden;
-    box-sizing: border-box;
-    .el-dialog__header {
-      padding-top: 14px;
-    }
-    .el-dialog__body {
-      margin: 0 20px 20px 20px;
-      padding: 0;
-      overflow: auto;
-    }
-  }
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/tool/build/RightPanel.vue b/fuintAdmin_zt/src/views/tool/build/RightPanel.vue
deleted file mode 100644
index d53fe380f..000000000
--- a/fuintAdmin_zt/src/views/tool/build/RightPanel.vue
+++ /dev/null
@@ -1,946 +0,0 @@
-<template>
-  <div class="right-board">
-    <el-tabs v-model="currentTab" class="center-tabs">
-      <el-tab-pane label="组件属性" name="field" />
-      <el-tab-pane label="表单属性" name="form" />
-    </el-tabs>
-    <div class="field-box">
-      <a class="document-link" target="_blank" :href="documentLink" title="查看组件文档">
-        <i class="el-icon-link" />
-      </a>
-      <el-scrollbar class="right-scrollbar">
-        <!-- 组件属性 -->
-        <el-form v-show="currentTab==='field' && showField" size="small" label-width="90px">
-          <el-form-item v-if="activeData.changeTag" label="组件类型">
-            <el-select
-              v-model="activeData.tagIcon"
-              placeholder="请选择组件类型"
-              :style="{width: '100%'}"
-              @change="tagChange"
-            >
-              <el-option-group v-for="group in tagList" :key="group.label" :label="group.label">
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.tagIcon"
-                >
-                  <svg-icon class="node-icon" :icon-class="item.tagIcon" />
-                  <span> {{ item.label }}</span>
-                </el-option>
-              </el-option-group>
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.vModel!==undefined" label="字段名">
-            <el-input v-model="activeData.vModel" placeholder="请输入字段名（v-model）" />
-          </el-form-item>
-          <el-form-item v-if="activeData.componentName!==undefined" label="组件名">
-            {{ activeData.componentName }}
-          </el-form-item>
-          <el-form-item v-if="activeData.label!==undefined" label="标题">
-            <el-input v-model="activeData.label" placeholder="请输入标题" />
-          </el-form-item>
-          <el-form-item v-if="activeData.placeholder!==undefined" label="占位提示">
-            <el-input v-model="activeData.placeholder" placeholder="请输入占位提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['start-placeholder']!==undefined" label="开始占位">
-            <el-input v-model="activeData['start-placeholder']" placeholder="请输入占位提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['end-placeholder']!==undefined" label="结束占位">
-            <el-input v-model="activeData['end-placeholder']" placeholder="请输入占位提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData.span!==undefined" label="表单栅格">
-            <el-slider v-model="activeData.span" :max="24" :min="1" :marks="{12:''}" @change="spanChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData.layout==='rowFormItem'" label="栅格间隔">
-            <el-input-number v-model="activeData.gutter" :min="0" placeholder="栅格间隔" />
-          </el-form-item>
-          <el-form-item v-if="activeData.layout==='rowFormItem'" label="布局模式">
-            <el-radio-group v-model="activeData.type">
-              <el-radio-button label="default" />
-              <el-radio-button label="flex" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
-            <el-select v-model="activeData.justify" placeholder="请选择水平排列" :style="{width: '100%'}">
-              <el-option
-                v-for="(item, index) in justifyOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.align!==undefined&&activeData.type==='flex'" label="垂直排列">
-            <el-radio-group v-model="activeData.align">
-              <el-radio-button label="top" />
-              <el-radio-button label="middle" />
-              <el-radio-button label="bottom" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData.labelWidth!==undefined" label="标签宽度">
-            <el-input v-model.number="activeData.labelWidth" type="number" placeholder="请输入标签宽度" />
-          </el-form-item>
-          <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">
-            <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable />
-          </el-form-item>
-          <el-form-item v-if="activeData.vModel!==undefined" label="默认值">
-            <el-input
-              :value="setDefaultValue(activeData.defaultValue)"
-              placeholder="请输入默认值"
-              @input="onDefaultValueInput"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="至少应选">
-            <el-input-number
-              :value="activeData.min"
-              :min="0"
-              placeholder="至少应选"
-              @input="$set(activeData, 'min', $event?$event:undefined)"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="最多可选">
-            <el-input-number
-              :value="activeData.max"
-              :min="0"
-              placeholder="最多可选"
-              @input="$set(activeData, 'max', $event?$event:undefined)"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.prepend!==undefined" label="前缀">
-            <el-input v-model="activeData.prepend" placeholder="请输入前缀" />
-          </el-form-item>
-          <el-form-item v-if="activeData.append!==undefined" label="后缀">
-            <el-input v-model="activeData.append" placeholder="请输入后缀" />
-          </el-form-item>
-          <el-form-item v-if="activeData['prefix-icon']!==undefined" label="前图标">
-            <el-input v-model="activeData['prefix-icon']" placeholder="请输入前图标名称">
-              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('prefix-icon')">
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData['suffix-icon'] !== undefined" label="后图标">
-            <el-input v-model="activeData['suffix-icon']" placeholder="请输入后图标名称">
-              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('suffix-icon')">
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="选项分隔符">
-            <el-input v-model="activeData.separator" placeholder="请输入选项分隔符" />
-          </el-form-item>
-          <el-form-item v-if="activeData.autosize !== undefined" label="最小行数">
-            <el-input-number v-model="activeData.autosize.minRows" :min="1" placeholder="最小行数" />
-          </el-form-item>
-          <el-form-item v-if="activeData.autosize !== undefined" label="最大行数">
-            <el-input-number v-model="activeData.autosize.maxRows" :min="1" placeholder="最大行数" />
-          </el-form-item>
-          <el-form-item v-if="activeData.min !== undefined" label="最小值">
-            <el-input-number v-model="activeData.min" placeholder="最小值" />
-          </el-form-item>
-          <el-form-item v-if="activeData.max !== undefined" label="最大值">
-            <el-input-number v-model="activeData.max" placeholder="最大值" />
-          </el-form-item>
-          <el-form-item v-if="activeData.step !== undefined" label="步长">
-            <el-input-number v-model="activeData.step" placeholder="步数" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-input-number'" label="精度">
-            <el-input-number v-model="activeData.precision" :min="0" placeholder="精度" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-input-number'" label="按钮位置">
-            <el-radio-group v-model="activeData['controls-position']">
-              <el-radio-button label="">
-                默认
-              </el-radio-button>
-              <el-radio-button label="right">
-                右侧
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData.maxlength !== undefined" label="最多输入">
-            <el-input v-model="activeData.maxlength" placeholder="请输入字符长度">
-              <template slot="append">
-                个字符
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData['active-text'] !== undefined" label="开启提示">
-            <el-input v-model="activeData['active-text']" placeholder="请输入开启提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['inactive-text'] !== undefined" label="关闭提示">
-            <el-input v-model="activeData['inactive-text']" placeholder="请输入关闭提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['active-value'] !== undefined" label="开启值">
-            <el-input
-              :value="setDefaultValue(activeData['active-value'])"
-              placeholder="请输入开启值"
-              @input="onSwitchValueInput($event, 'active-value')"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData['inactive-value'] !== undefined" label="关闭值">
-            <el-input
-              :value="setDefaultValue(activeData['inactive-value'])"
-              placeholder="请输入关闭值"
-              @input="onSwitchValueInput($event, 'inactive-value')"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.type !== undefined && 'el-date-picker' === activeData.tag"
-            label="时间类型"
-          >
-            <el-select
-              v-model="activeData.type"
-              placeholder="请选择时间类型"
-              :style="{ width: '100%' }"
-              @change="dateTypeChange"
-            >
-              <el-option
-                v-for="(item, index) in dateOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">
-            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />
-          </el-form-item>
-          <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
-            <el-select
-              v-model="activeData.accept"
-              placeholder="请选择文件类型"
-              :style="{ width: '100%' }"
-              clearable
-            >
-              <el-option label="图片" value="image/*" />
-              <el-option label="视频" value="video/*" />
-              <el-option label="音频" value="audio/*" />
-              <el-option label="excel" value=".xls,.xlsx" />
-              <el-option label="word" value=".doc,.docx" />
-              <el-option label="pdf" value=".pdf" />
-              <el-option label="txt" value=".txt" />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.fileSize !== undefined" label="文件大小">
-            <el-input v-model.number="activeData.fileSize" placeholder="请输入文件大小">
-              <el-select slot="append" v-model="activeData.sizeUnit" :style="{ width: '66px' }">
-                <el-option label="KB" value="KB" />
-                <el-option label="MB" value="MB" />
-                <el-option label="GB" value="GB" />
-              </el-select>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData.action !== undefined" label="上传地址">
-            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />
-          </el-form-item>
-          <el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
-            <el-radio-group v-model="activeData['list-type']" size="small">
-              <el-radio-button label="text">
-                text
-              </el-radio-button>
-              <el-radio-button label="picture">
-                picture
-              </el-radio-button>
-              <el-radio-button label="picture-card">
-                picture-card
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.buttonText !== undefined"
-            v-show="'picture-card' !== activeData['list-type']"
-            label="按钮文字"
-          >
-            <el-input v-model="activeData.buttonText" placeholder="请输入按钮文字" />
-          </el-form-item>
-          <el-form-item v-if="activeData['range-separator'] !== undefined" label="分隔符">
-            <el-input v-model="activeData['range-separator']" placeholder="请输入分隔符" />
-          </el-form-item>
-          <el-form-item v-if="activeData['picker-options'] !== undefined" label="时间段">
-            <el-input
-              v-model="activeData['picker-options'].selectableRange"
-              placeholder="请输入时间段"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.format !== undefined" label="时间格式">
-            <el-input
-              :value="activeData.format"
-              placeholder="请输入时间格式"
-              @input="setTimeValue($event)"
-            />
-          </el-form-item>
-          <template v-if="['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(activeData.tag) > -1">
-            <el-divider>选项</el-divider>
-            <draggable
-              :list="activeData.options"
-              :animation="340"
-              group="selectItem"
-              handle=".option-drag"
-            >
-              <div v-for="(item, index) in activeData.options" :key="index" class="select-item">
-                <div class="select-line-icon option-drag">
-                  <i class="el-icon-s-operation" />
-                </div>
-                <el-input v-model="item.label" placeholder="选项名" size="small" />
-                <el-input
-                  placeholder="选项值"
-                  size="small"
-                  :value="item.value"
-                  @input="setOptionValue(item, $event)"
-                />
-                <div class="close-btn select-line-icon" @click="activeData.options.splice(index, 1)">
-                  <i class="el-icon-remove-outline" />
-                </div>
-              </div>
-            </draggable>
-            <div style="margin-left: 20px;">
-              <el-button
-                style="padding-bottom: 0"
-                icon="el-icon-circle-plus-outline"
-                type="text"
-                @click="addSelectItem"
-              >
-                添加选项
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-
-          <template v-if="['el-cascader'].indexOf(activeData.tag) > -1">
-            <el-divider>选项</el-divider>
-            <el-form-item label="数据类型">
-              <el-radio-group v-model="activeData.dataType" size="small">
-                <el-radio-button label="dynamic">
-                  动态数据
-                </el-radio-button>
-                <el-radio-button label="static">
-                  静态数据
-                </el-radio-button>
-              </el-radio-group>
-            </el-form-item>
-
-            <template v-if="activeData.dataType === 'dynamic'">
-              <el-form-item label="标签键名">
-                <el-input v-model="activeData.labelKey" placeholder="请输入标签键名" />
-              </el-form-item>
-              <el-form-item label="值键名">
-                <el-input v-model="activeData.valueKey" placeholder="请输入值键名" />
-              </el-form-item>
-              <el-form-item label="子级键名">
-                <el-input v-model="activeData.childrenKey" placeholder="请输入子级键名" />
-              </el-form-item>
-            </template>
-
-            <el-tree
-              v-if="activeData.dataType === 'static'"
-              draggable
-              :data="activeData.options"
-              node-key="id"
-              :expand-on-click-node="false"
-              :render-content="renderContent"
-            />
-            <div v-if="activeData.dataType === 'static'" style="margin-left: 20px">
-              <el-button
-                style="padding-bottom: 0"
-                icon="el-icon-circle-plus-outline"
-                type="text"
-                @click="addTreeItem"
-              >
-                添加父级
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-
-          <el-form-item v-if="activeData.optionType !== undefined" label="选项样式">
-            <el-radio-group v-model="activeData.optionType">
-              <el-radio-button label="default">
-                默认
-              </el-radio-button>
-              <el-radio-button label="button">
-                按钮
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData['active-color'] !== undefined" label="开启颜色">
-            <el-color-picker v-model="activeData['active-color']" />
-          </el-form-item>
-          <el-form-item v-if="activeData['inactive-color'] !== undefined" label="关闭颜色">
-            <el-color-picker v-model="activeData['inactive-color']" />
-          </el-form-item>
-
-          <el-form-item v-if="activeData['allow-half'] !== undefined" label="允许半选">
-            <el-switch v-model="activeData['allow-half']" />
-          </el-form-item>
-          <el-form-item v-if="activeData['show-text'] !== undefined" label="辅助文字">
-            <el-switch v-model="activeData['show-text']" @change="rateTextChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData['show-score'] !== undefined" label="显示分数">
-            <el-switch v-model="activeData['show-score']" @change="rateScoreChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData['show-stops'] !== undefined" label="显示间断点">
-            <el-switch v-model="activeData['show-stops']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.range !== undefined" label="范围选择">
-            <el-switch v-model="activeData.range" @change="rangeChange" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.border !== undefined && activeData.optionType === 'default'"
-            label="是否带边框"
-          >
-            <el-switch v-model="activeData.border" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-color-picker'" label="颜色格式">
-            <el-select
-              v-model="activeData['color-format']"
-              placeholder="请选择颜色格式"
-              :style="{ width: '100%' }"
-              @change="colorFormatChange"
-            >
-              <el-option
-                v-for="(item, index) in colorFormatOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.size !== undefined &&
-              (activeData.optionType === 'button' ||
-                activeData.border ||
-                activeData.tag === 'el-color-picker')"
-            label="选项尺寸"
-          >
-            <el-radio-group v-model="activeData.size">
-              <el-radio-button label="medium">
-                中等
-              </el-radio-button>
-              <el-radio-button label="small">
-                较小
-              </el-radio-button>
-              <el-radio-button label="mini">
-                迷你
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData['show-word-limit'] !== undefined" label="输入统计">
-            <el-switch v-model="activeData['show-word-limit']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-input-number'" label="严格步数">
-            <el-switch v-model="activeData['step-strictly']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="是否多选">
-            <el-switch v-model="activeData.props.props.multiple" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="展示全路径">
-            <el-switch v-model="activeData['show-all-levels']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="可否筛选">
-            <el-switch v-model="activeData.filterable" />
-          </el-form-item>
-          <el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
-            <el-switch v-model="activeData.clearable" />
-          </el-form-item>
-          <el-form-item v-if="activeData.showTip !== undefined" label="显示提示">
-            <el-switch v-model="activeData.showTip" />
-          </el-form-item>
-          <el-form-item v-if="activeData.multiple !== undefined" label="多选文件">
-            <el-switch v-model="activeData.multiple" />
-          </el-form-item>
-          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">
-            <el-switch v-model="activeData['auto-upload']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
-            <el-switch v-model="activeData.readonly" />
-          </el-form-item>
-          <el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
-            <el-switch v-model="activeData.disabled" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-select'" label="是否可搜索">
-            <el-switch v-model="activeData.filterable" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-select'" label="是否多选">
-            <el-switch v-model="activeData.multiple" @change="multipleChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData.required !== undefined" label="是否必填">
-            <el-switch v-model="activeData.required" />
-          </el-form-item>
-
-          <template v-if="activeData.layoutTree">
-            <el-divider>布局结构树</el-divider>
-            <el-tree
-              :data="[activeData]"
-              :props="layoutTreeProps"
-              node-key="renderKey"
-              default-expand-all
-              draggable
-            >
-              <span slot-scope="{ node, data }">
-                <span class="node-label">
-                  <svg-icon class="node-icon" :icon-class="data.tagIcon" />
-                  {{ node.label }}
-                </span>
-              </span>
-            </el-tree>
-          </template>
-
-          <template v-if="activeData.layout === 'colFormItem'">
-            <el-divider>正则校验</el-divider>
-            <div
-              v-for="(item, index) in activeData.regList"
-              :key="index"
-              class="reg-item"
-            >
-              <span class="close-btn" @click="activeData.regList.splice(index, 1)">
-                <i class="el-icon-close" />
-              </span>
-              <el-form-item label="表达式">
-                <el-input v-model="item.pattern" placeholder="请输入正则" />
-              </el-form-item>
-              <el-form-item label="错误提示" style="margin-bottom:0">
-                <el-input v-model="item.message" placeholder="请输入错误提示" />
-              </el-form-item>
-            </div>
-            <div style="margin-left: 20px">
-              <el-button icon="el-icon-circle-plus-outline" type="text" @click="addReg">
-                添加规则
-              </el-button>
-            </div>
-          </template>
-        </el-form>
-        <!-- 表单属性 -->
-        <el-form v-show="currentTab === 'form'" size="small" label-width="90px">
-          <el-form-item label="表单名">
-            <el-input v-model="formConf.formRef" placeholder="请输入表单名（ref）" />
-          </el-form-item>
-          <el-form-item label="表单模型">
-            <el-input v-model="formConf.formModel" placeholder="请输入数据模型" />
-          </el-form-item>
-          <el-form-item label="校验模型">
-            <el-input v-model="formConf.formRules" placeholder="请输入校验模型" />
-          </el-form-item>
-          <el-form-item label="表单尺寸">
-            <el-radio-group v-model="formConf.size">
-              <el-radio-button label="medium">
-                中等
-              </el-radio-button>
-              <el-radio-button label="small">
-                较小
-              </el-radio-button>
-              <el-radio-button label="mini">
-                迷你
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="标签对齐">
-            <el-radio-group v-model="formConf.labelPosition">
-              <el-radio-button label="left">
-                左对齐
-              </el-radio-button>
-              <el-radio-button label="right">
-                右对齐
-              </el-radio-button>
-              <el-radio-button label="top">
-                顶部对齐
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="标签宽度">
-            <el-input-number v-model="formConf.labelWidth" placeholder="标签宽度" />
-          </el-form-item>
-          <el-form-item label="栅格间隔">
-            <el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔" />
-          </el-form-item>
-          <el-form-item label="禁用表单">
-            <el-switch v-model="formConf.disabled" />
-          </el-form-item>
-          <el-form-item label="表单按钮">
-            <el-switch v-model="formConf.formBtns" />
-          </el-form-item>
-          <el-form-item label="显示未选中组件边框">
-            <el-switch v-model="formConf.unFocusedComponentBorder" />
-          </el-form-item>
-        </el-form>
-      </el-scrollbar>
-    </div>
-
-    <treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
-    <icons-dialog :visible.sync="iconsVisible" :current="activeData[currentIconModel]" @select="setIcon" />
-  </div>
-</template>
-
-<script>
-import { isArray } from 'util'
-import draggable from 'vuedraggable'
-import TreeNodeDialog from './TreeNodeDialog'
-import { isNumberStr } from '@/utils/index'
-import IconsDialog from './IconsDialog'
-import {
-  inputComponents,
-  selectComponents,
-  layoutComponents
-} from '@/utils/generator/config'
-
-const dateTimeFormat = {
-  date: 'yyyy-MM-dd',
-  week: 'yyyy 第 WW 周',
-  month: 'yyyy-MM',
-  year: 'yyyy',
-  datetime: 'yyyy-MM-dd HH:mm:ss',
-  daterange: 'yyyy-MM-dd',
-  monthrange: 'yyyy-MM',
-  datetimerange: 'yyyy-MM-dd HH:mm:ss'
-}
-
-export default {
-  components: {
-    draggable,
-    TreeNodeDialog,
-    IconsDialog
-  },
-  props: ['showField', 'activeData', 'formConf'],
-  data() {
-    return {
-      currentTab: 'field',
-      currentNode: null,
-      dialogVisible: false,
-      iconsVisible: false,
-      currentIconModel: null,
-      dateTypeOptions: [
-        {
-          label: '日(date)',
-          value: 'date'
-        },
-        {
-          label: '周(week)',
-          value: 'week'
-        },
-        {
-          label: '月(month)',
-          value: 'month'
-        },
-        {
-          label: '年(year)',
-          value: 'year'
-        },
-        {
-          label: '日期时间(datetime)',
-          value: 'datetime'
-        }
-      ],
-      dateRangeTypeOptions: [
-        {
-          label: '日期范围(daterange)',
-          value: 'daterange'
-        },
-        {
-          label: '月范围(monthrange)',
-          value: 'monthrange'
-        },
-        {
-          label: '日期时间范围(datetimerange)',
-          value: 'datetimerange'
-        }
-      ],
-      colorFormatOptions: [
-        {
-          label: 'hex',
-          value: 'hex'
-        },
-        {
-          label: 'rgb',
-          value: 'rgb'
-        },
-        {
-          label: 'rgba',
-          value: 'rgba'
-        },
-        {
-          label: 'hsv',
-          value: 'hsv'
-        },
-        {
-          label: 'hsl',
-          value: 'hsl'
-        }
-      ],
-      justifyOptions: [
-        {
-          label: 'start',
-          value: 'start'
-        },
-        {
-          label: 'end',
-          value: 'end'
-        },
-        {
-          label: 'center',
-          value: 'center'
-        },
-        {
-          label: 'space-around',
-          value: 'space-around'
-        },
-        {
-          label: 'space-between',
-          value: 'space-between'
-        }
-      ],
-      layoutTreeProps: {
-        label(data, node) {
-          return data.componentName || `${data.label}: ${data.vModel}`
-        }
-      }
-    }
-  },
-  computed: {
-    documentLink() {
-      return (
-        this.activeData.document
-        || 'https://element.eleme.cn/#/zh-CN/component/installation'
-      )
-    },
-    dateOptions() {
-      if (
-        this.activeData.type !== undefined
-        && this.activeData.tag === 'el-date-picker'
-      ) {
-        if (this.activeData['start-placeholder'] === undefined) {
-          return this.dateTypeOptions
-        }
-        return this.dateRangeTypeOptions
-      }
-      return []
-    },
-    tagList() {
-      return [
-        {
-          label: '输入型组件',
-          options: inputComponents
-        },
-        {
-          label: '选择型组件',
-          options: selectComponents
-        }
-      ]
-    }
-  },
-  methods: {
-    addReg() {
-      this.activeData.regList.push({
-        pattern: '',
-        message: ''
-      })
-    },
-    addSelectItem() {
-      this.activeData.options.push({
-        label: '',
-        value: ''
-      })
-    },
-    addTreeItem() {
-      ++this.idGlobal
-      this.dialogVisible = true
-      this.currentNode = this.activeData.options
-    },
-    renderContent(h, { node, data, store }) {
-      return (
-        <div class="custom-tree-node">
-          <span>{node.label}</span>
-          <span class="node-operation">
-            <i on-click={() => this.append(data)}
-              class="el-icon-plus"
-              title="添加"
-            ></i>
-            <i on-click={() => this.remove(node, data)}
-              class="el-icon-delete"
-              title="删除"
-            ></i>
-          </span>
-        </div>
-      )
-    },
-    append(data) {
-      if (!data.children) {
-        this.$set(data, 'children', [])
-      }
-      this.dialogVisible = true
-      this.currentNode = data.children
-    },
-    remove(node, data) {
-      const { parent } = node
-      const children = parent.data.children || parent.data
-      const index = children.findIndex(d => d.id === data.id)
-      children.splice(index, 1)
-    },
-    addNode(data) {
-      this.currentNode.push(data)
-    },
-    setOptionValue(item, val) {
-      item.value = isNumberStr(val) ? +val : val
-    },
-    setDefaultValue(val) {
-      if (Array.isArray(val)) {
-        return val.join(',')
-      }
-      if (['string', 'number'].indexOf(val) > -1) {
-        return val
-      }
-      if (typeof val === 'boolean') {
-        return `${val}`
-      }
-      return val
-    },
-    onDefaultValueInput(str) {
-      if (isArray(this.activeData.defaultValue)) {
-        // 数组
-        this.$set(
-          this.activeData,
-          'defaultValue',
-          str.split(',').map(val => (isNumberStr(val) ? +val : val))
-        )
-      } else if (['true', 'false'].indexOf(str) > -1) {
-        // 布尔
-        this.$set(this.activeData, 'defaultValue', JSON.parse(str))
-      } else {
-        // 字符串和数字
-        this.$set(
-          this.activeData,
-          'defaultValue',
-          isNumberStr(str) ? +str : str
-        )
-      }
-    },
-    onSwitchValueInput(val, name) {
-      if (['true', 'false'].indexOf(val) > -1) {
-        this.$set(this.activeData, name, JSON.parse(val))
-      } else {
-        this.$set(this.activeData, name, isNumberStr(val) ? +val : val)
-      }
-    },
-    setTimeValue(val, type) {
-      const valueFormat = type === 'week' ? dateTimeFormat.date : val
-      this.$set(this.activeData, 'defaultValue', null)
-      this.$set(this.activeData, 'value-format', valueFormat)
-      this.$set(this.activeData, 'format', val)
-    },
-    spanChange(val) {
-      this.formConf.span = val
-    },
-    multipleChange(val) {
-      this.$set(this.activeData, 'defaultValue', val ? [] : '')
-    },
-    dateTypeChange(val) {
-      this.setTimeValue(dateTimeFormat[val], val)
-    },
-    rangeChange(val) {
-      this.$set(
-        this.activeData,
-        'defaultValue',
-        val ? [this.activeData.min, this.activeData.max] : this.activeData.min
-      )
-    },
-    rateTextChange(val) {
-      if (val) this.activeData['show-score'] = false
-    },
-    rateScoreChange(val) {
-      if (val) this.activeData['show-text'] = false
-    },
-    colorFormatChange(val) {
-      this.activeData.defaultValue = null
-      this.activeData['show-alpha'] = val.indexOf('a') > -1
-      this.activeData.renderKey = +new Date() // 更新renderKey,重新渲染该组件
-    },
-    openIconsDialog(model) {
-      this.iconsVisible = true
-      this.currentIconModel = model
-    },
-    setIcon(val) {
-      this.activeData[this.currentIconModel] = val
-    },
-    tagChange(tagIcon) {
-      let target = inputComponents.find(item => item.tagIcon === tagIcon)
-      if (!target) target = selectComponents.find(item => item.tagIcon === tagIcon)
-      this.$emit('tag-change', target)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.right-board {
-  width: 350px;
-  position: absolute;
-  right: 0;
-  top: 0;
-  padding-top: 3px;
-  .field-box {
-    position: relative;
-    height: calc(100vh - 42px);
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-  .el-scrollbar {
-    height: 100%;
-  }
-}
-.select-item {
-  display: flex;
-  border: 1px dashed #fff;
-  box-sizing: border-box;
-  & .close-btn {
-    cursor: pointer;
-    color: #f56c6c;
-  }
-  & .el-input + .el-input {
-    margin-left: 4px;
-  }
-}
-.select-item + .select-item {
-  margin-top: 4px;
-}
-.select-item.sortable-chosen {
-  border: 1px dashed #00acac;
-}
-.select-line-icon {
-  line-height: 32px;
-  font-size: 22px;
-  padding: 0 4px;
-  color: #777;
-}
-.option-drag {
-  cursor: move;
-}
-.time-range {
-  .el-date-editor {
-    width: 227px;
-  }
-  ::v-deep .el-icon-time {
-    display: none;
-  }
-}
-.document-link {
-  position: absolute;
-  display: block;
-  width: 26px;
-  height: 26px;
-  top: 0;
-  left: 0;
-  cursor: pointer;
-  background: #00acac;
-  z-index: 1;
-  border-radius: 0 0 6px 0;
-  text-align: center;
-  line-height: 26px;
-  color: #fff;
-  font-size: 18px;
-}
-.node-label{
-  font-size: 14px;
-}
-.node-icon{
-  color: #bebfc3;
-}
-</style>
diff --git a/fuintAdmin_zt/src/views/tool/build/TreeNodeDialog.vue b/fuintAdmin_zt/src/views/tool/build/TreeNodeDialog.vue
deleted file mode 100644
index fa7f0b285..000000000
--- a/fuintAdmin_zt/src/views/tool/build/TreeNodeDialog.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-bind="$attrs"
-      :close-on-click-modal="false"
-      :modal-append-to-body="false"
-      v-on="$listeners"
-      @open="onOpen"
-      @close="onClose"
-    >
-      <el-row :gutter="0">
-        <el-form
-          ref="elForm"
-          :model="formData"
-          :rules="rules"
-          size="small"
-          label-width="100px"
-        >
-          <el-col :span="24">
-            <el-form-item
-              label="选项名"
-              prop="label"
-            >
-              <el-input
-                v-model="formData.label"
-                placeholder="请输入选项名"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item
-              label="选项值"
-              prop="value"
-            >
-              <el-input
-                v-model="formData.value"
-                placeholder="请输入选项值"
-                clearable
-              >
-                <el-select
-                  slot="append"
-                  v-model="dataType"
-                  :style="{width: '100px'}"
-                >
-                  <el-option
-                    v-for="(item, index) in dataTypeOptions"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                    :disabled="item.disabled"
-                  />
-                </el-select>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div slot="footer">
-        <el-button
-          type="primary"
-          @click="handleConfirm"
-        >
-          确定
-        </el-button>
-        <el-button @click="close">
-          取消
-        </el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { isNumberStr } from '@/utils/index'
-
-export default {
-  components: {},
-  inheritAttrs: false,
-  props: [],
-  data() {
-    return {
-      id: 100,
-      formData: {
-        label: undefined,
-        value: undefined
-      },
-      rules: {
-        label: [
-          {
-            required: true,
-            message: '请输入选项名',
-            trigger: 'blur'
-          }
-        ],
-        value: [
-          {
-            required: true,
-            message: '请输入选项值',
-            trigger: 'blur'
-          }
-        ]
-      },
-      dataType: 'string',
-      dataTypeOptions: [
-        {
-          label: '字符串',
-          value: 'string'
-        },
-        {
-          label: '数字',
-          value: 'number'
-        }
-      ]
-    }
-  },
-  computed: {},
-  watch: {
-    // eslint-disable-next-line func-names
-    'formData.value': function (val) {
-      this.dataType = isNumberStr(val) ? 'number' : 'string'
-    }
-  },
-  created() {},
-  mounted() {},
-  methods: {
-    onOpen() {
-      this.formData = {
-        label: undefined,
-        value: undefined
-      }
-    },
-    onClose() {},
-    close() {
-      this.$emit('update:visible', false)
-    },
-    handleConfirm() {
-      this.$refs.elForm.validate(valid => {
-        if (!valid) return
-        if (this.dataType === 'number') {
-          this.formData.value = parseFloat(this.formData.value)
-        }
-        this.formData.id = this.id++
-        this.$emit('commit', this.formData)
-        this.close()
-      })
-    }
-  }
-}
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/build/index.vue b/fuintAdmin_zt/src/views/tool/build/index.vue
deleted file mode 100644
index d1f8f6dff..000000000
--- a/fuintAdmin_zt/src/views/tool/build/index.vue
+++ /dev/null
@@ -1,783 +0,0 @@
-<template>
-  <div class="container">
-    <div class="left-board">
-      <div class="logo-wrapper">
-        <div class="logo">
-          <img :src="logo" alt="logo"> Form Generator
-        </div>
-      </div>
-      <el-scrollbar class="left-scrollbar">
-        <div class="components-list">
-          <div class="components-title">
-            <svg-icon icon-class="component" />输入型组件
-          </div>
-          <draggable
-            class="components-draggable"
-            :list="inputComponents"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-            :clone="cloneComponent"
-            draggable=".components-item"
-            :sort="false"
-            @end="onEnd"
-          >
-            <div
-              v-for="(element, index) in inputComponents" :key="index" class="components-item"
-              @click="addComponent(element)"
-            >
-              <div class="components-body">
-                <svg-icon :icon-class="element.tagIcon" />
-                {{ element.label }}
-              </div>
-            </div>
-          </draggable>
-          <div class="components-title">
-            <svg-icon icon-class="component" />选择型组件
-          </div>
-          <draggable
-            class="components-draggable"
-            :list="selectComponents"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-            :clone="cloneComponent"
-            draggable=".components-item"
-            :sort="false"
-            @end="onEnd"
-          >
-            <div
-              v-for="(element, index) in selectComponents"
-              :key="index"
-              class="components-item"
-              @click="addComponent(element)"
-            >
-              <div class="components-body">
-                <svg-icon :icon-class="element.tagIcon" />
-                {{ element.label }}
-              </div>
-            </div>
-          </draggable>
-          <div class="components-title">
-            <svg-icon icon-class="component" /> 布局型组件
-          </div>
-          <draggable
-            class="components-draggable" :list="layoutComponents"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
-            draggable=".components-item" :sort="false" @end="onEnd"
-          >
-            <div
-              v-for="(element, index) in layoutComponents" :key="index" class="components-item"
-              @click="addComponent(element)"
-            >
-              <div class="components-body">
-                <svg-icon :icon-class="element.tagIcon" />
-                {{ element.label }}
-              </div>
-            </div>
-          </draggable>
-        </div>
-      </el-scrollbar>
-    </div>
-
-    <div class="center-board">
-      <div class="action-bar">
-        <el-button icon="el-icon-download" type="text" @click="download">
-          导出vue文件
-        </el-button>
-        <el-button class="copy-btn-main" icon="el-icon-document-copy" type="text" @click="copy">
-          复制代码
-        </el-button>
-        <el-button class="delete-btn" icon="el-icon-delete" type="text" @click="empty">
-          清空
-        </el-button>
-      </div>
-      <el-scrollbar class="center-scrollbar">
-        <el-row class="center-board-row" :gutter="formConf.gutter">
-          <el-form
-            :size="formConf.size"
-            :label-position="formConf.labelPosition"
-            :disabled="formConf.disabled"
-            :label-width="formConf.labelWidth + 'px'"
-          >
-            <draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup">
-              <draggable-item
-                v-for="(element, index) in drawingList"
-                :key="element.renderKey"
-                :drawing-list="drawingList"
-                :element="element"
-                :index="index"
-                :active-id="activeId"
-                :form-conf="formConf"
-                @activeItem="activeFormItem"
-                @copyItem="drawingItemCopy"
-                @deleteItem="drawingItemDelete"
-              />
-            </draggable>
-            <div v-show="!drawingList.length" class="empty-info">
-              从左侧拖入或点选组件进行表单设计
-            </div>
-          </el-form>
-        </el-row>
-      </el-scrollbar>
-    </div>
-
-    <right-panel
-      :active-data="activeData"
-      :form-conf="formConf"
-      :show-field="!!drawingList.length"
-      @tag-change="tagChange"
-    />
-
-    <code-type-dialog
-      :visible.sync="dialogVisible"
-      title="选择生成类型"
-      :show-file-name="showFileName"
-      @confirm="generate"
-    />
-    <input id="copyNode" type="hidden">
-  </div>
-</template>
-
-<script>
-import draggable from 'vuedraggable'
-import beautifier from 'js-beautify'
-import ClipboardJS from 'clipboard'
-import render from '@/utils/generator/render'
-import RightPanel from './RightPanel'
-import { inputComponents, selectComponents, layoutComponents, formConf } from '@/utils/generator/config'
-import { beautifierConf, titleCase } from '@/utils/index'
-import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
-import { makeUpJs } from '@/utils/generator/js'
-import { makeUpCss } from '@/utils/generator/css'
-import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
-import CodeTypeDialog from './CodeTypeDialog'
-import DraggableItem from './DraggableItem'
-
-let oldActiveId
-let tempActiveData
-
-export default {
-  components: {
-    draggable,
-    render,
-    RightPanel,
-    CodeTypeDialog,
-    DraggableItem
-  },
-  data() {
-    return {
-      logo,
-      idGlobal: 100,
-      formConf,
-      inputComponents,
-      selectComponents,
-      layoutComponents,
-      labelWidth: 100,
-      drawingList: drawingDefault,
-      drawingData: {},
-      activeId: drawingDefault[0].formId,
-      drawerVisible: false,
-      formData: {},
-      dialogVisible: false,
-      generateConf: null,
-      showFileName: false,
-      activeData: drawingDefault[0]
-    }
-  },
-  created() {
-    // 防止 firefox 下 拖拽 会新打卡一个选项卡
-    document.body.ondrop = event => {
-      event.preventDefault()
-      event.stopPropagation()
-    }
-  },
-  watch: {
-    // eslint-disable-next-line func-names
-    'activeData.label': function (val, oldVal) {
-      if (
-        this.activeData.placeholder === undefined
-        || !this.activeData.tag
-        || oldActiveId !== this.activeId
-      ) {
-        return
-      }
-      this.activeData.placeholder = this.activeData.placeholder.replace(oldVal, '') + val
-    },
-    activeId: {
-      handler(val) {
-        oldActiveId = val
-      },
-      immediate: true
-    }
-  },
-  mounted() {
-    const clipboard = new ClipboardJS('#copyNode', {
-      text: trigger => {
-        const codeStr = this.generateCode()
-        this.$notify({
-          title: '成功',
-          message: '代码已复制到剪切板，可粘贴。',
-          type: 'success'
-        })
-        return codeStr
-      }
-    })
-    clipboard.on('error', e => {
-      this.$message.error('代码复制失败')
-    })
-  },
-  methods: {
-    activeFormItem(element) {
-      this.activeData = element
-      this.activeId = element.formId
-    },
-    onEnd(obj, a) {
-      if (obj.from !== obj.to) {
-        this.activeData = tempActiveData
-        this.activeId = this.idGlobal
-      }
-    },
-    addComponent(item) {
-      const clone = this.cloneComponent(item)
-      this.drawingList.push(clone)
-      this.activeFormItem(clone)
-    },
-    cloneComponent(origin) {
-      const clone = JSON.parse(JSON.stringify(origin))
-      clone.formId = ++this.idGlobal
-      clone.span = formConf.span
-      clone.renderKey = +new Date() // 改变renderKey后可以实现强制更新组件
-      if (!clone.layout) clone.layout = 'colFormItem'
-      if (clone.layout === 'colFormItem') {
-        clone.vModel = `field${this.idGlobal}`
-        clone.placeholder !== undefined && (clone.placeholder += clone.label)
-        tempActiveData = clone
-      } else if (clone.layout === 'rowFormItem') {
-        delete clone.label
-        clone.componentName = `row${this.idGlobal}`
-        clone.gutter = this.formConf.gutter
-        tempActiveData = clone
-      }
-      return tempActiveData
-    },
-    AssembleFormData() {
-      this.formData = {
-        fields: JSON.parse(JSON.stringify(this.drawingList)),
-        ...this.formConf
-      }
-    },
-    generate(data) {
-      const func = this[`exec${titleCase(this.operationType)}`]
-      this.generateConf = data
-      func && func(data)
-    },
-    execRun(data) {
-      this.AssembleFormData()
-      this.drawerVisible = true
-    },
-    execDownload(data) {
-      const codeStr = this.generateCode()
-      const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
-      this.$download.saveAs(blob, data.fileName)
-    },
-    execCopy(data) {
-      document.getElementById('copyNode').click()
-    },
-    empty() {
-      this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
-        () => {
-          this.drawingList = []
-        }
-      )
-    },
-    drawingItemCopy(item, parent) {
-      let clone = JSON.parse(JSON.stringify(item))
-      clone = this.createIdAndKey(clone)
-      parent.push(clone)
-      this.activeFormItem(clone)
-    },
-    createIdAndKey(item) {
-      item.formId = ++this.idGlobal
-      item.renderKey = +new Date()
-      if (item.layout === 'colFormItem') {
-        item.vModel = `field${this.idGlobal}`
-      } else if (item.layout === 'rowFormItem') {
-        item.componentName = `row${this.idGlobal}`
-      }
-      if (Array.isArray(item.children)) {
-        item.children = item.children.map(childItem => this.createIdAndKey(childItem))
-      }
-      return item
-    },
-    drawingItemDelete(index, parent) {
-      parent.splice(index, 1)
-      this.$nextTick(() => {
-        const len = this.drawingList.length
-        if (len) {
-          this.activeFormItem(this.drawingList[len - 1])
-        }
-      })
-    },
-    generateCode() {
-      const { type } = this.generateConf
-      this.AssembleFormData()
-      const script = vueScript(makeUpJs(this.formData, type))
-      const html = vueTemplate(makeUpHtml(this.formData, type))
-      const css = cssStyle(makeUpCss(this.formData))
-      return beautifier.html(html + script + css, beautifierConf.html)
-    },
-    download() {
-      this.dialogVisible = true
-      this.showFileName = true
-      this.operationType = 'download'
-    },
-    run() {
-      this.dialogVisible = true
-      this.showFileName = false
-      this.operationType = 'run'
-    },
-    copy() {
-      this.dialogVisible = true
-      this.showFileName = false
-      this.operationType = 'copy'
-    },
-    tagChange(newTag) {
-      newTag = this.cloneComponent(newTag)
-      newTag.vModel = this.activeData.vModel
-      newTag.formId = this.activeId
-      newTag.span = this.activeData.span
-      delete this.activeData.tag
-      delete this.activeData.tagIcon
-      delete this.activeData.document
-      Object.keys(newTag).forEach(key => {
-        if (this.activeData[key] !== undefined
-          && typeof this.activeData[key] === typeof newTag[key]) {
-          newTag[key] = this.activeData[key]
-        }
-      })
-      this.activeData = newTag
-      this.updateDrawingList(newTag, this.drawingList)
-    },
-    updateDrawingList(newTag, list) {
-      const index = list.findIndex(item => item.formId === this.activeId)
-      if (index > -1) {
-        list.splice(index, 1, newTag)
-      } else {
-        list.forEach(item => {
-          if (Array.isArray(item.children)) this.updateDrawingList(newTag, item.children)
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style lang='scss'>
-body, html{
-  margin: 0;
-  padding: 0;
-  background: #fff;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
-}
-
-input, textarea{
-  font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
-}
-
-.editor-tabs{
-  background: #121315;
-  .el-tabs__header{
-    margin: 0;
-    border-bottom-color: #121315;
-    .el-tabs__nav{
-      border-color: #121315;
-    }
-  }
-  .el-tabs__item{
-    height: 32px;
-    line-height: 32px;
-    color: #888a8e;
-    border-left: 1px solid #121315 !important;
-    background: #363636;
-    margin-right: 5px;
-    user-select: none;
-  }
-  .el-tabs__item.is-active{
-    background: #1e1e1e;
-    border-bottom-color: #1e1e1e!important;
-    color: #fff;
-  }
-  .el-icon-edit{
-    color: #f1fa8c;
-  }
-  .el-icon-document{
-    color: #a95812;
-  }
-}
-
-// home
-.right-scrollbar {
-  .el-scrollbar__view {
-    padding: 12px 18px 15px 15px;
-  }
-}
-.left-scrollbar .el-scrollbar__wrap {
-  box-sizing: border-box;
-  overflow-x: hidden !important;
-  margin-bottom: 0 !important;
-}
-.center-tabs{
-  .el-tabs__header{
-    margin-bottom: 0!important;
-  }
-  .el-tabs__item{
-    width: 50%;
-    text-align: center;
-  }
-  .el-tabs__nav{
-    width: 100%;
-  }
-}
-.reg-item{
-  padding: 12px 6px;
-  background: #f8f8f8;
-  position: relative;
-  border-radius: 4px;
-  .close-btn{
-    position: absolute;
-    right: -6px;
-    top: -6px;
-    display: block;
-    width: 16px;
-    height: 16px;
-    line-height: 16px;
-    background: rgba(0, 0, 0, 0.2);
-    border-radius: 50%;
-    color: #fff;
-    text-align: center;
-    z-index: 1;
-    cursor: pointer;
-    font-size: 12px;
-    &:hover{
-      background: rgba(210, 23, 23, 0.5)
-    }
-  }
-  & + .reg-item{
-    margin-top: 18px;
-  }
-}
-.action-bar{
-  & .el-button+.el-button {
-    margin-left: 15px;
-  }
-  & i {
-    font-size: 20px;
-    vertical-align: middle;
-    position: relative;
-    top: -1px;
-  }
-}
-
-.custom-tree-node{
-  width: 100%;
-  font-size: 14px;
-  .node-operation{
-    float: right;
-  }
-  i[class*="el-icon"] + i[class*="el-icon"]{
-    margin-left: 6px;
-  }
-  .el-icon-plus{
-    color: #00acac;
-  }
-  .el-icon-delete{
-    color: #157a0c;
-  }
-}
-
-.left-scrollbar .el-scrollbar__view{
-  overflow-x: hidden;
-}
-
-.el-rate{
-  display: inline-block;
-  vertical-align: text-top;
-}
-.el-upload__tip{
-  line-height: 1.2;
-}
-
-$selectedColor: #f6f7ff;
-$lighterBlue: #00acac;
-
-.container {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-.components-list {
-  padding: 8px;
-  box-sizing: border-box;
-  height: 100%;
-  .components-item {
-    display: inline-block;
-    width: 48%;
-    margin: 1%;
-    transition: transform 0ms !important;
-  }
-}
-.components-draggable{
-  padding-bottom: 20px;
-}
-.components-title{
-  font-size: 14px;
-  color: #222;
-  margin: 6px 2px;
-  .svg-icon{
-    color: #666;
-    font-size: 18px;
-  }
-}
-
-.components-body {
-  padding: 8px 10px;
-  background: $selectedColor;
-  font-size: 12px;
-  cursor: move;
-  border: 1px dashed $selectedColor;
-  border-radius: 3px;
-  .svg-icon{
-    color: #777;
-    font-size: 15px;
-  }
-  &:hover {
-    border: 1px dashed #787be8;
-    color: #787be8;
-    .svg-icon {
-      color: #787be8;
-    }
-  }
-}
-
-.left-board {
-  width: 260px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 100vh;
-}
-.left-scrollbar{
-  height: calc(100vh - 42px);
-  overflow: hidden;
-}
-.center-scrollbar {
-  height: calc(100vh - 42px);
-  overflow: hidden;
-  border-left: 1px solid #f1e8e8;
-  border-right: 1px solid #f1e8e8;
-  box-sizing: border-box;
-}
-.center-board {
-  height: 100vh;
-  width: auto;
-  margin: 0 350px 0 260px;
-  box-sizing: border-box;
-}
-.empty-info{
-  position: absolute;
-  top: 46%;
-  left: 0;
-  right: 0;
-  text-align: center;
-  font-size: 18px;
-  color: #ccb1ea;
-  letter-spacing: 4px;
-}
-.action-bar{
-  position: relative;
-  height: 42px;
-  text-align: right;
-  padding: 0 15px;
-  box-sizing: border-box;;
-  border: 1px solid #f1e8e8;
-  border-top: none;
-  border-left: none;
-  .delete-btn{
-    color: #F56C6C;
-  }
-}
-.logo-wrapper{
-  position: relative;
-  height: 42px;
-  background: #fff;
-  border-bottom: 1px solid #f1e8e8;
-  box-sizing: border-box;
-}
-.logo{
-  position: absolute;
-  left: 12px;
-  top: 6px;
-  line-height: 30px;
-  color: #00afff;
-  font-weight: 600;
-  font-size: 17px;
-  white-space: nowrap;
-  > img{
-    width: 30px;
-    height: 30px;
-    vertical-align: top;
-  }
-  .github{
-    display: inline-block;
-    vertical-align: sub;
-    margin-left: 15px;
-    > img{
-      height: 22px;
-    }
-  }
-}
-
-.center-board-row {
-  padding: 12px 12px 15px 12px;
-  box-sizing: border-box;
-  & > .el-form {
-    // 69 = 12+15+42
-    height: calc(100vh - 69px);
-  }
-}
-.drawing-board {
-  height: 100%;
-  position: relative;
-  .components-body {
-    padding: 0;
-    margin: 0;
-    font-size: 0;
-  }
-  .sortable-ghost {
-    position: relative;
-    display: block;
-    overflow: hidden;
-    &::before {
-      content: " ";
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0;
-      height: 3px;
-      background: rgb(89, 89, 223);
-      z-index: 2;
-    }
-  }
-  .components-item.sortable-ghost {
-    width: 100%;
-    height: 60px;
-    background-color: $selectedColor;
-  }
-  .active-from-item {
-    & > .el-form-item{
-      background: $selectedColor;
-      border-radius: 6px;
-    }
-    & > .drawing-item-copy, & > .drawing-item-delete{
-      display: initial;
-    }
-    & > .component-name{
-      color: $lighterBlue;
-    }
-  }
-  .el-form-item{
-    margin-bottom: 15px;
-  }
-}
-.drawing-item{
-  position: relative;
-  cursor: move;
-  &.unfocus-bordered:not(.activeFromItem) > div:first-child  {
-    border: 1px dashed #ccc;
-  }
-  .el-form-item{
-    padding: 12px 10px;
-  }
-}
-.drawing-row-item{
-  position: relative;
-  cursor: move;
-  box-sizing: border-box;
-  border: 1px dashed #ccc;
-  border-radius: 3px;
-  padding: 0 2px;
-  margin-bottom: 15px;
-  .drawing-row-item {
-    margin-bottom: 2px;
-  }
-  .el-col{
-    margin-top: 22px;
-  }
-  .el-form-item{
-    margin-bottom: 0;
-  }
-  .drag-wrapper{
-    min-height: 80px;
-  }
-  &.active-from-item{
-    border: 1px dashed $lighterBlue;
-  }
-  .component-name{
-    position: absolute;
-    top: 0;
-    left: 0;
-    font-size: 12px;
-    color: #bbb;
-    display: inline-block;
-    padding: 0 6px;
-  }
-}
-.drawing-item, .drawing-row-item{
-  &:hover {
-    & > .el-form-item{
-      background: $selectedColor;
-      border-radius: 6px;
-    }
-    & > .drawing-item-copy, & > .drawing-item-delete{
-      display: initial;
-    }
-  }
-  & > .drawing-item-copy, & > .drawing-item-delete{
-    display: none;
-    position: absolute;
-    top: -10px;
-    width: 22px;
-    height: 22px;
-    line-height: 22px;
-    text-align: center;
-    border-radius: 50%;
-    font-size: 12px;
-    border: 1px solid;
-    cursor: pointer;
-    z-index: 1;
-  }
-  & > .drawing-item-copy{
-    right: 56px;
-    border-color: $lighterBlue;
-    color: $lighterBlue;
-    background: #fff;
-    &:hover{
-      background: $lighterBlue;
-      color: #fff;
-    }
-  }
-  & > .drawing-item-delete{
-    right: 24px;
-    border-color: #F56C6C;
-    color: #F56C6C;
-    background: #fff;
-    &:hover{
-      background: #F56C6C;
-      color: #fff;
-    }
-  }
-}
-
-</style>
diff --git a/fuintAdmin_zt/src/views/tool/gen/basicInfoForm.vue b/fuintAdmin_zt/src/views/tool/gen/basicInfoForm.vue
deleted file mode 100644
index 70295298e..000000000
--- a/fuintAdmin_zt/src/views/tool/gen/basicInfoForm.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="表名称" prop="tableName">
-          <el-input placeholder="请输入仓库名称" v-model="info.tableName" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="表描述" prop="tableComment">
-          <el-input placeholder="请输入" v-model="info.tableComment" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="实体类名称" prop="className">
-          <el-input placeholder="请输入" v-model="info.className" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="作者" prop="functionAuthor">
-          <el-input placeholder="请输入" v-model="info.functionAuthor" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" :rows="3" v-model="info.remark"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-
-<script>
-export default {
-  props: {
-    info: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      rules: {
-        tableName: [
-          { required: true, message: "请输入表名称", trigger: "blur" }
-        ],
-        tableComment: [
-          { required: true, message: "请输入表描述", trigger: "blur" }
-        ],
-        className: [
-          { required: true, message: "请输入实体类名称", trigger: "blur" }
-        ],
-        functionAuthor: [
-          { required: true, message: "请输入作者", trigger: "blur" }
-        ]
-      }
-    };
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/gen/editTable.vue b/fuintAdmin_zt/src/views/tool/gen/editTable.vue
deleted file mode 100644
index d87a493fb..000000000
--- a/fuintAdmin_zt/src/views/tool/gen/editTable.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-card>
-    <el-tabs v-model="activeName">
-      <el-tab-pane label="基本信息" name="basic">
-        <basic-info-form ref="basicInfo" :info="info" />
-      </el-tab-pane>
-      <el-tab-pane label="字段信息" name="columnInfo">
-        <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
-          <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
-          <el-table-column
-            label="字段列名"
-            prop="columnName"
-            min-width="10%"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column label="字段描述" min-width="10%">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.columnComment"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="物理类型"
-            prop="columnType"
-            min-width="10%"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column label="Java类型" min-width="11%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.javaType">
-                <el-option label="Long" value="Long" />
-                <el-option label="String" value="String" />
-                <el-option label="Integer" value="Integer" />
-                <el-option label="Double" value="Double" />
-                <el-option label="BigDecimal" value="BigDecimal" />
-                <el-option label="Date" value="Date" />
-                <el-option label="Boolean" value="Boolean" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="java属性" min-width="10%">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.javaField"></el-input>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="插入" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="编辑" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="列表" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="查询" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="查询方式" min-width="10%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.queryType">
-                <el-option label="=" value="EQ" />
-                <el-option label="!=" value="NE" />
-                <el-option label=">" value="GT" />
-                <el-option label=">=" value="GTE" />
-                <el-option label="<" value="LT" />
-                <el-option label="<=" value="LTE" />
-                <el-option label="LIKE" value="LIKE" />
-                <el-option label="BETWEEN" value="BETWEEN" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="必填" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="显示类型" min-width="12%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.htmlType">
-                <el-option label="文本框" value="input" />
-                <el-option label="文本域" value="textarea" />
-                <el-option label="下拉框" value="select" />
-                <el-option label="单选框" value="radio" />
-                <el-option label="复选框" value="checkbox" />
-                <el-option label="日期控件" value="datetime" />
-                <el-option label="图片上传" value="imageUpload" />
-                <el-option label="文件上传" value="fileUpload" />
-                <el-option label="富文本控件" value="editor" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="字典类型" min-width="12%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
-                <el-option
-                  v-for="dict in dictOptions"
-                  :key="dict.dictType"
-                  :label="dict.dictName"
-                  :value="dict.dictType">
-                  <span style="float: left">{{ dict.dictName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
-              </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="生成信息" name="genInfo">
-        <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/>
-      </el-tab-pane>
-    </el-tabs>
-    <el-form label-width="100px">
-      <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
-        <el-button type="primary" @click="submitForm()">提交</el-button>
-        <el-button @click="close()">返回</el-button>
-      </el-form-item>
-    </el-form>
-  </el-card>
-</template>
-
-<script>
-import { getGenTable, updateGenTable } from "@/api/tool/gen";
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
-import { listMenu as getMenuTreeselect } from "@/api/system/menu";
-import basicInfoForm from "./basicInfoForm";
-import genInfoForm from "./genInfoForm";
-import Sortable from 'sortablejs'
-
-export default {
-  name: "GenEdit",
-  components: {
-    basicInfoForm,
-    genInfoForm
-  },
-  data() {
-    return {
-      // 选中选项卡的 name
-      activeName: "columnInfo",
-      // 表格的高度
-      tableHeight: document.documentElement.scrollHeight - 245 + "px",
-      // 表信息
-      tables: [],
-      // 表列信息
-      columns: [],
-      // 字典信息
-      dictOptions: [],
-      // 菜单信息
-      menus: [],
-      // 表详细信息
-      info: {}
-    };
-  },
-  created() {
-    const tableId = this.$route.params && this.$route.params.tableId;
-    if (tableId) {
-      // 获取表详细信息
-      getGenTable(tableId).then(res => {
-        this.columns = res.data.rows;
-        this.info = res.data.info;
-        this.tables = res.data.tables;
-      });
-      /** 查询字典下拉列表 */
-      getDictOptionselect().then(response => {
-        this.dictOptions = response.data;
-      });
-      /** 查询菜单下拉列表 */
-      getMenuTreeselect().then(response => {
-        this.menus = this.handleTree(response.data, "menuId");
-      });
-    }
-  },
-  methods: {
-    /** 提交按钮 */
-    submitForm() {
-      const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
-      const genForm = this.$refs.genInfo.$refs.genInfoForm;
-      Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
-        const validateResult = res.every(item => !!item);
-        if (validateResult) {
-          const genTable = Object.assign({}, basicForm.model, genForm.model);
-          genTable.columns = this.columns;
-          genTable.params = {
-            treeCode: genTable.treeCode,
-            treeName: genTable.treeName,
-            treeParentCode: genTable.treeParentCode,
-            parentMenuId: genTable.parentMenuId
-          };
-          updateGenTable(genTable).then(res => {
-            this.$modal.msgSuccess(res.msg);
-            if (res.code === 200) {
-              this.close();
-            }
-          });
-        } else {
-          this.$modal.msgError("表单校验未通过，请重新检查提交内容");
-        }
-      });
-    },
-    getFormPromise(form) {
-      return new Promise(resolve => {
-        form.validate(res => {
-          resolve(res);
-        });
-      });
-    },
-    /** 关闭按钮 */
-    close() {
-      const obj = { path: "/tool/gen", query: { t: Date.now(), page: this.$route.query.page } };
-      this.$tab.closeOpenPage(obj);
-    }
-  },
-  mounted() {
-    const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
-    const sortable = Sortable.create(el, {
-      handle: ".allowDrag",
-      onEnd: evt => {
-        const targetRow = this.columns.splice(evt.oldIndex, 1)[0];
-        this.columns.splice(evt.newIndex, 0, targetRow);
-        for (let index in this.columns) {
-          this.columns[index].sort = parseInt(index) + 1;
-        }
-      }
-    });
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/gen/genInfoForm.vue b/fuintAdmin_zt/src/views/tool/gen/genInfoForm.vue
deleted file mode 100644
index 63463a05b..000000000
--- a/fuintAdmin_zt/src/views/tool/gen/genInfoForm.vue
+++ /dev/null
@@ -1,299 +0,0 @@
-<template>
-  <el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item prop="tplCategory">
-          <span slot="label">生成模板</span>
-          <el-select v-model="info.tplCategory" @change="tplSelectChange">
-            <el-option label="单表（增删改查）" value="crud" />
-            <el-option label="树表（增删改查）" value="tree" />
-            <el-option label="主子表（增删改查）" value="sub" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item prop="packageName">
-          <span slot="label">
-            生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.fuint.system" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.packageName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="moduleName">
-          <span slot="label">
-            生成模块名
-            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.moduleName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="businessName">
-          <span slot="label">
-            生成业务名
-            <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.businessName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="functionName">
-          <span slot="label">
-            生成功能名
-            <el-tooltip content="用作类描述，例如 用户" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.functionName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            上级菜单
-            <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <treeselect
-            :append-to-body="true"
-            v-model="info.parentMenuId"
-            :options="menus"
-            :normalizer="normalizer"
-            :show-count="true"
-            placeholder="请选择系统菜单"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="genType">
-          <span slot="label">
-            生成代码方式
-            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
-          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="24" v-if="info.genType == '1'">
-        <el-form-item prop="genPath">
-          <span slot="label">
-            自定义路径
-            <el-tooltip content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.genPath">
-            <el-dropdown slot="append">
-              <el-button type="primary">
-                最近路径快速选择
-                <i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-show="info.tplCategory == 'tree'">
-      <h4 class="form-header">其他信息</h4>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            树编码字段
-            <el-tooltip content="树显示的编码字段名， 如：dept_id" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.treeCode" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in info.columns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            树父编码字段
-            <el-tooltip content="树显示的父编码字段名， 如：parent_Id" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.treeParentCode" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in info.columns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            树名称字段
-            <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.treeName" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in info.columns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row v-show="info.tplCategory == 'sub'">
-      <h4 class="form-header">关联信息</h4>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            关联子表的表名
-            <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
-            <el-option
-              v-for="(table, index) in tables"
-              :key="index"
-              :label="table.tableName + '：' + table.tableComment"
-              :value="table.tableName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            子表关联的外键名
-            <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.subTableFkName" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in subColumns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-
-<script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  components: { Treeselect },
-  props: {
-    info: {
-      type: Object,
-      default: null
-    },
-    tables: {
-      type: Array,
-      default: null
-    },
-    menus: {
-      type: Array,
-      default: []
-    },
-  },
-  data() {
-    return {
-      subColumns: [],
-      rules: {
-        tplCategory: [
-          { required: true, message: "请选择生成模板", trigger: "blur" }
-        ],
-        packageName: [
-          { required: true, message: "请输入生成包路径", trigger: "blur" }
-        ],
-        moduleName: [
-          { required: true, message: "请输入生成模块名", trigger: "blur" }
-        ],
-        businessName: [
-          { required: true, message: "请输入生成业务名", trigger: "blur" }
-        ],
-        functionName: [
-          { required: true, message: "请输入生成功能名", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {},
-  watch: {
-    'info.subTableName': function(val) {
-      this.setSubTableColumns(val);
-    }
-  },
-  methods: {
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.menuId,
-        label: node.menuName,
-        children: node.children
-      };
-    },
-    /** 选择子表名触发 */
-    subSelectChange(value) {
-      this.info.subTableFkName = '';
-    },
-    /** 选择生成模板触发 */
-    tplSelectChange(value) {
-      if(value !== 'sub') {
-        this.info.subTableName = '';
-        this.info.subTableFkName = '';
-      }
-    },
-    /** 设置关联外键 */
-    setSubTableColumns(value) {
-      for (var item in this.tables) {
-        const name = this.tables[item].tableName;
-        if (value === name) {
-          this.subColumns = this.tables[item].columns;
-          break;
-        }
-      }
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/gen/importTable.vue b/fuintAdmin_zt/src/views/tool/gen/importTable.vue
deleted file mode 100644
index d8fe9dc29..000000000
--- a/fuintAdmin_zt/src/views/tool/gen/importTable.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="表名称" prop="tableName">
-        <el-input
-          v-model="queryParams.tableName"
-          placeholder="请输入表名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="表描述" prop="tableComment">
-        <el-input
-          v-model="queryParams.tableComment"
-          placeholder="请输入表描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column prop="updateTime" label="更新时间"></el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleImportTable">确 定</el-button>
-      <el-button @click="visible = false">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { listDbTable, importTable } from "@/api/tool/gen";
-export default {
-  data() {
-    return {
-      // 遮罩层
-      visible: false,
-      // 选中数组值
-      tables: [],
-      // 总条数
-      total: 0,
-      // 表数据
-      dbTableList: [],
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        tableName: undefined,
-        tableComment: undefined
-      }
-    };
-  },
-  methods: {
-    // 显示弹框
-    show() {
-      this.getList();
-      this.visible = true;
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.tables = selection.map(item => item.tableName);
-    },
-    // 查询表数据
-    getList() {
-      listDbTable(this.queryParams).then(res => {
-        if (res.code === 200) {
-          this.dbTableList = res.rows;
-          this.total = res.total;
-        }
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 导入按钮操作 */
-    handleImportTable() {
-      const tableNames = this.tables.join(",");
-      if (tableNames == "") {
-        this.$modal.msgError("请选择要导入的表");
-        return;
-      }
-      importTable({ tables: tableNames }).then(res => {
-        this.$modal.msgSuccess(res.msg);
-        if (res.code === 200) {
-          this.visible = false;
-          this.$emit("ok");
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/gen/index.vue b/fuintAdmin_zt/src/views/tool/gen/index.vue
deleted file mode 100644
index 65cc782ab..000000000
--- a/fuintAdmin_zt/src/views/tool/gen/index.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="表名称" prop="tableName">
-        <el-input
-          v-model="queryParams.tableName"
-          placeholder="请输入表名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="表描述" prop="tableComment">
-        <el-input
-          v-model="queryParams.tableComment"
-          placeholder="请输入表描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleGenTable"
-          v-hasPermi="['tool:gen:code']"
-        >生成</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload"
-          size="mini"
-          @click="openImportTable"
-          v-hasPermi="['tool:gen:import']"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleEditTable"
-          v-hasPermi="['tool:gen:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['tool:gen:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" align="center" width="55"></el-table-column>
-      <el-table-column label="序号" type="index" width="50" align="center">
-        <template slot-scope="scope">
-          <span>{{(queryParams.page - 1) * queryParams.pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="表名称"
-        align="center"
-        prop="tableName"
-        :show-overflow-tooltip="true"
-        width="120"
-      />
-      <el-table-column
-        label="表描述"
-        align="center"
-        prop="tableComment"
-        :show-overflow-tooltip="true"
-        width="120"
-      />
-      <el-table-column
-        label="实体"
-        align="center"
-        prop="className"
-        :show-overflow-tooltip="true"
-        width="120"
-      />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            icon="el-icon-view"
-            @click="handlePreview(scope.row)"
-            v-hasPermi="['tool:gen:preview']"
-          >预览</el-button>
-          <el-button
-            type="text"
-            size="small"
-            icon="el-icon-edit"
-            @click="handleEditTable(scope.row)"
-            v-hasPermi="['tool:gen:edit']"
-          >编辑</el-button>
-          <el-button
-            type="text"
-            size="small"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['tool:gen:remove']"
-          >删除</el-button>
-          <el-button
-            type="text"
-            size="small"
-            icon="el-icon-refresh"
-            @click="handleSynchDb(scope.row)"
-            v-hasPermi="['tool:gen:edit']"
-          >同步</el-button>
-          <el-button
-            type="text"
-            size="small"
-            icon="el-icon-download"
-            @click="handleGenTable(scope.row)"
-            v-hasPermi="['tool:gen:code']"
-          >生成代码</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!-- 预览界面 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
-      <el-tabs v-model="preview.activeName">
-        <el-tab-pane
-          v-for="(value, key) in preview.data"
-          :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
-          :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
-          :key="key"
-        >
-          <el-link :underline="false" icon="el-icon-document-copy" v-clipboard:copy="value" v-clipboard:success="clipboardSuccess" style="float:right">复制</el-link>
-          <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
-        </el-tab-pane>
-      </el-tabs>
-    </el-dialog>
-    <import-table ref="import" @ok="handleQuery" />
-  </div>
-</template>
-
-<script>
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
-import importTable from "./importTable";
-import hljs from "highlight.js/lib/highlight";
-import "highlight.js/styles/github-gist.css";
-hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
-hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
-hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
-hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"));
-hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"));
-hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
-
-export default {
-  name: "Gen",
-  components: { importTable },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 唯一标识符
-      uniqueId: "",
-      // 选中数组
-      ids: [],
-      // 选中表数组
-      tableNames: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表数据
-      tableList: [],
-      // 日期范围
-      dateRange: "",
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        tableName: undefined,
-        tableComment: undefined
-      },
-      // 预览参数
-      preview: {
-        open: false,
-        title: "代码预览",
-        data: {},
-        activeName: "domain.java"
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  activated() {
-    const time = this.$route.query.t;
-    if (time != null && time != this.uniqueId) {
-      this.uniqueId = time;
-      this.queryParams.page = Number(this.$route.query.page);
-      this.getList();
-    }
-  },
-  methods: {
-    /** 查询表集合 */
-    getList() {
-      this.loading = true;
-      listTable(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.tableList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    /** 生成代码操作 */
-    handleGenTable(row) {
-      const tableNames = row.tableName || this.tableNames;
-      if (tableNames == "") {
-        this.$modal.msgError("请选择要生成的数据");
-        return;
-      }
-      if(row.genType === "1") {
-        genCode(row.tableName).then(response => {
-          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
-        });
-      } else {
-        this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "fuint");
-      }
-    },
-    /** 同步数据库操作 */
-    handleSynchDb(row) {
-      const tableName = row.tableName;
-      this.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function() {
-        return synchDb(tableName);
-      }).then(() => {
-        this.$modal.msgSuccess("同步成功");
-      }).catch(() => {});
-    },
-    /** 打开导入表弹窗 */
-    openImportTable() {
-      this.$refs.import.show();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 预览按钮 */
-    handlePreview(row) {
-      previewTable(row.tableId).then(response => {
-        this.preview.data = response.data;
-        this.preview.open = true;
-        this.preview.activeName = "domain.java";
-      });
-    },
-    /** 高亮显示 */
-    highlightedCode(code, key) {
-      const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"));
-      var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
-      const result = hljs.highlight(language, code || "", true);
-      return result.value || '&nbsp;';
-    },
-    /** 复制代码成功 */
-    clipboardSuccess(){
-      this.$modal.msgSuccess("复制成功");
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.tableId);
-      this.tableNames = selection.map(item => item.tableName);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    /** 修改按钮操作 */
-    handleEditTable(row) {
-      const tableId = row.tableId || this.ids[0];
-      const tableName = row.tableName || this.tableNames[0];
-      const params = { page: this.queryParams.page };
-      this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params);
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const tableIds = row.tableId || this.ids;
-      this.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function() {
-        return delTable(tableIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/tool/swagger/index.vue b/fuintAdmin_zt/src/views/tool/swagger/index.vue
deleted file mode 100644
index b8becc67c..000000000
--- a/fuintAdmin_zt/src/views/tool/swagger/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <i-frame :src="url" />
-</template>
-<script>
-import iFrame from "@/components/iFrame/index";
-export default {
-  name: "Swagger",
-  components: { iFrame },
-  data() {
-    return {
-      url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
-    };
-  },
-};
-</script>
diff --git a/fuintAdmin_zt/src/views/userGrade/index.vue b/fuintAdmin_zt/src/views/userGrade/index.vue
deleted file mode 100644
index d25395062..000000000
--- a/fuintAdmin_zt/src/views/userGrade/index.vue
+++ /dev/null
@@ -1,389 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="等级名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入等级名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="升级方式" prop="catchType">
-        <el-select
-          v-model="queryParams.catchType"
-          clearable
-          placeholder="升级方式"
-        >
-          <el-option v-for="catchType in catchTypeList" :key="catchType.key" :label="catchType.name" :value="catchType.value"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="启用" value="A"/>
-          <el-option key="N" label="禁用" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['userGrade:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="等级" prop="grade" width="55"/>
-      <el-table-column label="等级名称" align="center" prop="name" />
-      <el-table-column label="升级方式" align="center" prop="catchType" />
-      <el-table-column label="升级条件值" align="center" prop="catchValue">
-        <template slot-scope="scope">
-          <span v-if="scope.row.catchValue > 0">
-              <span>{{ scope.row.catchValue }}</span>
-          </span>
-          <span v-else>无条件</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="有效天数" align="center" prop="validDay">
-         <template slot-scope="scope">
-             <span v-if="scope.row.validDay > 0">{{ scope.row.validDay + '天' }}</span>
-             <span v-else>永久</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="支付折扣" align="center" prop="discount">
-        <template slot-scope="scope">
-          <span v-if="scope.row.discount > 0">{{ scope.row.discount + '折' }}</span>
-          <span v-else>无折扣</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="积分加速" align="center" prop="speedPoint">
-        <template slot-scope="scope">
-          <span v-if="scope.row.speedPoint > 0">{{ scope.row.speedPoint + '倍数' }}</span>
-          <span v-else>不加倍</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['userGrade:add']"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-hasPermi="['userGrade:add']"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="等级" prop="grade">
-              <el-input v-model="form.grade" placeholder="请输入等级，正整数" maxlength="10" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="等级名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入等级名称" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="升级条件描述" prop="catchCondition">
-              <el-input v-model="form.catchCondition" placeholder="请输入升级条件描述" maxlength="200" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="升级权益描述" prop="userPrivilege">
-              <el-input v-model="form.userPrivilege" type="textarea" placeholder="请输入升级权益描述"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="升级方式" prop="catchType">
-              <el-select
-                v-model="form.catchType"
-                clearable
-                placeholder="升级方式"
-              >
-                <el-option v-for="catchType in catchTypeList" :key="catchType.key" :label="catchType.name" :value="catchType.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="升级条件值" prop="catchValue">
-              <el-input v-model="form.catchValue" placeholder="请输入升级条件值，单位可能是元、次"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="有效天数" prop="validDay">
-              <el-input v-model="form.validDay" placeholder="请输入有效天数，如30，0表示永久有效"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="支付折扣" prop="discount">
-              <el-input v-model="form.discount" placeholder="请输入支付折扣，数字，如：8.8"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="积分加速" prop="speedPoint">
-              <el-input v-model="form.speedPoint" placeholder="请输入积分加速，积分加速倍数，数字"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio key="A" label="A" value="A">启用</el-radio>
-                <el-radio key="N" label="N" value="N">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getUserGradeList, updateUserGradeStatus, getUserGradeInfo, saveUserGrade, deleteUserGrade } from "@/api/userGrade";
-export default {
-  name: "UserGradeIndex",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 标题
-      title: "",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 升级条件
-      catchTypeList: [],
-      // 是否显示弹出层
-      open: false,
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 表单参数
-      form: { id: '', grade: 0, name: '', catchCondition: '', userPrivilege: '', catchType: '', catchValue: '', validDay: '', discount: '', speedPoint: '', status: "A" },
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        name: '',
-        catchType: '',
-        status: ''
-      },
-      // 表单校验
-      rules: {
-        grade: [
-          { required: true, message: "等级不能为空", trigger: "blur" },
-          { pattern: /^[0-9]{1,10}$/ , message: `必须正整数`, trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: "等级名称不能为空", trigger: "blur" },
-          { min: 2, max: 100, message: '等级名称长度必须介于2 和 100 之间', trigger: 'blur' }
-        ],
-        catchType: [
-          { required: true, message: "请选择升级方式", trigger: "blur" },
-        ],
-        catchValue: [
-          { required: true, message: "请输入升级条件值", trigger: "blur" },
-        ],
-        validDay: [
-          { required: true, message: "请输入有效期天数，0表述永久有效", trigger: "blur" },
-        ],
-        discount: [
-          { required: true, message: "请输入支付折扣", trigger: "blur" },
-        ],
-        speedPoint: [
-          { required: true, message: "请输入加分加速倍数", trigger: "blur" },
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getUserGradeList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.catchTypeList = response.data.catchTypeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 状态修改
-    handleStatusChange(row) {
-      let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
-        return updateUserGradeStatus(row.id, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "N" ? "A" : "N";
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    // 新增按钮操作
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增会员等级";
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: "",
-        grade: "",
-        name: "",
-        status: "A",
-        catchType: "",
-        catchValue: "",
-        validDay: "",
-        discount: "",
-        speedPoint: "",
-        catchCondition: "",
-        userPrivilege: ""
-      };
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-              saveUserGrade(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-          } else {
-              saveUserGrade(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-          }
-        }
-      });
-    },
-    // 修改按钮操作
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getUserGradeInfo(id).then(response => {
-        this.form = response.data.userGradeInfo;
-        this.open = true;
-        this.title = "编辑会员等级";
-      });
-    },
-    // 删除按钮操作
-    handleDelete(row) {
-      const name = row.name
-      this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
-        return deleteUserGrade(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-
diff --git a/fuintAdmin_zt/vue.config.js b/fuintAdmin_zt/vue.config.js
deleted file mode 100644
index 01f42eb29..000000000
--- a/fuintAdmin_zt/vue.config.js
+++ /dev/null
@@ -1,137 +0,0 @@
-'use strict'
-const path = require('path')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-
-const CompressionPlugin = require('compression-webpack-plugin')
-
-const name = process.env.VUE_APP_TITLE || '百业兴智慧油站系统' // 网页标题
-
-// const port = process.env.port || process.env.npm_config_port || 81 // 端口
-const port = 82 // 端口
-
-const serverUrl = process.env.VUE_APP_SERVER_URL || 'https://www.fuint.cn'
-
-// vue.config.js 配置说明
-//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
-// 这里只列一部分，具体配置参考文档
-module.exports = {
-  // 部署生产环境和开发环境下的URL。
-  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.fuint.cn/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.fuint.cn/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
-  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
-  // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
-  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
-  // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0',
-    port: port,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: serverUrl,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
-    },
-    disableHostCheck: true
-  },
-  css: {
-    loaderOptions: {
-      sass: {
-        sassOptions: { outputStyle: "expanded" }
-      }
-    }
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    },
-    plugins: [
-      new CompressionPlugin({
-        test: /\.(js|css|html)?$/i,     // 压缩文件格式
-        filename: '[path].gz[query]',   // 压缩后的文件名
-        algorithm: 'gzip',              // 使用gzip压缩
-        minRatio: 0.8                   // 压缩率小于1才会压缩
-      })
-    ],
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
-
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single'),
-          {
-             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-             to: './' //到根目录下
-          }
-        }
-      )
-  }
-}
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index d35dad288..3405c6cbf 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -1,14 +1,11 @@
 # \u57FA\u672C\u914D\u7F6E
-server.port=8081
+server.port=8099
 env.profile=dev
 
 #env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
-env.properties.path=F:/work/oilSystem/fuintBackend/configure/
-
-
-#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
+#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
+env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
 #env.properties.path=D:/code/oilSystem/fuintBackend/configure/
-
 #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
 
 # \u6570\u636E\u5E93\u914D\u7F6E
@@ -59,9 +56,6 @@ rocketmq.producer.sendMsgTimeout=3000
 #?????????????2
 rocketmq.producer.retryTimesWhenSendFailed=2
 
-
-
-
 # ?????
 rocketmq.consumer.group=anran-consumer-group
 rocketmq.consumer.topic=anran-topic
diff --git a/fuintCashierWeb/.env.development b/fuintCashierWeb/.env.development
index 83ac69234..17068d26e 100644
--- a/fuintCashierWeb/.env.development
+++ b/fuintCashierWeb/.env.development
@@ -11,8 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-
-#VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
-#VUE_APP_SERVER_URL = 'http://192.168.31.178:8081'
-#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
-VUE_APP_SERVER_URL = 'http://localhost:8081/'
+VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'