Commit 7263d144 authored by 夏敏伟's avatar 夏敏伟

修改tree以及选中框样式 系统名称改为从服务中调取

parent e58b491b
......@@ -98,4 +98,12 @@ export function queryReport(pageNum, pageSize, name, startTime, endTime) {
let url = `api/rest/sentiment/queryReport`;
url += addParam({ pageNum, pageSize, name, startTime, endTime });
return get(url);
}
/**
* 查询系统名称
*/
export function querySystemName() {
let url = `api/rest/3z/dictitem/queryDictItem/06`;
return get(url);
}
\ No newline at end of file
......@@ -297,12 +297,15 @@ export default {
.checkDiv {
position: absolute;
bottom: 20px;
bottom: 10px;
background: #7f7f7f17;
display: flex;
flex-wrap: wrap;
gap: 7px 12px;
width: calc(100% - 60px);
width: calc(100% - 40px);
max-height: 90px;
overflow-y: auto;
box-sizing: border-box;
padding: 10px 10px 14px;
}
......
......@@ -80,9 +80,10 @@ import "../assets/css/home.css";
// import jh from "/static/img/main/logo.png";
import { endLoading, get, post, httpSSERequest, fetchEventSource, httpSSERequestPoly } from "../util/http_util";
import { queryDictItem } from '../api/dictitem';
import { querySystemName } from '@/api/index';
import Push from 'push.js'
import dayjs from 'dayjs';
import { SYSTEM_NAME, MAIL_ADDRESS } from "@/constant/user";
import { MAIL_ADDRESS } from "@/constant/user";
export default {
name: "home",
data() {
......@@ -123,7 +124,7 @@ export default {
day: null,
week: null
},
system_name: SYSTEM_NAME
system_name: ''
};
},
methods: {
......@@ -315,6 +316,11 @@ export default {
}, (err) => {
console.log(err)
});
querySystemName().then(res => {
res.forEach(item => {
this.system_name += item.name;
});
})
},
computed: {
userInfo() {
......
This diff is collapsed.
......@@ -46,8 +46,8 @@ import leftOne from '../assets/img/login/text1.png';
import leftTwo from '../assets/img/login/text2.png';
import rightOne from '../assets/img/login/text3.png';
import rightTwo from '../assets/img/login/text4.png';
import { querySystemName } from '@/api/index';
import dayjs from "dayjs";
import { SYSTEM_NAME } from "@/constant/user";
export default {
name: "login",
data() {
......@@ -70,7 +70,7 @@ export default {
day: null,
week: null
},
system_name: SYSTEM_NAME
system_name: ''
};
},
methods: {
......@@ -128,6 +128,13 @@ export default {
this.myDate.day = dayjs().format('YYYY年MM月DD日');
const weekList = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
this.myDate.week = weekList[dayjs().get('day')]
},
mounted(){
querySystemName().then(res=>{
res.forEach(item=>{
this.system_name+=item.name;
});
})
}
};
</script>
......
......@@ -372,12 +372,15 @@ export default {
float: left;
.checkDiv{
position: absolute;
max-height: 100px;
overflow-y: auto;
bottom: 20px;
background: #7f7f7f17;
display: flex;
flex-wrap: wrap;
gap: 7px 12px;
width: 280px;
box-sizing: border-box;
width: 300px;
padding: 10px 10px 14px;
}
.checkList{
......@@ -408,7 +411,7 @@ export default {
.el-tree {
color: white;
background: transparent;
height: calc(100% - 50px);
height: calc(100% - 150px);
margin-top: 10px;
.el-tree-node__content {
......
......@@ -49,7 +49,7 @@
</el-table-column>
<el-table-column prop="file.type" label="文档类型" width="110">
</el-table-column>
<el-table-column prop="file.type" label="所属目录" width="200">
<el-table-column prop="labels" label="标签" width="200">
<template slot-scope="scope">
<span>{{ scope.row.labels.join('') }}</span>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment