diff --git a/index.html b/index.html index 908092e..81ee23d 100644 --- a/index.html +++ b/index.html @@ -99,7 +99,6 @@ dot.forEach(item => (item.style.background = color)); if (isDark) html.style.background = "#141414"; } - window.http = "http://139.9.66.234:6688"; diff --git a/src/api/config/servicePort.ts b/src/api/config/servicePort.ts index 2541f5b..e7f3cca 100644 --- a/src/api/config/servicePort.ts +++ b/src/api/config/servicePort.ts @@ -1,3 +1,3 @@ // * 后端微服务端口名 -export const PORT1 = "http://192.168.34.122:6688"; -export const PORT2 = "http://139.9.66.234:6688"; +export const PORT1 = "http://139.9.66.234:6688"; +export const PORT2 = "http://192.168.34.122:6688"; diff --git a/src/assets/images/login/accountIcon.png b/src/assets/images/login/accountIcon.png new file mode 100644 index 0000000..5c75e40 Binary files /dev/null and b/src/assets/images/login/accountIcon.png differ diff --git a/src/assets/images/login/computerIcon.png b/src/assets/images/login/computerIcon.png new file mode 100644 index 0000000..12f522b Binary files /dev/null and b/src/assets/images/login/computerIcon.png differ diff --git a/src/assets/images/login/lockIcon.png b/src/assets/images/login/lockIcon.png new file mode 100644 index 0000000..e33cdbf Binary files /dev/null and b/src/assets/images/login/lockIcon.png differ diff --git a/src/assets/images/login/loginBackground.jpg b/src/assets/images/login/loginBackground.jpg new file mode 100644 index 0000000..d3778a6 Binary files /dev/null and b/src/assets/images/login/loginBackground.jpg differ diff --git a/src/assets/images/projectLogon/account.png b/src/assets/images/projectLogon/account.png new file mode 100644 index 0000000..5c75e40 Binary files /dev/null and b/src/assets/images/projectLogon/account.png differ diff --git a/src/assets/images/projectLogon/email.png b/src/assets/images/projectLogon/email.png new file mode 100644 index 0000000..eb4e9ea Binary files /dev/null and b/src/assets/images/projectLogon/email.png differ diff --git a/src/assets/images/projectLogon/projectName.png b/src/assets/images/projectLogon/projectName.png new file mode 100644 index 0000000..1ad09c3 Binary files /dev/null and b/src/assets/images/projectLogon/projectName.png differ diff --git a/src/assets/images/projectLogon/telephone.png b/src/assets/images/projectLogon/telephone.png new file mode 100644 index 0000000..69b428e Binary files /dev/null and b/src/assets/images/projectLogon/telephone.png differ diff --git a/src/assets/images/projectLogon/zhujian.png b/src/assets/images/projectLogon/zhujian.png new file mode 100644 index 0000000..6aacab8 Binary files /dev/null and b/src/assets/images/projectLogon/zhujian.png differ diff --git a/src/config/config.ts b/src/config/config.ts index eefc987..185a3f0 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -15,7 +15,7 @@ export const DEFAULT_PRIMARY: string = "#008BFF"; export const ROUTER_WHITE_LIST: string[] = ["/500", "/projectlogon"]; // * 高德地图 key -export const AMAP_MAP_KEY: string = ""; +export const AMAP_MAP_KEY: string = "142e51d55274a0140e838245345cf9ad"; // * 百度地图 key export const BAIDU_MAP_KEY: string = ""; diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index d2c1f59..1c4aedb 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -42,7 +42,6 @@ export const staticRouter: RouteRecordRaw[] = [ name: "dictionary", component: () => import("@/views/jxjview/dictionary/index.vue") }, - { path: "/dictionary/detail", name: "dicDetail", component: () => import("@/views/jxjview/dictionary/detail.vue") }, { path: "/appmanage", name: "appManage", component: () => import("@/views/jxjview/appmanage/index.vue") } ] } diff --git a/src/views/jxjview/appmanage/index.vue b/src/views/jxjview/appmanage/index.vue index 305e2ad..8ddf460 100644 --- a/src/views/jxjview/appmanage/index.vue +++ b/src/views/jxjview/appmanage/index.vue @@ -38,7 +38,7 @@ :headers="headers" v-model:file-list="fileList" class="upload-demo" - action="http://192.168.34.122:6688/xmgl/file/upload" + action="http://139.9.66.234:6688/xmgl/file/upload" multiple :limit="1" :on-success="uploadSuccess" @@ -67,12 +67,11 @@ import { useRouter } from "vue-router"; import { User } from "@/api/interface"; import { GlobalStore } from "@/stores"; import { ColumnProps } from "@/components/ProTable/interface"; -import { useHandleData } from "@/hooks/useHandleData"; + import { useDownload } from "@/hooks/useDownload"; import ProTable from "@/components/ProTable/index.vue"; import { CirclePlus, Delete, EditPen, Download, Upload, View, Refresh } from "@element-plus/icons-vue"; import { getAppList, editApp, addApp, exportApp } from "@/api/modules/jxjview"; -import { fa } from "element-plus/es/locale"; const router = useRouter(); const globalStore = GlobalStore(); diff --git a/vite.config.ts b/vite.config.ts index 961e9dc..492094a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -43,7 +43,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { // 跨域代理配置 proxy: { "/api": { - target: "http://192.168.34.122:6688", // easymock + target: "http://139.9.66.234:6688", // easymock // target: "https://www.fastmock.site/mock/f81e8333c1a9276214bcdbc170d9e0a0", // fastmock changeOrigin: true, rewrite: path => path.replace(/^\/api/, "")