Browse Source

查漏补缺

master
xuhuajiao 10 months ago
parent
commit
3e5d449951
  1. 3
      src/main.js
  2. 2
      src/vendors/ofd/OfdView.vue
  3. 2
      src/vendors/xlsx/Table.vue
  4. 24
      src/views/archiveKeeping/deviceManage/index.vue
  5. 2
      src/views/archiveKeeping/inStorage/index.vue
  6. 2
      src/views/archivesManage/managementLibrary/index.vue
  7. 2
      src/views/collectReorganizi/collectionLibrary/index.vue
  8. 447
      src/views/components/echarts/serverProgress2.vue
  9. 116
      src/views/preview/index.vue
  10. 2
      src/views/system/archivesCategory/index.vue
  11. 12
      src/views/system/archivesCategory/processManage/index.vue
  12. 2
      src/views/system/processManage/runningProcess/module/processImg/index.vue
  13. 20
      src/views/system/user/center.vue

3
src/main.js

@ -34,6 +34,8 @@ Vue.component('ArchivesListModule', ArchivesListModule)
import VueViewer from 'v-viewer' import VueViewer from 'v-viewer'
import 'viewerjs/dist/viewer.css' import 'viewerjs/dist/viewer.css'
import Print from 'vue-print-nb'
// 加载用户主题 // 加载用户主题
if (localStorage.getItem('themeValue')) { if (localStorage.getItem('themeValue')) {
window.document.documentElement.setAttribute('data-theme', localStorage.getItem('themeValue')) window.document.documentElement.setAttribute('data-theme', localStorage.getItem('themeValue'))
@ -53,6 +55,7 @@ Vue.use(dict)
Vue.use(Element, { Vue.use(Element, {
size: Cookies.get('size') || 'small' // set element-ui default size size: Cookies.get('size') || 'small' // set element-ui default size
}) })
Vue.use(Print)
import X2js from 'x2js' // xml数据处理插件 import X2js from 'x2js' // xml数据处理插件
Vue.prototype.$x2js = new X2js() // 创建x2js对象,挂到vue原型上 Vue.prototype.$x2js = new X2js() // 创建x2js对象,挂到vue原型上

2
src/vendors/ofd/OfdView.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="ofd_view"> <div class="ofd_view">
<el-header style="position: fixed; top: 72px; left: 300px; width: calc(100vw - 300px); display: flex; justify-content: space-between; z-index: 999;">
<el-header style="position: fixed; top: 137px; left: 316px; width: calc(100vw - 330px); display: flex; justify-content: space-between; z-index: 999;">
<div style="display: flex;"> <div style="display: flex;">
<!-- <div class="upload" @click="uploadFile"> <!-- <div class="upload" @click="uploadFile">
<div class="upload_title">打开OFD</div> <div class="upload_title">打开OFD</div>

2
src/vendors/xlsx/Table.vue

@ -360,7 +360,7 @@ export default {
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped> <style scoped>
.docx-class { .docx-class {
height: calc(100vh - 76px);
height: calc(100vh - 152px);
} }
/* .sheet-btn.active { /* .sheet-btn.active {
background-color: aquamarine; background-color: aquamarine;

24
src/views/archiveKeeping/deviceManage/index.vue

@ -149,16 +149,18 @@ export default {
} }
} }
// //
this.$refs.tree.setCurrentKey(currentKey.id)
this.$nextTick(() => {
if (currentKey && currentKey.id) {
this.$refs.tree.setCurrentKey(currentKey.id)
this.$nextTick(() => {
// //
const selectedKey = this.$refs.tree.getCurrentNode()
if (this.$refs.tree.getNode(selectedKey) && this.$refs.tree.getNode(selectedKey).parent) {
this.expandParents(this.$refs.tree.getNode(selectedKey).parent)
}
//
this.handleNodeClick(selectedKey)
})
const selectedKey = this.$refs.tree.getCurrentNode()
if (this.$refs.tree.getNode(selectedKey) && this.$refs.tree.getNode(selectedKey).parent) {
this.expandParents(this.$refs.tree.getNode(selectedKey).parent)
}
//
this.handleNodeClick(selectedKey)
})
}
}, },
// //
handleNodeClick(val) { handleNodeClick(val) {
@ -180,7 +182,7 @@ export default {
[CRUD.HOOK.beforeToAdd](crud, form, btn) { [CRUD.HOOK.beforeToAdd](crud, form, btn) {
const isCanAddKey = JSON.parse(localStorage.getItem('currentStoreKey')) const isCanAddKey = JSON.parse(localStorage.getItem('currentStoreKey'))
console.log('isCanAddKey', isCanAddKey) console.log('isCanAddKey', isCanAddKey)
if (isCanAddKey.isType === '2') {
if (isCanAddKey.isType === 2) {
this.$refs.eform.isAddArea = true this.$refs.eform.isAddArea = true
this.$refs.eform.crud.title = '区域' this.$refs.eform.crud.title = '区域'
} else { } else {
@ -191,7 +193,7 @@ export default {
// //
[CRUD.HOOK.beforeToEdit](crud, form, btn) { [CRUD.HOOK.beforeToEdit](crud, form, btn) {
const isCanAddKey = JSON.parse(localStorage.getItem('currentStoreKey')) const isCanAddKey = JSON.parse(localStorage.getItem('currentStoreKey'))
if (isCanAddKey.isType === '2') {
if (isCanAddKey.isType === 2) {
this.$refs.eform.isAddArea = false this.$refs.eform.isAddArea = false
this.$refs.eform.crud.title = '库房' this.$refs.eform.crud.title = '库房'
} else { } else {

2
src/views/archiveKeeping/inStorage/index.vue

@ -237,7 +237,7 @@ export default {
currentKey = this.crud.data[0] currentKey = this.crud.data[0]
} }
} }
if (currentKey.id) {
if (currentKey && currentKey.id) {
// //
this.$refs.categroyTree.setCurrentKey(currentKey.id) this.$refs.categroyTree.setCurrentKey(currentKey.id)
this.$nextTick(() => { this.$nextTick(() => {

2
src/views/archivesManage/managementLibrary/index.vue

@ -256,7 +256,7 @@ export default {
currentKey = this.crud.data[0] currentKey = this.crud.data[0]
} }
} }
if (currentKey.id) {
if (currentKey && currentKey.id) {
// //
this.$refs.categroyTree.setCurrentKey(currentKey.id) this.$refs.categroyTree.setCurrentKey(currentKey.id)
this.$nextTick(() => { this.$nextTick(() => {

2
src/views/collectReorganizi/collectionLibrary/index.vue

@ -241,7 +241,7 @@ export default {
currentKey = this.crud.data[0] currentKey = this.crud.data[0]
} }
} }
if (currentKey.id) {
if (currentKey && currentKey.id) {
// //
this.$refs.categroyTree.setCurrentKey(currentKey.id) this.$refs.categroyTree.setCurrentKey(currentKey.id)
this.$nextTick(() => { this.$nextTick(() => {

447
src/views/components/echarts/serverProgress2.vue

@ -1,5 +1,5 @@
<template> <template>
<div id="main4" :style="{height:height,width:width}" />
<div id="main4" :style="{height:height}" />
</template> </template>
<script> <script>
@ -41,6 +41,18 @@ import resize from '@/views/dashboard/mixins/resize'
// } // }
// } // }
// ] // ]
// var ROOT_PATH = 'https://echarts.apache.org/examples/data/asset/img/custom-gauge-panel.png'
// var _panelImageURL = ROOT_PATH + '/data/asset/img/custom-gauge-panel.png'
// var _animationDuration = 1000
// var _animationDurationUpdate = 1000
// var _animationEasingUpdate = 'quarticInOut'
// var _valOnRadianMax = 80
// var _outerRadius = 80
// var _innerRadius = 50
// var _pointerInnerRadius = 50
// var _insidePanelRadius = 30
// var _currentDataIndex = 0
export default { export default {
name: 'AcrossEcharts', name: 'AcrossEcharts',
mixins: [resize], mixins: [resize],
@ -63,7 +75,16 @@ export default {
}, },
data() { data() {
return { return {
chart: null
chart: null,
panelImageURL: 'https://echarts.apache.org/examples/data/asset/img/custom-gauge-panel.png',
animationDuration: 1000,
animationDurationUpdate: 1000,
animationEasingUpdate: 'quarticInOut',
valOnRadianMax: 200,
outerRadius: 200,
innerRadius: 170,
pointerInnerRadius: 40,
insidePanelRadius: 140
} }
}, },
watch: { watch: {
@ -82,151 +103,167 @@ export default {
window.addEventListener('resize', this.__resizeHandler) window.addEventListener('resize', this.__resizeHandler)
}, },
methods: { methods: {
renderItem(params, api) {
var valOnRadian = api.value(1)
var coords = api.coord([api.value(0), valOnRadian])
var polarEndRadian = coords[3]
var imageStyle = {
image: this.panelImageURL,
x: params.coordSys.cx - this.outerRadius,
y: params.coordSys.cy - this.outerRadius,
width: this.outerRadius * 2,
height: this.outerRadius * 2
}
return {
type: 'group',
children: [
{
type: 'image',
style: imageStyle,
clipPath: {
type: 'sector',
shape: {
cx: params.coordSys.cx,
cy: params.coordSys.cy,
r: this.uterRadius,
r0: this.innerRadius,
startAngle: 0,
endAngle: -polarEndRadian,
transition: 'endAngle',
enterFrom: { endAngle: 0 }
}
}
},
{
type: 'image',
style: imageStyle,
clipPath: {
type: 'polygon',
shape: {
points: this.makePionterPoints(params, polarEndRadian)
},
extra: {
polarEndRadian: polarEndRadian,
transition: 'polarEndRadian',
enterFrom: { polarEndRadian: 0 }
},
during: function(apiDuring) {
apiDuring.setShape(
'points',
this.makePionterPoints(params, apiDuring.getExtra('polarEndRadian'))
)
}
}
},
{
type: 'circle',
shape: {
cx: params.coordSys.cx,
cy: params.coordSys.cy,
r: this.insidePanelRadius
},
style: {
fill: '#fff',
shadowBlur: 25,
shadowOffsetX: 0,
shadowOffsetY: 0,
shadowColor: 'rgba(76,107,167,0.4)'
}
},
{
type: 'text',
extra: {
valOnRadian: valOnRadian,
transition: 'valOnRadian',
enterFrom: { valOnRadian: 0 }
},
style: {
text: this.makeText(valOnRadian),
fontSize: 30,
fontWeight: 700,
x: params.coordSys.cx,
y: params.coordSys.cy,
fill: 'rgb(0,50,190)',
align: 'center',
verticalAlign: 'middle',
enterFrom: { opacity: 0 }
},
during: function(apiDuring) {
apiDuring.setStyle(
'text',
this.makeText(apiDuring.getExtra('valOnRadian'))
)
}
}
]
}
},
makeText(valOnRadian) {
// Validate additive animation calc.
if (valOnRadian < -10) {
alert('illegal during val: ' + valOnRadian)
}
return ((valOnRadian / this.valOnRadianMax) * 100).toFixed(0) + '%'
},
convertToPolarPoint(renderItemParams, radius, radian) {
return [
Math.cos(radian) * radius + renderItemParams.coordSys.cx,
-Math.sin(radian) * radius + renderItemParams.coordSys.cy
]
},
makePionterPoints(renderItemParams, polarEndRadian) {
return [
this.convertToPolarPoint(renderItemParams, this.outerRadius, polarEndRadian),
this.convertToPolarPoint(
renderItemParams,
this.outerRadius,
polarEndRadian + Math.PI * 0.03
),
this.convertToPolarPoint(renderItemParams, this.pointerInnerRadius, polarEndRadian)
]
},
drawChart() { drawChart() {
const chartDom = document.getElementById('main4') const chartDom = document.getElementById('main4')
this.chart = echarts.init(chartDom, 'macarons')
this.chart = echarts.init(chartDom)
let option = null let option = null
option = { option = {
// title: { //
// text: '80%',
// subtext: '',
// itemGap: 10, //
// textStyle: {
// color: '#000', //
// fontStyle: 'normal', // 'normal','italic','oblique'
// fontWeight: 'bold', // 'normal','bold','bolder','lighter',100 | 200 | 300 | 400...// 'serif' , 'monospace', 'Arial', 'Courier New', 'Microsoft YaHei', ...
// fontSize: 30 //
// },
// subtextStyle: {
// color: '#000', //
// fontStyle: 'normal', // 'normal','italic','oblique'
// fontSize: 18 //
// },
// x: 'center', //
// // y: 'center',
// bottom: 40
// },
tooltip: {
formatter: '{a} <br/>{b} : {c}'
animationEasing: this.animationEasingUpdate,
animationDuration: this.animationDuration,
animationDurationUpdate: this.animationDurationUpdate,
animationEasingUpdate: this.animationEasingUpdate,
dataset: {
source: [[1, 156]]
},
tooltip: {},
angleAxis: {
type: 'value',
startAngle: 0,
show: false,
min: 0,
max: this.valOnRadianMax
},
radiusAxis: {
type: 'value',
show: false
}, },
polar: {},
series: [ series: [
{ {
name: '业务指标',
type: 'gauge',
startAngle: 90, //
endAngle: 180, //
radius: '100%', //
clockwise: true, //
axisLine: { // 线
show: true,
roundCap: false,
clip: false,
lineStyle: {
width: 20,
color: [[1, '#F1F2F6']]
// color: [[0.3, 'rgb(26,143,255)'], [0.5, 'rgb(23,151,255)'], [0.7, 'rgb(13,213,253)'], [0.8, 'rgb(9,237,253)'], [1, 'rgb(70,100,144)']]
// opacity: 0.6, //
}
},
axisLabel: {
show: false
},
splitLine: { // 线,线
show: false
},
// 线
axisTick: {
show: false
},
// data: [{ value: '80' }],
markPoint: {
show: false,
symbol: 'circle',
symbolSize: 0,
data: [
//
{ value: '', x: 'center', y: 'center', itemStyle: { color: '#000' }}
],
itemStyle: {
normal: {
label: {
show: true,
color: '#000', //
fontSize: 0
}
}
}
},
detail: { // ()
show: true, // , true
offsetCenter: [0, 0], //
color: '#000', // , auto
fontSize: 10, // , 15
formatter: '{value}' //
},
pointer: { //
show: false, // , true
length: '60%', // , 80%
width: 15 // , 8
},
itemStyle: { //
color: '#0066FF', // (auto)
opacity: 1, // 0 1 0
borderWidth: 0, // 线, 0 0
borderType: 'solid', // 线 'solid', 'dashed', 'dotted'
borderColor: '#000', // , "#000" color
// shadowBlur: 10, // () shadowColor,shadowOffsetX, shadowOffsetY
shadowColor: '#000' // color
},
//
progress: {
show: true,
overlap: false, //
roundCap: true, //
clip: false, //
//
itemStyle: {
borderWidth: 10,
shadowColor: '',
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: this.startColor // 0% '#02C77E'
},
{
offset: 1,
color: this.endColor // 100% '#017770'
}
],
global: false // false
}
}
},
data: [
{
value: 21,
name: 'CPU占比',
title: {},
detail: {
// title
offsetCenter: ['0%', '0%'],
color: '#01F8FF',
formatter: '{value}%'
// borderColor: '#01F8FF',
// borderRadius: 20,
// borderWidth: 1,
}
}
]
type: 'custom',
coordinateSystem: 'polar',
renderItem: this.renderItem
} }
] ]
} }
var _this = this
setInterval(function() {
var nextSource = [[1, Math.round(Math.random() * this.valOnRadianMax)]]
_this.chart.setOption({
dataset: {
source: nextSource
}
})
}, 3000)
option && this.chart.setOption(option) option && this.chart.setOption(option)
} }
} }
@ -234,141 +271,5 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dashboard-editor-container {
padding: 20px;
position: relative;
.chart-wrapper {
height: calc(100% - 55px);
}
}
@media (max-width: 1024px) {
.chart-wrapper {
padding: 8px;
}
}
.progress-right-item{
width:100%;
height: calc(100% / 2);
display: flex;
justify-content: flex-start;
align-items: center;
}
.progress-right-txt{
position: relative;
color: #545B65;
font-size: 14px;
padding-left: 12px;
margin-right: 50px;
span{
display: block;
font-size: 20px;
color: #0C0E1E;
padding-top: 4px;
i{
display: inline-block;
font-size: 12px;
color: #A6ADB6;
}
}
&::before{
position: absolute;
left: 0;
top: 50%;
content: '';
width: 4px;
height: 50px;
background: linear-gradient(180deg, #FF9B3B 0%, #F7BA1E 100%);
border-radius: 100px;
transform: translateY(-50%);
}
&.right-txt1{
&::before{
background: linear-gradient(180deg, #FF9B3B 0%, #F7BA1E 100%);
}
}
&.right-txt2{
&::before{
background: linear-gradient(180deg, #14C9C9 0%, #83DBAD 100%);
}
}
}
.progress-class {
position: relative;
width: 200px;
height: 200px;
margin: 0 100px;
::v-deep svg > path:nth-child(2) {
stroke: url(#red);
}
::v-deep .el-progress-circle{
border-radius: 50%;
// box-shadow: 0 12px 12px #FEF1F3;
box-shadow: 0 6px 8px #D9F6F6;
}
}
.progress-class2{
position: relative;
width: 100px;
height: 100px;
::v-deep svg > path:nth-child(2) {
stroke: url(#yellow);
}
::v-deep .el-progress-circle{
border-radius: 50%;
box-shadow: 0 6px 8px #FFDEC1;
}
}
.progress-class3{
position: relative;
width: 100px;
height: 100px;
::v-deep svg > path:nth-child(2) {
stroke: url(#green);
}
::v-deep .el-progress-circle{
border-radius: 50%;
box-shadow: 0 6px 8px #D9F6F6;
}
}
::v-deep .el-progress__text{
white-space: pre;
}
::v-deep .el-progress-circle__track {
stroke: #F1F2F6;
}
.differ {
::v-deep .el-progress__text {
top: 55%;
font-size: 30px !important;
color: #0C0E1E;
&::before {
content: 'CPU占比';
width: 100%;
position: absolute;
top: -85%;
left: 50%;
font-weight: normal;
font-size: 14px;
color: #545B65;
transform: translateX(-50%);
}
&::after {
content: '%';
width: 100%;
position: absolute;
bottom: 6px;
left: 30px;
font-weight: normal;
font-size: 12px;
color: #DEE0E4;
}
}
}
</style> </style>

116
src/views/preview/index.vue

@ -34,8 +34,19 @@
</ul> </ul>
<el-empty v-else :image-size="100" /> <el-empty v-else :image-size="100" />
</div> </div>
<div v-loading="loading" element-loading-text="文件加载中" class="content-right" :style="{overflowY : !loading ? 'auto' : 'hidden'}">
<div id="printArea" ref="output" class="well-box" />
<div v-loading="loading" element-loading-text="文件加载中" class="content-right">
<div class="preview-info">
<ul>
<li>创建时间{{ fileCurrent.create_time }}</li>
<li>大小{{ getFileSize(fileCurrent.file_size) }}</li>
<li>尺寸{{ (!fileCurrent.file_dpi || fileCurrent.file_dpi === 'null') ? '-' : fileCurrent.file_dpi }}</li>
</ul>
<div class="preview-btn">
<el-button class="iconfont icon-xiazai" @click="downloadFile(fileCurrent)">下载</el-button>
<el-button v-print="printObj" class="iconfont icon-dayin">打印</el-button>
</div>
</div>
<div id="printArea" ref="output" class="well-box" :style="{overflowY : !loading ? 'auto' : 'hidden'}" />
<div class="water-mask" /> <div class="water-mask" />
</div> </div>
</div> </div>
@ -48,6 +59,8 @@ import { getExtend, readBuffer, render } from '@/components/util'
import { parse } from 'qs' import { parse } from 'qs'
import { watermark } from '@/utils/waterMark' import { watermark } from '@/utils/waterMark'
import { getInitWatermark } from '@/api/system/waterMask' import { getInitWatermark } from '@/api/system/waterMask'
import { downloadFile } from '@/utils/index'
import { mapGetters } from 'vuex'
import html2canvas from 'html2canvas' // html2Canvasprint-js import html2canvas from 'html2canvas' // html2Canvasprint-js
import printJS from 'print-js' import printJS from 'print-js'
@ -73,19 +86,19 @@ export default {
hidden: false, hidden: false,
printObj: { printObj: {
id: 'printArea', id: 'printArea',
popTitle: '配置页眉标题', //
extraHead: '打印', // head使
preview: true, // false preview: true, // false
previewTitle: '预览的标题', //
previewPrintBtnLabel: '预览结束,开始打印', //
previewTitle: '电子原文预览', //
previewPrintBtnLabel: '预览结束,开始打印',
zIndex: 20002, // z-index20002 zIndex: 20002, // z-index20002
extraCss: '', // css
extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>,<style> #printArea { height: auto !important; } <style>', //
previewBeforeOpenCallback() { console.log('正在加载预览窗口!') }, // callback previewBeforeOpenCallback() { console.log('正在加载预览窗口!') }, // callback
previewOpenCallback() { console.log('已经加载完预览窗口,预览打开了!') }, // callback previewOpenCallback() { console.log('已经加载完预览窗口,预览打开了!') }, // callback
beforeOpenCallback() { console.log('开始打印之前!') }, // callback beforeOpenCallback() { console.log('开始打印之前!') }, // callback
openCallback() { console.log('执行打印了!') }, // callback openCallback() { console.log('执行打印了!') }, // callback
closeCallback() { console.log('关闭了打印工具!') }, // callback(or) closeCallback() { console.log('关闭了打印工具!') }, // callback(or)
clickMounted() { console.log('点击v-print绑定的按钮了!') }, clickMounted() { console.log('点击v-print绑定的按钮了!') },
// url: 'http://localhost:8080/', // URL
// url: 'http://192.168.99.67:11100/downloadFile/category/AE8B188F0C0314F9BE31B8/82FBCAE96CBC9F50809838/7f3df862-f36d-4061-9c3e-e81556420742.pdf', // URL
// asyncUrl (reslove) { // asyncUrl (reslove) {
// setTimeout(() => { // setTimeout(() => {
// reslove('http://localhost:8080/') // reslove('http://localhost:8080/')
@ -100,9 +113,15 @@ export default {
allFileTables: [], allFileTables: [],
toFile: null, toFile: null,
fileCurrent: null, fileCurrent: null,
fileParentInfo: null
fileParentInfo: null,
pdfsArray: []
} }
}, },
computed: {
...mapGetters([
'baseApi'
])
},
created() { created() {
// 使url?name=xxx.xxx&from=xxx // 使url?name=xxx.xxx&from=xxx
const { from, name } = parse(location.search.substr(1)) const { from, name } = parse(location.search.substr(1))
@ -136,6 +155,20 @@ export default {
this.getBase64ByFileId() this.getBase64ByFileId()
}, },
methods: { methods: {
getFileSize(fileSize) {
const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
const fileSizeInB = fileSize + 'B'
return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
},
//
downloadFile(row) {
const url = this.baseApi + '/downloadFile' + row.file_path
fetch(url).then(res => res.blob()).then(blob => {
downloadFile(blob, row.file_name.split('.')[0], row.file_type)
}).catch(() => {
this.$message({ message: '下载文件失败!', type: 'error', offset: 8 })
})
},
selectFile(item) { selectFile(item) {
this.fileCurrent = item this.fileCurrent = item
this.getBase64ByFileId() this.getBase64ByFileId()
@ -232,8 +265,8 @@ export default {
this.src = fileReader.result this.src = fileReader.result
} }
const arrayBuffer = await readBuffer(this.toFile) const arrayBuffer = await readBuffer(this.toFile)
this.last = await this.displayResult(arrayBuffer, this.toFile) this.last = await this.displayResult(arrayBuffer, this.toFile)
this.$nextTick(() => { this.$nextTick(() => {
// //
const extend = getExtend(this.toFile.name) const extend = getExtend(this.toFile.name)
@ -316,13 +349,35 @@ export default {
} }
} }
</script> </script>
<style>
<style media="print" lang="scss">
@page {
size: auto;
margin: 3mm;
}
@media print { @media print {
@page {
size: auto;
html {
background-color: #ffffff;
height: auto;
margin: 0px;
}
body {
border: solid 1px #ffffff;
margin: 10mm 15mm 10mm 15mm;
}
table {
table-layout: auto !important;
}
.el-table__header-wrapper .el-table__header {
width: 100% !important;
border: solid 1px #f2f2f2;
} }
body, html {
height: auto !important;
.el-table__body-wrapper .el-table__body {
width: 100% !important;
}
#pagetable table {
table-layout: fixed !important;
} }
} }
</style> </style>
@ -411,27 +466,52 @@ export default {
.content-right{ .content-right{
position: relative; position: relative;
flex: 1; flex: 1;
height: calc(100vh - 75px);
background-color: #f6f8fc;
border: 1px solid #edeff3; border: 1px solid #edeff3;
border-top: none; border-top: none;
overflow: hidden;
border-bottom: none;
// overflow-y: auto; // overflow-y: auto;
} }
} }
.well-box{ .well-box{
position: relative; position: relative;
border: 1px solid #edeff3;
background-color: #f6f8fc;
height: calc(100vh - 150px);
margin: 0 10px;
overflow: hidden;
} }
.water-mask{ .water-mask{
position: fixed; position: fixed;
left: 300px; left: 300px;
top: 100px;
top: 150px;
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
width:100%; width:100%;
z-index:99; z-index:99;
pointer-events: none; pointer-events: none;
} }
.preview-info{
display: flex;
justify-content: space-between;
padding: 15px;
ul{
display: flex;
justify-content: flex-start;
font-size: 14px;
li{
margin-right: 10px;
height: 30px;
line-height: 30px
}
}
.preview-btn{
.el-button.icon-dayin{
&::before{
font-size: 16px;
}
}
}
}
</style> </style>
<style> <style>

2
src/views/system/archivesCategory/index.vue

@ -60,7 +60,7 @@
<li v-if="selectedCategory.isType && selectedCategory.isType === 3 && selectedCategory.cnName !== '电子原文表'" :class="{'active-tab-nav': activeIndex == 5}" @click="changeActiveTab(5)">档号规则设置<i /></li> <li v-if="selectedCategory.isType && selectedCategory.isType === 3 && selectedCategory.cnName !== '电子原文表'" :class="{'active-tab-nav': activeIndex == 5}" @click="changeActiveTab(5)">档号规则设置<i /></li>
<li v-if="selectedCategory.isType && selectedCategory.isType !== 1 && selectedCategory.isType !== 3" :class="{'active-tab-nav': activeIndex == 6}" @click="changeActiveTab(6)">归档章设置<i /></li> <li v-if="selectedCategory.isType && selectedCategory.isType !== 1 && selectedCategory.isType !== 3" :class="{'active-tab-nav': activeIndex == 6}" @click="changeActiveTab(6)">归档章设置<i /></li>
<li v-if="selectedCategory.isType && selectedCategory.isType !== 1 && selectedCategory.isType !== 3" :class="{'active-tab-nav': activeIndex == 7}" @click="changeActiveTab(7)">公共筛选<i /></li> <li v-if="selectedCategory.isType && selectedCategory.isType !== 1 && selectedCategory.isType !== 3" :class="{'active-tab-nav': activeIndex == 7}" @click="changeActiveTab(7)">公共筛选<i /></li>
<li v-if="selectedCategory.isType && selectedCategory.isType !== 1 && selectedCategory.isType !== 3" :class="{'active-tab-nav': activeIndex == 8}" @click="changeActiveTab(8)">流程管理<i /></li>
<li v-if="selectedCategory.isType && selectedCategory.isType !== 1 && selectedCategory.isType !== 3 || selectedCategory.arrangeType === 0" :class="{'active-tab-nav': activeIndex == 8}" @click="changeActiveTab(8)">流程管理<i /></li>
<!-- 最右侧装饰img --> <!-- 最右侧装饰img -->
<span class="tab-right-img" /> <span class="tab-right-img" />
</ul> </ul>

12
src/views/system/archivesCategory/processManage/index.vue

@ -1,10 +1,11 @@
<template> <template>
<div class="process-container"> <div class="process-container">
<div v-for="item in flowBaseList" :key="item.id" class="process-item">
<div v-for="item in filteredFlowList" :key="item.id" class="process-item">
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
<p>{{ item.flowName }}<i class="iconfont icon-shezhi" @click="toProcessSelected(item)" /></p> <p>{{ item.flowName }}<i class="iconfont icon-shezhi" @click="toProcessSelected(item)" /></p>
<el-switch v-model="item.status" class="isEnable-chapter" @change="changeCategoryState(item)" /> <el-switch v-model="item.status" class="isEnable-chapter" @change="changeCategoryState(item)" />
</div> </div>
<eForm ref="cuform" :selected-category="selectedCategory" :edit-info-flow="editInfoFlow" @refresh="getInitCategoryFlowBase" /> <eForm ref="cuform" :selected-category="selectedCategory" :edit-info-flow="editInfoFlow" @refresh="getInitCategoryFlowBase" />
</div> </div>
</template> </template>
@ -30,6 +31,15 @@ export default {
editInfoFlow: null editInfoFlow: null
} }
}, },
computed: {
filteredFlowList() {
if (this.selectedCategory.arrangeType === 0) {
return this.flowBaseList.filter(item => item.id === '5')
} else {
return this.flowBaseList.filter(item => item.id !== '5')
}
}
},
watch: { watch: {
}, },
mounted() { mounted() {

2
src/views/system/processManage/runningProcess/module/processImg/index.vue

@ -30,7 +30,7 @@ export default {
overflow: hidden; overflow: hidden;
img{ img{
display: block; display: block;
width: 100%;
// width: 100%;
// height: 100%; // height: 100%;
} }
} }

20
src/views/system/user/center.vue

@ -94,7 +94,7 @@ import updateEmail from './center/updateEmail'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import store from '@/store' import store from '@/store'
import { isvalidPhone } from '@/utils/validate' import { isvalidPhone } from '@/utils/validate'
import crud from '@/mixins/crud'
// import crud from '@/mixins/crud'
import { editUser } from '@/api/system/user' import { editUser } from '@/api/system/user'
import Avatar from '@/assets/images/avatar.png' import Avatar from '@/assets/images/avatar.png'
import messageCenter from './messageCenter/index.vue' import messageCenter from './messageCenter/index.vue'
@ -103,7 +103,7 @@ import OperateLog from '@/views/system/log/operateLog/index'
export default { export default {
name: 'Center', name: 'Center',
components: { updatePass, updateEmail, myUpload, messageCenter, processCenter, OperateLog }, components: { updatePass, updateEmail, myUpload, messageCenter, processCenter, OperateLog },
mixins: [crud],
// mixins: [crud],
data() { data() {
// //
const validPhone = (rule, value, callback) => { const validPhone = (rule, value, callback) => {
@ -175,10 +175,10 @@ export default {
this.init() this.init()
} }
}, },
beforeInit() {
this.url = 'api/logs/user'
return true
},
// beforeInit() {
// this.url = 'api/logs/user'
// return true
// },
cropUploadSuccess(jsonData, field) { cropUploadSuccess(jsonData, field) {
store.dispatch('GetInfo').then(() => {}) store.dispatch('GetInfo').then(() => {})
}, },
@ -389,4 +389,12 @@ input {
// .el-pagination{ // .el-pagination{
// margin: 20px 0 10px 0 !important // margin: 20px 0 10px 0 !important
// } // }
::v-deep .vue-image-crop-upload .vicp-wrap .vicp-operate a{
border: 1px solid #e6e8ed;
background-color: transparent;
color: #545b65;
border-radius: 3px;
// color: #fff;
// background-color: #0348f3;
}
</style> </style>
Loading…
Cancel
Save