Compare commits

...

3 Commits

Author SHA1 Message Date
石超 caab95251d 合并代码 2024-06-24 08:21:31 +08:00
石超 8aec2bf6d4 vite.config-ts 2024-06-22 13:37:28 +08:00
石超 4353cd7e52 vite.config-ts 2024-06-22 13:34:38 +08:00
7 changed files with 93 additions and 65 deletions

View File

@ -7,19 +7,10 @@ VITE_PUBLIC_PATH = /
# Basic interface address SPA
#VITE_GLOB_API_URL=/basic-api
#财源
<<<<<<< HEAD
# VITE_GLOB_API_URL= http://192.168.10.102:9023
# VITE_GLOB_API_URL= http://192.168.10.102:9500
#基础框架
VITE_GLOB_API_URL=http://192.168.10.102:9023
=======
VITE_GLOB_API_URL= http://192.168.10.102:9023
VITE_GLOB_API_URL=http://123.132.248.154:9104
# VITE_GLOB_API_URL = http://192.168.10.131:8989
#基础框架
# VITE_GLOB_API_URL=http://123.132.248.154:9104
>>>>>>> 2022b43ab147f3fe325d37e6481392e73479796c
# File upload address optional
# It can be forwarded by nginx or write the actual address directly
VITE_GLOB_UPLOAD_URL=http://60.213.14.14:6070

2
.gitignore vendored
View File

@ -12,7 +12,7 @@ tests/server/static/upload
.env.local
.env.*.local
.eslintcache
.env.development
# Log files
npm-debug.log*
yarn-debug.log*

View File

@ -16,30 +16,10 @@
<script src="./js/shexiangtou.js"></script>
<script type="text/javascript" src="./js/jquery.min.js"></script>
<script>
var BASE_URL = "http://192.168.10.102:9023";
var APP_URL = "http://123.132.248.154:9103";
localStorage.setItem('X-Token','4666a6dc')
console.log(localStorage.getItem("X-Token"))
var BASE_URL = "http://123.132.248.154:9104";
var APP_URL = "http://123.132.248.154:9103/public/bigscreen/index.html";
if (localStorage.getItem("X-Token") == null || localStorage.getItem("X-Token") == "") {
// window.location.href = APP_URL;
} else {
$.ajax({
type: "GET",
url: BASE_URL + "/api/Check/GetUserProfile",
dataType: "json",
headers: { "X-Token": localStorage.getItem("X-Token") },
async: false,
beforeSend: function (xhr) { },
success: function (data) {
if (data.result == false) {
window.location.href = APP_URL;
}
},
error: function (error) {
window.location.href = APP_URL;
}
});
window.location.href = "http://123.132.248.154:9103";
}
</script>
</head>

View File

@ -4,12 +4,12 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>费县天空地一体化监测平台登录</title>
<title>临沂天空地一体化监测平台</title>
<link rel="stylesheet" type="text/css" href="./css/login.css">
<script src="./js/jquery.min.js"></script>
<script>
var BASE_URL = "http://60.213.14.14:6050";
var BASE_URL = "http://123.132.248.154:9104";
// var BASE_URL = "http://192.168.10.124:9020";
if(localStorage.getItem("X-Token") == null || localStorage.getItem("X-Token") == ""){
@ -34,7 +34,7 @@
</head>
<body>
<div id="logo">
<h1 class="hogo"><i>费县天空地一体化监测平台</i></h1>
<h1 class="hogo"><i>临沂天空地一体化监测平台</i></h1>
</div>
<section class="stark-login">
<form>
@ -127,8 +127,7 @@
</body>
<script>
var BASE_URL = "http://60.213.14.14:6050";
// var BASE_URL = "http://192.168.10.124:9020";
var BASE_URL = "http://123.132.248.154:9104";
$("#loginButton").click(function(){
var formData = {
"account": $("#username").val(),

View File

@ -16,7 +16,7 @@ import { RouteRecordRaw } from 'vue-router';
import { PAGE_NOT_FOUND_ROUTE } from '@/router/routes/basic';
import { isArray } from '@/utils/is';
import { h } from 'vue';
import md5 from 'js-md5'
import md5 from 'js-md5';
interface UserState {
userInfo: Nullable<UserInfo>;
@ -60,6 +60,8 @@ export const useUserStore = defineStore({
actions: {
setToken(info: string | undefined) {
this.token = info ? info : ''; // for null or undefined value
//临时设置token给大屏使用
localStorage.setItem('X-Token', info || '');
setAuthCache(TOKEN_KEY, info);
},
setRoleList(roleList: RoleEnum[]) {

View File

@ -34,10 +34,10 @@
</div>
</template>
<script lang="ts" setup>
import print from "vue3-print-nb";
import print from 'vue3-print-nb';
import { reactive, ref } from 'vue';
import { BasicTable, useTable, TableAction, BasicColumn } from '@/components/Table';
import { getCaseInfoList,exportCaseInfo } from '@/api/monitor/index';
import { getCaseInfoList, exportCaseInfo } from '@/api/monitor/index';
import { useMessage } from '@/hooks/web/useMessage';
import { PermissionBtn } from '@/components/PermissionBtn/index';
import { searchFormSchema, columns } from './report.data';
@ -50,23 +50,15 @@
const { VITE_GLOB_API_URL } = getAppEnvConfig();
const vPrint = print;
const printObj = reactive({
id:"printMe",
popTitle: "",
beforeOpenCallback() {
},
openCallback() {
},
closeCallback() {
}
})
id: 'printMe',
popTitle: '',
beforeOpenCallback() {},
openCallback() {},
closeCallback() {},
});
const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
title: '案件列表',
@ -107,16 +99,15 @@
}
}
function handlerDownLoad(id){
try{
exportCaseInfo({id:id}).then(res=>{
window.open(VITE_GLOB_API_URL+"/"+res,"_blank");
function handlerDownLoad(id) {
try {
exportCaseInfo({ id: id }).then((res) => {
window.open(VITE_GLOB_API_URL + '/' + res, '_blank');
});
}catch(e){
createMessage.warning("导出失败!");
} catch (e) {
createMessage.warning('导出失败!');
console.log(e);
}
}
function viewDetail(record) {
console.log(record);
@ -131,5 +122,4 @@
// ::v-deep .ant-row .ant-col.ant-col-2 {
// margin-right: 10px;
// }
</style>

View File

@ -0,0 +1,66 @@
// vite.config.ts
import { defineApplicationConfig } from "file:///E:/%E8%B4%A2%E6%BA%90%E7%B3%BB%E7%BB%9F/CaiYuanYiTiHua/internal/vite-config/dist/index.mjs";
var vite_config_default = defineApplicationConfig({
overrides: {
optimizeDeps: {
include: [
"echarts/core",
"echarts/charts",
"echarts/components",
"echarts/renderers",
"qrcode",
"@iconify/iconify",
"ant-design-vue/es/locale/zh_CN",
"ant-design-vue/es/locale/en_US",
"@/../lib/vform/designer.umd.js"
]
},
build: {
/* 其他build生产打包配置省略 */
//...
target: "esnext",
commonjsOptions: {
include: /node_modules|lib/
//这里记得把lib目录加进来否则生产打包会报错
}
},
server: {
proxy: {
"/basic-api": {
target: "http://localhost:3000",
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
// only https
// secure: false
},
"/upload": {
target: "http://localhost:3300/upload",
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
}
},
warmup: {
clientFiles: ["./index.html", "./src/{views,components}/*"]
}
},
define: {
"process.env": {
BASE_URL: "/"
}
},
css: {
preprocessorOptions: {
less: {
javascriptEnabled: true
}
}
},
plugins: []
}
});
export {
vite_config_default as default
};
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxcdThEMjJcdTZFOTBcdTdDRkJcdTdFREZcXFxcQ2FpWXVhbllpVGlIdWFcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkU6XFxcXFx1OEQyMlx1NkU5MFx1N0NGQlx1N0VERlxcXFxDYWlZdWFuWWlUaUh1YVxcXFx2aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vRTovJUU4JUI0JUEyJUU2JUJBJTkwJUU3JUIzJUJCJUU3JUJCJTlGL0NhaVl1YW5ZaVRpSHVhL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUFwcGxpY2F0aW9uQ29uZmlnKHtcbiAgb3ZlcnJpZGVzOiB7XG4gICAgb3B0aW1pemVEZXBzOiB7XG4gICAgICBpbmNsdWRlOiBbXG4gICAgICAgICdlY2hhcnRzL2NvcmUnLFxuICAgICAgICAnZWNoYXJ0cy9jaGFydHMnLFxuICAgICAgICAnZWNoYXJ0cy9jb21wb25lbnRzJyxcbiAgICAgICAgJ2VjaGFydHMvcmVuZGVyZXJzJyxcbiAgICAgICAgJ3FyY29kZScsXG4gICAgICAgICdAaWNvbmlmeS9pY29uaWZ5JyxcbiAgICAgICAgJ2FudC1kZXNpZ24tdnVlL2VzL2xvY2FsZS96aF9DTicsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvZW5fVVMnLFxuICAgICAgICAnQC8uLi9saWIvdmZvcm0vZGVzaWduZXIudW1kLmpzJyxcbiAgICAgIF0sXG4gICAgfSxcbiAgICBidWlsZDoge1xuICAgICAgLyogXHU1MTc2XHU0RUQ2YnVpbGRcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTkxNERcdTdGNkVcdTc3MDFcdTc1NjUgKi9cbiAgICAgIC8vLi4uXG4gICAgICB0YXJnZXQ6ICdlc25leHQnLFxuICAgICAgY29tbW9uanNPcHRpb25zOiB7XG4gICAgICAgIGluY2x1ZGU6IC9ub2RlX21vZHVsZXN8bGliLywgLy9cdThGRDlcdTkxQ0NcdThCQjBcdTVGOTdcdTYyOEFsaWJcdTc2RUVcdTVGNTVcdTUyQTBcdThGREJcdTY3NjVcdUZGMENcdTU0MjZcdTUyMTlcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTRGMUFcdTYyQTVcdTk1MTlcdUZGMDFcdUZGMDFcbiAgICAgIH0sXG4gICAgfSxcbiAgICBzZXJ2ZXI6IHtcbiAgICAgIHByb3h5OiB7XG4gICAgICAgICcvYmFzaWMtYXBpJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi9iYXNpYy1hcGlgKSwgJycpLFxuICAgICAgICAgIC8vIG9ubHkgaHR0cHNcbiAgICAgICAgICAvLyBzZWN1cmU6IGZhbHNlXG4gICAgICAgIH0sXG4gICAgICAgICcvdXBsb2FkJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzMwMC91cGxvYWQnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vdXBsb2FkYCksICcnKSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgICB3YXJtdXA6IHtcbiAgICAgICAgY2xpZW50RmlsZXM6IFsnLi9pbmRleC5odG1sJywgJy4vc3JjL3t2aWV3cyxjb21wb25lbnRzfS8qJ10sXG4gICAgICB9LFxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAncHJvY2Vzcy5lbnYnOiB7XG4gICAgICAgIEJBU0VfVVJMOiAnLycsXG4gICAgICB9LFxuICAgIH0sXG4gICAgY3NzOiB7XG4gICAgICBwcmVwcm9jZXNzb3JPcHRpb25zOiB7XG4gICAgICAgIGxlc3M6IHtcbiAgICAgICAgICBqYXZhc2NyaXB0RW5hYmxlZDogdHJ1ZSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgfSxcbiAgICBwbHVnaW5zOiBbXSxcbiAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUEwUixTQUFTLCtCQUErQjtBQUVsVSxJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsT0FBTztBQUFBO0FBQUE7QUFBQSxNQUdMLFFBQVE7QUFBQSxNQUNSLGlCQUFpQjtBQUFBLFFBQ2YsU0FBUztBQUFBO0FBQUEsTUFDWDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLE9BQU87QUFBQSxRQUNMLGNBQWM7QUFBQSxVQUNaLFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sYUFBYSxHQUFHLEVBQUU7QUFBQTtBQUFBO0FBQUEsUUFHL0Q7QUFBQSxRQUNBLFdBQVc7QUFBQSxVQUNULFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sVUFBVSxHQUFHLEVBQUU7QUFBQSxRQUM1RDtBQUFBLE1BQ0Y7QUFBQSxNQUNBLFFBQVE7QUFBQSxRQUNOLGFBQWEsQ0FBQyxnQkFBZ0IsNEJBQTRCO0FBQUEsTUFDNUQ7QUFBQSxJQUNGO0FBQUEsSUFDQSxRQUFRO0FBQUEsTUFDTixlQUFlO0FBQUEsUUFDYixVQUFVO0FBQUEsTUFDWjtBQUFBLElBQ0Y7QUFBQSxJQUNBLEtBQUs7QUFBQSxNQUNILHFCQUFxQjtBQUFBLFFBQ25CLE1BQU07QUFBQSxVQUNKLG1CQUFtQjtBQUFBLFFBQ3JCO0FBQUEsTUFDRjtBQUFBLElBQ0Y7QUFBQSxJQUNBLFNBQVMsQ0FBQztBQUFBLEVBQ1o7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=