Commit abdd0417 by 李君

优化

1 parent 620935c6
...@@ -15,7 +15,7 @@ const axiosInstance = axios.create( ...@@ -15,7 +15,7 @@ const axiosInstance = axios.create(
axiosInstance.interceptors.request.use( axiosInstance.interceptors.request.use(
config => { config => {
// Cookies.set('atoken','3176614c-3e71-4b92-a082-4aa9f2010e26') // Cookies.set('atoken','ab703fa7-a386-4572-9bec-0cfa6ed33a08')
if(!Cookies.get('atoken')){ if(!Cookies.get('atoken')){
ElMessage({ ElMessage({
message: `登录过期,请重新登录`, message: `登录过期,请重新登录`,
......
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="日志等级:" style="padding: 5px 0"> <a-form-item label="日志等级:" style="padding: 5px 0">
<a-select v-model:value="queryForm.level" <a-select v-model:value="queryForm.levels"
style="width: 280px" style="width: 280px"
mode="multiple"
:maxTagCount="1"
:options="levelList" :options="levelList"
optionFilterProp="label" optionFilterProp="label"
> >
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="内容:" style="padding: 5px 0">
<a-input v-model:value="queryForm.content_like" placeholder="请输入内容" style="width: 280px"/>
</a-form-item>
<a-form-item label="选择日期:" style="padding: 5px 0"> <a-form-item label="选择日期:" style="padding: 5px 0">
<a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 280px"/> <a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 280px"/>
</a-form-item> </a-form-item>
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
<a-time-picker v-model:value="queryForm.startTime" style="width: 140px"/> <a-time-picker v-model:value="queryForm.startTime" style="width: 140px"/>
<a-time-picker v-model:value="queryForm.endTime" style="width: 140px"/> <a-time-picker v-model:value="queryForm.endTime" style="width: 140px"/>
</a-form-item> </a-form-item>
<a-form-item label="内容:" style="padding: 5px 0">
<a-input v-model:value="queryForm.content_like" placeholder="请输入内容" style="width: 280px"/>
</a-form-item>
<a-form-item style="padding: 5px 0"> <a-form-item style="padding: 5px 0">
<a-button type="primary" @click="confirmSearch(1)" :loading="isLoading">查询</a-button> <a-button type="primary" @click="confirmSearch(1)" :loading="isLoading">查询</a-button>
<!-- <a-button type="primary" @click="confirmSearch1">弹框</a-button> --> <!-- <a-button type="primary" @click="confirmSearch1">弹框</a-button> -->
...@@ -191,7 +194,7 @@ export default { ...@@ -191,7 +194,7 @@ export default {
{ {
// apptype:'store', // apptype:'store',
appname: 'process', appname: 'process',
level: 'info', levels: ['info','error','debug','warn'],
content_like: '', content_like: '',
date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'), date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'),
startTime: moment('00:00:00', 'HH:mm:ss'), startTime: moment('00:00:00', 'HH:mm:ss'),
...@@ -216,7 +219,7 @@ export default { ...@@ -216,7 +219,7 @@ export default {
{ {
// apptype: rawData.apptype, // apptype: rawData.apptype,
appname: rawData.appname, appname: rawData.appname,
level: rawData.level, levels: rawData.levels?rawData.levels.toString():null,
content_like: rawData.content_like, content_like: rawData.content_like,
startTime: formatDate(rawData.date) + ' ' + formatTime(rawData.startTime), startTime: formatDate(rawData.date) + ' ' + formatTime(rawData.startTime),
endTime: formatDate(rawData.date) + ' ' + formatTime(rawData.endTime), endTime: formatDate(rawData.date) + ' ' + formatTime(rawData.endTime),
...@@ -254,7 +257,7 @@ export default { ...@@ -254,7 +257,7 @@ export default {
const contentHeight = ref(0) const contentHeight = ref(0)
const __main = function() { const __main = function() {
contentHeight.value = window.innerHeight - 230 contentHeight.value = window.innerHeight - 230
confirmSearch() // confirmSearch()
} }
const confirmSearch1 = function(){ const confirmSearch1 = function(){
moreDialogRef.value.initDialog(); moreDialogRef.value.initDialog();
......
...@@ -58,7 +58,7 @@ module.exports = { ...@@ -58,7 +58,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/': { '/': {
target: 'http://36.112.68.214:33333/btool/', target: 'http://36.112.68.214:22222/btool/',
changeOrigin: true changeOrigin: true
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!