diff --git a/src/main.js b/src/main.js
index c35991b..d5db9ed 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,6 +34,8 @@ Vue.component('ArchivesListModule', ArchivesListModule)
 import VueViewer from 'v-viewer'
 import 'viewerjs/dist/viewer.css'
 
+import Print from 'vue-print-nb'
+
 // 加载用户主题
 if (localStorage.getItem('themeValue')) {
   window.document.documentElement.setAttribute('data-theme', localStorage.getItem('themeValue'))
@@ -53,6 +55,7 @@ Vue.use(dict)
 Vue.use(Element, {
   size: Cookies.get('size') || 'small' // set element-ui default size
 })
+Vue.use(Print)
 
 import X2js from 'x2js' // xml数据处理插件
 Vue.prototype.$x2js = new X2js() // 创建x2js对象，挂到vue原型上
diff --git a/src/vendors/ofd/OfdView.vue b/src/vendors/ofd/OfdView.vue
index b2f4617..f6960cb 100644
--- a/src/vendors/ofd/OfdView.vue
+++ b/src/vendors/ofd/OfdView.vue
@@ -1,6 +1,6 @@
 <template>
   <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 class="upload" @click="uploadFile">
           <div class="upload_title">打开OFD</div>
diff --git a/src/vendors/xlsx/Table.vue b/src/vendors/xlsx/Table.vue
index 59eb6d4..acfb2a6 100644
--- a/src/vendors/xlsx/Table.vue
+++ b/src/vendors/xlsx/Table.vue
@@ -360,7 +360,7 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
 .docx-class {
-  height: calc(100vh - 76px);
+  height: calc(100vh - 152px);
 }
 /* .sheet-btn.active {
   background-color: aquamarine;
diff --git a/src/views/archiveKeeping/deviceManage/index.vue b/src/views/archiveKeeping/deviceManage/index.vue
index 9b2ec8c..2e9f649 100644
--- a/src/views/archiveKeeping/deviceManage/index.vue
+++ b/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) {
@@ -180,7 +182,7 @@ export default {
     [CRUD.HOOK.beforeToAdd](crud, form, btn) {
       const isCanAddKey = JSON.parse(localStorage.getItem('currentStoreKey'))
       console.log('isCanAddKey', isCanAddKey)
-      if (isCanAddKey.isType === '2') {
+      if (isCanAddKey.isType === 2) {
         this.$refs.eform.isAddArea = true
         this.$refs.eform.crud.title = '区域'
       } else {
@@ -191,7 +193,7 @@ export default {
     // 编辑前
     [CRUD.HOOK.beforeToEdit](crud, form, btn) {
       const isCanAddKey = JSON.parse(localStorage.getItem('currentStoreKey'))
-      if (isCanAddKey.isType === '2') {
+      if (isCanAddKey.isType === 2) {
         this.$refs.eform.isAddArea = false
         this.$refs.eform.crud.title = '库房'
       } else {
diff --git a/src/views/archiveKeeping/inStorage/index.vue b/src/views/archiveKeeping/inStorage/index.vue
index bebe879..393c4a7 100644
--- a/src/views/archiveKeeping/inStorage/index.vue
+++ b/src/views/archiveKeeping/inStorage/index.vue
@@ -237,7 +237,7 @@ export default {
             currentKey = this.crud.data[0]
           }
         }
-        if (currentKey.id) {
+        if (currentKey && currentKey.id) {
         // 设置某个节点的当前选中状态
           this.$refs.categroyTree.setCurrentKey(currentKey.id)
           this.$nextTick(() => {
diff --git a/src/views/archivesManage/managementLibrary/index.vue b/src/views/archivesManage/managementLibrary/index.vue
index b49d0f8..8b574d5 100644
--- a/src/views/archivesManage/managementLibrary/index.vue
+++ b/src/views/archivesManage/managementLibrary/index.vue
@@ -256,7 +256,7 @@ export default {
             currentKey = this.crud.data[0]
           }
         }
-        if (currentKey.id) {
+        if (currentKey && currentKey.id) {
         // 设置某个节点的当前选中状态
           this.$refs.categroyTree.setCurrentKey(currentKey.id)
           this.$nextTick(() => {
diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue
index dc91e87..482a254 100644
--- a/src/views/collectReorganizi/collectionLibrary/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/index.vue
@@ -241,7 +241,7 @@ export default {
             currentKey = this.crud.data[0]
           }
         }
-        if (currentKey.id) {
+        if (currentKey && currentKey.id) {
         // 设置某个节点的当前选中状态
           this.$refs.categroyTree.setCurrentKey(currentKey.id)
           this.$nextTick(() => {
diff --git a/src/views/components/echarts/serverProgress2.vue b/src/views/components/echarts/serverProgress2.vue
index 68e446e..074f4ed 100644
--- a/src/views/components/echarts/serverProgress2.vue
+++ b/src/views/components/echarts/serverProgress2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="main4" :style="{height:height,width:width}" />
+  <div id="main4" :style="{height:height}" />
 </template>
 
 <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 {
   name: 'AcrossEcharts',
   mixins: [resize],
@@ -63,7 +75,16 @@ export default {
   },
   data() {
     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: {
@@ -82,151 +103,167 @@ export default {
     window.addEventListener('resize', this.__resizeHandler)
   },
   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() {
       const chartDom = document.getElementById('main4')
-      this.chart = echarts.init(chartDom, 'macarons')
+      this.chart = echarts.init(chartDom)
       let option = null
       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: [
           {
-            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)
     }
   }
@@ -234,141 +271,5 @@ export default {
 </script>
 
 <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>
diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue
index 49d2e27..956cebe 100644
--- a/src/views/preview/index.vue
+++ b/src/views/preview/index.vue
@@ -34,8 +34,19 @@
         </ul>
         <el-empty v-else :image-size="100" />
       </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>
     </div>
@@ -48,6 +59,8 @@ import { getExtend, readBuffer, render } from '@/components/util'
 import { parse } from 'qs'
 import { watermark } from '@/utils/waterMark'
 import { getInitWatermark } from '@/api/system/waterMask'
+import { downloadFile } from '@/utils/index'
+import { mapGetters } from 'vuex'
 import html2canvas from 'html2canvas' // 转图片打印需要先安装html2Canvas和print-js
 import printJS from 'print-js'
 
@@ -73,19 +86,19 @@ export default {
       hidden: false,
       printObj: {
         id: 'printArea',
-        popTitle: '配置页眉标题', // 打印配置页上方的标题
-        extraHead: '打印', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
         preview: true, // 是否启动预览模式，默认是false
-        previewTitle: '预览的标题', // 打印预览的标题
-        previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
+        previewTitle: '电子原文预览', // 打印预览的标题
+        previewPrintBtnLabel: '预览结束，开始打印',
         zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+        extraCss: '', // 打印可引入外部的一个css文件
+        extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>,<style> #printArea { height: auto !important; } <style>', // 打印头部文字
         previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
         previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
         beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
         openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
         closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
         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) {
         //   setTimeout(() => {
         //     reslove('http://localhost:8080/')
@@ -100,9 +113,15 @@ export default {
       allFileTables: [],
       toFile: null,
       fileCurrent: null,
-      fileParentInfo: null
+      fileParentInfo: null,
+      pdfsArray: []
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
   created() {
     // 允许使用预留的消息机制发送二进制数据，必须在url后添加?name=xxx.xxx&from=xxx
     const { from, name } = parse(location.search.substr(1))
@@ -136,6 +155,20 @@ export default {
     this.getBase64ByFileId()
   },
   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) {
       this.fileCurrent = item
       this.getBase64ByFileId()
@@ -232,8 +265,8 @@ export default {
           this.src = fileReader.result
         }
         const arrayBuffer = await readBuffer(this.toFile)
-
         this.last = await this.displayResult(arrayBuffer, this.toFile)
+
         this.$nextTick(() => {
           // 取得扩展名
           const extend = getExtend(this.toFile.name)
@@ -316,13 +349,35 @@ export default {
   }
 }
 </script>
-<style>
+<style media="print" lang="scss">
+@page {
+  size: auto;
+  margin: 3mm;
+}
 @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>
@@ -411,27 +466,52 @@ export default {
   .content-right{
     position: relative;
     flex: 1;
-    height: calc(100vh - 75px);
-    background-color: #f6f8fc;
     border: 1px solid #edeff3;
     border-top: none;
-    overflow: hidden;
+    border-bottom: none;
     // overflow-y: auto;
   }
 }
 .well-box{
   position: relative;
+  border: 1px solid #edeff3;
+  background-color: #f6f8fc;
+  height: calc(100vh - 150px);
+  margin: 0 10px;
+  overflow: hidden;
 }
 .water-mask{
   position: fixed;
   left: 300px;
-  top: 100px;
+  top: 150px;
   bottom: 10px;
   right: 10px;
   width:100%;
   z-index:99;
   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>
diff --git a/src/views/system/archivesCategory/index.vue b/src/views/system/archivesCategory/index.vue
index e07e7dc..fac8560 100644
--- a/src/views/system/archivesCategory/index.vue
+++ b/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 !== 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 == 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 -->
             <span class="tab-right-img" />
           </ul>
diff --git a/src/views/system/archivesCategory/processManage/index.vue b/src/views/system/archivesCategory/processManage/index.vue
index a2995e2..860e197 100644
--- a/src/views/system/archivesCategory/processManage/index.vue
+++ b/src/views/system/archivesCategory/processManage/index.vue
@@ -1,10 +1,11 @@
 <template>
   <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>
       <p>{{ item.flowName }}<i class="iconfont icon-shezhi" @click="toProcessSelected(item)" /></p>
       <el-switch v-model="item.status" class="isEnable-chapter" @change="changeCategoryState(item)" />
     </div>
+
     <eForm ref="cuform" :selected-category="selectedCategory" :edit-info-flow="editInfoFlow" @refresh="getInitCategoryFlowBase" />
   </div>
 </template>
@@ -30,6 +31,15 @@ export default {
       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: {
   },
   mounted() {
diff --git a/src/views/system/processManage/runningProcess/module/processImg/index.vue b/src/views/system/processManage/runningProcess/module/processImg/index.vue
index f4714c5..a9ef978 100644
--- a/src/views/system/processManage/runningProcess/module/processImg/index.vue
+++ b/src/views/system/processManage/runningProcess/module/processImg/index.vue
@@ -30,7 +30,7 @@ export default {
   overflow: hidden;
   img{
     display: block;
-    width: 100%;
+    // width: 100%;
     // height: 100%;
   }
 }
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 7c8a3a1..b3ec03f 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -94,7 +94,7 @@ import updateEmail from './center/updateEmail'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
-import crud from '@/mixins/crud'
+// import crud from '@/mixins/crud'
 import { editUser } from '@/api/system/user'
 import Avatar from '@/assets/images/avatar.png'
 import messageCenter from './messageCenter/index.vue'
@@ -103,7 +103,7 @@ import OperateLog from '@/views/system/log/operateLog/index'
 export default {
   name: 'Center',
   components: { updatePass, updateEmail, myUpload, messageCenter, processCenter, OperateLog },
-  mixins: [crud],
+  // mixins: [crud],
   data() {
     // 自定义验证
     const validPhone = (rule, value, callback) => {
@@ -175,10 +175,10 @@ export default {
         this.init()
       }
     },
-    beforeInit() {
-      this.url = 'api/logs/user'
-      return true
-    },
+    // beforeInit() {
+    //   this.url = 'api/logs/user'
+    //   return true
+    // },
     cropUploadSuccess(jsonData, field) {
       store.dispatch('GetInfo').then(() => {})
     },
@@ -389,4 +389,12 @@ input {
 // .el-pagination{
 //   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>