ZhangBin
/
datang-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

部分bug修改

master
song 3 years ago
parent
450f3380c7
commit
a72922bc8b
10 changed files with 642 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/components/Detail/index.vue
  2. 10
      src/components/News/addOrEdit.vue
  3. 12
      src/components/News/index.vue
  4. 588
      src/filters/code.js
  5. 29
      src/router/menus/information.js
  6. 16
      src/router/menus/system.js
  7. 2
      src/views/layout/Layout.vue
  8. 1
      src/views/layout/components/Sidebar/SidebarItem.vue
  9. 3
      src/views/welcome/index.vue
  10. BIN
      src/views/welcome/welcome.png

20
src/components/Detail/index.vue
View File

@ -154,12 +154,10 @@
};
POST_QUERY_DETAIL(params).then(res => {
if(res.code === 200){
if(res.data.list && res.data.list.length){
this.lists = res.data.list
}
this.pageNum = res.data.pageNum
this.pageSize = res.data.pageSize
this.count = res.data.size
this.lists = res.data.list
this.pageNum = +res.data.pageNum
this.pageSize = +res.data.pageSize
this.count = +res.data.total
}else{
Alert.fail(res.msg || '获取失败');
}
@ -222,6 +220,16 @@
if(curItem.code == showPage){
item = curItem
break;
}else{
if(curItem.children && curItem.children.length){
for (let k = 0; k < curItem.children.length; k++) {
const itemChild = curItem.children[k];
if(itemChild.code == showPage){
item = itemChild
break;
}
}
}
}
}
}

10
src/components/News/addOrEdit.vue
View File

@ -35,7 +35,6 @@
:show-file-list="false"
>
<el-button size="small" type="primary" class="mr-4">点击上传</el-button>
<span slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</span>
</el-upload>
</el-form-item>
<el-form-item v-if="formLabelAlign.showType !== 0" :label="formLabelAlign.showType === 1 ? '标题图片：' : '标题视频：'" prop="titleUrl" :rules="[
@ -212,9 +211,9 @@ import { Loading } from 'element-ui';
// if (!isJPG) {
// ElMessage.error('上传头像图片只能是 JPG 格式!');
// }
const isLt2M = file.size / 1024 / 1024 < 2;
const isLt2M = file.size / 1024 / 1024 < 200;
if (!isLt2M) {
ElMessage.error('上传头像图片大小不能超过 2MB!');
ElMessage.error('上传头像图片大小不能超过 200MB!');
}
return isLt2M;
},
@ -268,10 +267,10 @@ import { Loading } from 'element-ui';
*/
async addCarousel(formName){
try {
// this.loading = true;
Loading.service(options);
this.loading = true;
const params = formName;
params.showPage = formName.showPage[1],
params.publishTime = this.$moment(formName.publishTime).valueOf(),
await ADD_DETAIL(params).then((res) => {
this.loading = false;
if(res.code === 200){
@ -295,6 +294,7 @@ import { Loading } from 'element-ui';
this.loading = true;
const params = formName;
params.showPage = formName.showPage[1],
params.publishTime = this.$moment(formName.publishTime).valueOf(),
await UPDATE_DETAIL(params).then((res) => {
this.loading = false;
if(res.code === 200){

12
src/components/News/index.vue
View File

@ -161,7 +161,7 @@
* 获取详情列表
*/
getList(options) {
this.options = options;
this.options = options || {};
const { pageNum, pageSize, showPage } = this;
const params = {
pageNum,
@ -270,6 +270,16 @@
if(curItem.code == showPage){
item = curItem
break;
}else{
if(curItem.children && curItem.children.length){
for (let k = 0; k < curItem.children.length; k++) {
const itemChild = curItem.children[k];
if(itemChild.code == showPage){
item = itemChild
break;
}
}
}
}
}
}

588
src/filters/code.js
View File

@ -192,14 +192,44 @@ export const tabList = [
{
title: '基本信息',
code: '0601',
children: [
{
title: '工商登记信息',
code: '060101',
},
{
title: '重要人事变动',
code: '060102',
},
]
},
{
title: '经营管理',
code: '0602',
children: [
{
title: '重大改革重组',
code: '060201',
},
]
},
{
title: '公司公告',
code: '0603',
children: [
{
title: '工作通知',
code: '060301',
},
{
title: '公示公告',
code: '060302',
},
{
title: '人才招聘',
code: '060303',
},
]
},
{
title: '社会责任',
@ -208,6 +238,20 @@ export const tabList = [
{
title: '关于信息公开',
code: '0605',
children: [
{
title: '信息公开实施细则',
code: '060501',
},
{
title: '公司制度',
code: '060502',
},
{
title: '联系我们',
code: '060503',
},
]
},
],
},
@ -295,66 +339,610 @@ export const tabList = [
{
title: '总经理工作部',
code: '0901',
children: [
{
title: '部门职责',
code: '090101',
},
{
title: '岗位规范',
code: '090102',
},
{
title: '部门动态',
code: '090103',
},
{
title: '工作计划',
code: '090104',
},
{
title: '管理制度',
code: '090105',
},
{
title: '资料下载',
code: '090106',
},
{
title: '学习园地',
code: '090107',
},
{
title: '常用表格',
code: '090108',
},
]
},
{
title: '计划营销部',
code: '0902',
children: [
{
title: '部门职责',
code: '090201',
},
{
title: '岗位规范',
code: '090202',
},
{
title: '部门动态',
code: '090203',
},
{
title: '工作计划',
code: '090204',
},
{
title: '管理制度',
code: '090205',
},
{
title: '资料下载',
code: '090206',
},
{
title: '学习园地',
code: '090207',
},
{
title: '常用表格',
code: '090208',
},
]
},
{
title: '财务管理部',
code: '0903',
children: [
{
title: '部门职责',
code: '090301',
},
{
title: '岗位规范',
code: '090302',
},
{
title: '部门动态',
code: '090303',
},
{
title: '工作计划',
code: '090304',
},
{
title: '管理制度',
code: '090305',
},
{
title: '资料下载',
code: '090306',
},
{
title: '学习园地',
code: '090307',
},
{
title: '常用表格',
code: '090308',
},
]
},
{
title: '人力资源部',
code: '0904',
children: [
{
title: '部门职责',
code: '090401',
},
{
title: '岗位规范',
code: '090402',
},
{
title: '部门动态',
code: '090403',
},
{
title: '工作计划',
code: '090404',
},
{
title: '管理制度',
code: '090405',
},
{
title: '资料下载',
code: '090406',
},
{
title: '学习园地',
code: '090407',
},
{
title: '常用表格',
code: '090408',
},
]
},
{
title: '党群工作部',
code: '0905',
children: [
{
title: '部门职责',
code: '090501',
},
{
title: '岗位规范',
code: '090502',
},
{
title: '部门动态',
code: '090503',
},
{
title: '工作计划',
code: '090504',
},
{
title: '管理制度',
code: '090505',
},
{
title: '资料下载',
code: '090506',
},
{
title: '学习园地',
code: '090507',
},
{
title: '常用表格',
code: '090508',
},
]
},
{
title: '纪委办公室（审计部）',
code: '0906',
children: [
{
title: '部门职责',
code: '090601',
},
{
title: '岗位规范',
code: '090602',
},
{
title: '部门动态',
code: '090603',
},
{
title: '工作计划',
code: '090604',
},
{
title: '管理制度',
code: '090605',
},
{
title: '资料下载',
code: '090606',
},
{
title: '学习园地',
code: '090607',
},
{
title: '常用表格',
code: '090608',
},
]
},
{
title: '燃料采购部',
code: '0907',
children: [
{
title: '部门职责',
code: '090701',
},
{
title: '岗位规范',
code: '090702',
},
{
title: '部门动态',
code: '090703',
},
{
title: '工作计划',
code: '090704',
},
{
title: '管理制度',
code: '090705',
},
{
title: '资料下载',
code: '090706',
},
{
title: '学习园地',
code: '090707',
},
{
title: '常用表格',
code: '090708',
},
]
},
{
title: '物资管理部',
code: '0908',
children: [
{
title: '部门职责',
code: '090801',
},
{
title: '岗位规范',
code: '090802',
},
{
title: '部门动态',
code: '090803',
},
{
title: '工作计划',
code: '090804',
},
{
title: '管理制度',
code: '090805',
},
{
title: '资料下载',
code: '090806',
},
{
title: '学习园地',
code: '090807',
},
{
title: '常用表格',
code: '090808',
},
]
},
{
title: '项目开发部',
code: '0909',
children: [
{
title: '部门职责',
code: '090901',
},
{
title: '岗位规范',
code: '090902',
},
{
title: '部门动态',
code: '090903',
},
{
title: '工作计划',
code: '090904',
},
{
title: '管理制度',
code: '090905',
},
{
title: '资料下载',
code: '090906',
},
{
title: '学习园地',
code: '090907',
},
{
title: '常用表格',
code: '090908',
},
]
},
{
title: '燃料质量验收部',
code: '0910',
children: [
{
title: '部门职责',
code: '091001',
},
{
title: '岗位规范',
code: '091002',
},
{
title: '部门动态',
code: '091003',
},
{
title: '工作计划',
code: '091004',
},
{
title: '管理制度',
code: '091005',
},
{
title: '资料下载',
code: '091006',
},
{
title: '学习园地',
code: '091007',
},
{
title: '常用表格',
code: '091008',
},
]
},
{
title: '安全监督部',
code: '0911',
children: [
{
title: '部门职责',
code: '091101',
},
{
title: '岗位规范',
code: '091102',
},
{
title: '部门动态',
code: '091103',
},
{
title: '工作计划',
code: '091104',
},
{
title: '管理制度',
code: '091105',
},
{
title: '资料下载',
code: '091106',
},
{
title: '学习园地',
code: '091107',
},
{
title: '常用表格',
code: '091108',
},
]
},
{
title: '设备部',
code: '0912',
children: [
{
title: '部门职责',
code: '091201',
},
{
title: '岗位规范',
code: '091202',
},
{
title: '部门动态',
code: '091203',
},
{
title: '工作计划',
code: '091204',
},
{
title: '管理制度',
code: '091205',
},
{
title: '资料下载',
code: '091206',
},
{
title: '学习园地',
code: '091207',
},
{
title: '常用表格',
code: '091208',
},
]
},
{
title: '发电部',
code: '0913',
children: [
{
title: '部门职责',
code: '091301',
},
{
title: '岗位规范',
code: '091302',
},
{
title: '部门动态',
code: '091303',
},
{
title: '工作计划',
code: '091304',
},
{
title: '管理制度',
code: '091305',
},
{
title: '资料下载',
code: '091306',
},
{
title: '学习园地',
code: '091307',
},
{
title: '常用表格',
code: '091308',
},
]
},
{
title: '维护部',
code: '0914',
children: [
{
title: '部门职责',
code: '091401',
},
{
title: '岗位规范',
code: '091402',
},
{
title: '部门动态',
code: '091403',
},
{
title: '工作计划',
code: '091404',
},
{
title: '管理制度',
code: '091405',
},
{
title: '资料下载',
code: '091406',
},
{
title: '学习园地',
code: '091407',
},
{
title: '常用表格',
code: '091408',
},
]
},
{
title: '热工专业',
code: '0915',
children: [
{
title: '部门职责',
code: '091501',
},
{
title: '岗位规范',
code: '091502',
},
{
title: '部门动态',
code: '091503',
},
{
title: '工作计划',
code: '091504',
},
{
title: '管理制度',
code: '091505',
},
{
title: '资料下载',
code: '091506',
},
{
title: '学习园地',
code: '091507',
},
{
title: '常用表格',
code: '091508',
},
]
},
{
title: '电气专业',
code: '0916',
children: [
{
title: '部门职责',
code: '091601',
},
{
title: '岗位规范',
code: '091602',
},
{
title: '部门动态',
code: '091603',
},
{
title: '工作计划',
code: '091604',
},
{
title: '管理制度',
code: '091605',
},
{
title: '资料下载',
code: '091606',
},
{
title: '学习园地',
code: '091607',
},
{
title: '常用表格',
code: '091608',
},
]
},
],
},

29
src/router/menus/information.js
View File

@ -1,4 +1,5 @@
import Layout from '@/views/layout/Layout'
import AppMain from '@/views/layout/components/AppMain'
const commodityManagement = {
path: '/information',
@ -8,9 +9,9 @@ const commodityManagement = {
children: [
{
path: '/information1',
component: () => import('@/views/richText/index'),
code: '0601',
// name: '基本信息',
component: AppMain,
name: '基本信息',
meta: {title: '基本信息', noCache: true, affix: false},
children: [
{
@ -23,7 +24,7 @@ const commodityManagement = {
{
path: '/information102',
code: '060102',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '重要人事变动',
meta: {title: '重要人事变动', noCache: false, affix: false},
}
@ -32,14 +33,14 @@ const commodityManagement = {
{
path: '/information2',
code: '0602',
component: () => import('@/views/richText/index'),
// name: '经营管理',
component: () => import('@/views/lists/index'),
name: '经营管理',
meta: {title: '经营管理', noCache: false, affix: false},
children: [
{
path: '/information201',
code: '060201',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '重大改革重组',
meta: {title: '重大改革重组', noCache: false, affix: false},
},
@ -48,28 +49,28 @@ const commodityManagement = {
{
path: '/information3',
code: '0603',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '公司公告',
meta: {title: '公司公告', noCache: false, affix: false},
children: [
{
path: '/information301',
code: '060301',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '工作通知',
meta: {title: '工作通知', noCache: false, affix: false},
},
{
path: '/information302',
code: '060302',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '公示公告',
meta: {title: '公示公告', noCache: false, affix: false},
},
{
path: '/information303',
code: '060303',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '人才招聘',
meta: {title: '人才招聘', noCache: false, affix: false},
},
@ -78,28 +79,28 @@ const commodityManagement = {
{
path: '/information4',
code: '0604',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '社会责任',
meta: {title: '社会责任', noCache: false, affix: false},
},
{
path: '/information5',
code: '0605',
component: () => import('@/views/richText/index'),
component: AppMain,
name: '关于信息公开',
meta: {title: '关于信息公开', noCache: false, affix: false},
children: [
{
path: '/information301',
code: '060501',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '信息公开实施细则',
meta: {title: '信息公开实施细则', noCache: false, affix: false},
},
{
path: '/information302',
code: '060502',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '公司制度',
meta: {title: '公司制度', noCache: false, affix: false},
},

16
src/router/menus/system.js
View File

@ -9,56 +9,56 @@ const commodityManagement = {
{
path: '/system1',
code: '0801',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '集团公司制度',
meta: {title: '集团公司制度', noCache: false, affix: false}
},
{
path: '/system2',
code: '0802',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '山西公司制度',
meta: {title: '山西公司制度', noCache: false, affix: false},
},
{
path: '/system3',
code: '0803',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '行业标准与制度',
meta: {title: '行业标准与制度', noCache: false, affix: false},
},
{
path: '/system4',
code: '0804',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '公司制度',
meta: {title: '公司制度', noCache: false, affix: false},
},
{
path: '/system5',
code: '0805',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '地方规章',
meta: {title: '地方规章', noCache: false, affix: false},
},
{
path: '/system6',
code: '0806',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '培训课件',
meta: {title: '培训课件', noCache: false, affix: false},
},
{
path: '/system7',
code: '0807',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '培训影像',
meta: {title: '培训影像', noCache: false, affix: false},
},
{
path: '/system8',
code: '0808',
component: () => import('@/views/richText/index'),
component: () => import('@/views/lists/index'),
name: '科技创新',
meta: {title: '科技创新', noCache: false, affix: false},
}

2
src/views/layout/Layout.vue
View File

@ -78,10 +78,8 @@ export default {
relation: false,
reset: false,
}
console.log('list: ', list);
for(var i = 0; i < perList.length; i++) {
if(perList[i][1] === code) {
console.log('perList[i]: ', perList[i]);
list[perList[i][2]] = true;
}
}

1
src/views/layout/components/Sidebar/SidebarItem.vue
View File

@ -103,7 +103,6 @@ export default {
return path.resolve(this.basePath, routePath)
},
storageCode(code){
console.log('code: ', code);
localStorage.setItem('code', code)
},
// 判断当前菜单是否显示

3
src/views/welcome/index.vue
View File

@ -17,7 +17,6 @@ export default {
<style scoped>
.welcome-img {
/* height: calc(100vh - 80px); */
width: calc(200vw - 210px);
height: calc(100vh - 88px);
}
</style>

BIN
src/views/welcome/welcome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 167 KiB

After

Width:  |  Height:  |  Size: 163 KiB

Write Preview
Loading…
Cancel
Save