diff --git a/.env.development b/.env.development index 91a500e..e1e5146 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = / # Cross-domain proxy, you can configure multiple # Please note that no line breaks # VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] -VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 +VITE_PROXY=[["/api","http://60.209.125.238:3008/"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 # Delete console VITE_DROP_CONSOLE = true diff --git a/package.json b/package.json index 60ab4bc..f7f8653 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "dependencies": { "@ant-design/colors": "^6.0.0", "@ant-design/icons-vue": "^6.1.0", + "@element-plus/icons-vue": "^2.3.1", "@iconify/iconify": "^2.2.1", "@logicflow/core": "^1.1.13", "@logicflow/extension": "^1.1.13", @@ -45,14 +46,15 @@ "@zxcvbn-ts/core": "^2.0.1", "ant-design-vue": "^3.2.0", "axios": "^0.26.1", - "element-plus": "^2.3.12", - "file-saver": "^2.0.5", "codemirror": "^5.65.3", "cropperjs": "^1.5.12", "crypto-js": "^4.1.1", "crypto.js": "^3.0.0", "dayjs": "^1.11.1", "echarts": "^5.3.2", + "element-plus": "^2.3.12", + "exceljs": "^4.3.0", + "file-saver": "^2.0.5", "intro.js": "^5.1.0", "lodash-es": "^4.17.21", "mockjs": "^1.1.0", @@ -71,11 +73,10 @@ "vue-json-pretty": "^2.0.6", "vue-router": "^4.0.14", "vue-types": "^4.1.1", - "xlsx": "^0.18.5", "vxe-table": "^4.3.9", "vxe-table-plugin-export-xlsx": "^3.0.4", "xe-utils": "^3.5.7", - "exceljs": "^4.3.0" + "xlsx": "^0.18.5" }, "devDependencies": { "@commitlint/cli": "^16.2.3", diff --git a/src/assets/icons/menu-caishui.svg b/src/assets/icons/menu-caishui.svg new file mode 100644 index 0000000..8d9d065 --- /dev/null +++ b/src/assets/icons/menu-caishui.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/menu-cangwei.svg b/src/assets/icons/menu-cangwei.svg new file mode 100644 index 0000000..c7a77c4 --- /dev/null +++ b/src/assets/icons/menu-cangwei.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/menu-chaxun.svg b/src/assets/icons/menu-chaxun.svg new file mode 100644 index 0000000..ce91e0f --- /dev/null +++ b/src/assets/icons/menu-chaxun.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/menu-chuanqi.svg b/src/assets/icons/menu-chuanqi.svg new file mode 100644 index 0000000..24f68e7 --- /dev/null +++ b/src/assets/icons/menu-chuanqi.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icons/menu-feiyong.svg b/src/assets/icons/menu-feiyong.svg new file mode 100644 index 0000000..4c71967 --- /dev/null +++ b/src/assets/icons/menu-feiyong.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-gongju.svg b/src/assets/icons/menu-gongju.svg new file mode 100644 index 0000000..d0e7488 --- /dev/null +++ b/src/assets/icons/menu-gongju.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-haiyun.svg b/src/assets/icons/menu-haiyun.svg new file mode 100644 index 0000000..f806124 --- /dev/null +++ b/src/assets/icons/menu-haiyun.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-huoban.svg b/src/assets/icons/menu-huoban.svg new file mode 100644 index 0000000..6ef0e44 --- /dev/null +++ b/src/assets/icons/menu-huoban.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-jichu.svg b/src/assets/icons/menu-jichu.svg new file mode 100644 index 0000000..32b645f --- /dev/null +++ b/src/assets/icons/menu-jichu.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/menu-jichu1.svg b/src/assets/icons/menu-jichu1.svg new file mode 100644 index 0000000..d1776b6 --- /dev/null +++ b/src/assets/icons/menu-jichu1.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-jiesuan.svg b/src/assets/icons/menu-jiesuan.svg new file mode 100644 index 0000000..2794cf7 --- /dev/null +++ b/src/assets/icons/menu-jiesuan.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icons/menu-renwu.svg b/src/assets/icons/menu-renwu.svg new file mode 100644 index 0000000..58b6b39 --- /dev/null +++ b/src/assets/icons/menu-renwu.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/menu-shenhe.svg b/src/assets/icons/menu-shenhe.svg new file mode 100644 index 0000000..9700fec --- /dev/null +++ b/src/assets/icons/menu-shenhe.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/icons/menu-shouye.svg b/src/assets/icons/menu-shouye.svg new file mode 100644 index 0000000..04af47b --- /dev/null +++ b/src/assets/icons/menu-shouye.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/menu-xiangmao.svg b/src/assets/icons/menu-xiangmao.svg new file mode 100644 index 0000000..d0e7488 --- /dev/null +++ b/src/assets/icons/menu-xiangmao.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-xiangshi.svg b/src/assets/icons/menu-xiangshi.svg new file mode 100644 index 0000000..76db259 --- /dev/null +++ b/src/assets/icons/menu-xiangshi.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-xitong.svg b/src/assets/icons/menu-xitong.svg new file mode 100644 index 0000000..c2628f4 --- /dev/null +++ b/src/assets/icons/menu-xitong.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/menu-zuzhi.svg b/src/assets/icons/menu-zuzhi.svg new file mode 100644 index 0000000..09c9524 --- /dev/null +++ b/src/assets/icons/menu-zuzhi.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/test.svg b/src/assets/icons/test.svg deleted file mode 100644 index 244252d..0000000 --- a/src/assets/icons/test.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Icon1@3x - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/Icon/src/IconPicker.vue b/src/components/Icon/src/IconPicker.vue index 4c4472a..dd1d94d 100644 --- a/src/components/Icon/src/IconPicker.vue +++ b/src/components/Icon/src/IconPicker.vue @@ -13,18 +13,10 @@ v-model="visible" :overlayClassName="`${prefixCls}-popover`" > - + - @@ -65,13 +62,12 @@ - diff --git a/src/components/Icon/src/SvgIcon.vue b/src/components/Icon/src/SvgIcon.vue index 7d6cee1..4eacce0 100644 --- a/src/components/Icon/src/SvgIcon.vue +++ b/src/components/Icon/src/SvgIcon.vue @@ -1,6 +1,7 @@