新增档案类型主题/档案管理bug修改

3 years ago · 96204baa00
8 changed files with 486 additions and 25 deletions
--- a/src/assets/echarts/echartDark.js
+++ b/src/assets/echarts/echartDark.js
@ -0,0 +1,420 @@
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['exports', 'echarts'], factory);
+    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
+        // CommonJS
+        factory(exports, require('echarts'));
+    } else {
+        // Browser globals
+        factory({}, root.echarts);
+    }
+}(this, function (exports, echarts) {
+    var log = function (msg) {
+        if (typeof console !== 'undefined') {
+            console && console.error && console.error(msg);
+        }
+    };
+    if (!echarts) {
+        log('ECharts is not Loaded');
+        return;
+    }
+    echarts.registerTheme('dark', {
+        "color": [
+            "#0fbed9",
+            "#f65163",
+            "#ff8447",
+            "#76af50",
+            "#8378e8",
+            "#eedd78",
+            "#73a373",
+            "#73b9bc",
+            "#7289ab",
+            "#91ca8c",
+            "#f49f42"
+        ],
+        "backgroundColor": "rgba(51,51,51,0)",
+        "textStyle": {},
+        "title": {
+            "textStyle": {
+                "color": "#eeeeee"
+            },
+            "subtextStyle": {
+                "color": "#aaaaaa"
+            }
+        },
+        "line": {
+            "itemStyle": {
+                "borderWidth": 1
+            },
+            "lineStyle": {
+                "width": 2
+            },
+            "symbolSize": 4,
+            "symbol": "circle",
+            "smooth": false
+        },
+        "radar": {
+            "itemStyle": {
+                "borderWidth": 1
+            },
+            "lineStyle": {
+                "width": 2
+            },
+            "symbolSize": 4,
+            "symbol": "circle",
+            "smooth": false
+        },
+        "bar": {
+            "itemStyle": {
+                "barBorderWidth": 0,
+                "barBorderColor": "#cccccc"
+            }
+        },
+        "pie": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "scatter": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "boxplot": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "parallel": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "sankey": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "funnel": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "gauge": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            }
+        },
+        "candlestick": {
+            "itemStyle": {
+                "color": "#fd1050",
+                "color0": "#0cf49b",
+                "borderColor": "#fd1050",
+                "borderColor0": "#0cf49b",
+                "borderWidth": 1
+            }
+        },
+        "graph": {
+            "itemStyle": {
+                "borderWidth": 0,
+                "borderColor": "#cccccc"
+            },
+            "lineStyle": {
+                "width": 1,
+                "color": "#aaaaaa"
+            },
+            "symbolSize": 4,
+            "symbol": "circle",
+            "smooth": false,
+            "color": [
+                "#0fbed9",
+                "#f65163",
+                "#ff8447",
+                "#76af50",
+                "#8378e8",
+                "#eedd78",
+                "#73a373",
+                "#73b9bc",
+                "#7289ab",
+                "#91ca8c",
+                "#f49f42"
+            ],
+            "label": {
+                "color": "#eeeeee"
+            }
+        },
+        "map": {
+            "itemStyle": {
+                "areaColor": "#eee",
+                "borderColor": "#444",
+                "borderWidth": 0.5
+            },
+            "label": {
+                "color": "#000"
+            },
+            "emphasis": {
+                "itemStyle": {
+                    "areaColor": "rgba(255,215,0,0.8)",
+                    "borderColor": "#444",
+                    "borderWidth": 1
+                },
+                "label": {
+                    "color": "rgb(100,0,0)"
+                }
+            }
+        },
+        "geo": {
+            "itemStyle": {
+                "areaColor": "#eee",
+                "borderColor": "#444",
+                "borderWidth": 0.5
+            },
+            "label": {
+                "color": "#000"
+            },
+            "emphasis": {
+                "itemStyle": {
+                    "areaColor": "rgba(255,215,0,0.8)",
+                    "borderColor": "#444",
+                    "borderWidth": 1
+                },
+                "label": {
+                    "color": "rgb(100,0,0)"
+                }
+            }
+        },
+        "categoryAxis": {
+            "axisLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisTick": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisLabel": {
+                "show": true,
+                "color": "#eeeeee"
+            },
+            "splitLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": [
+                        "#aaaaaa"
+                    ]
+                }
+            },
+            "splitArea": {
+                "show": false,
+                "areaStyle": {
+                    "color": [
+                        "#eeeeee"
+                    ]
+                }
+            }
+        },
+        "valueAxis": {
+            "axisLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisTick": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisLabel": {
+                "show": true,
+                "color": "#eeeeee"
+            },
+            "splitLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": [
+                        "#aaaaaa"
+                    ]
+                }
+            },
+            "splitArea": {
+                "show": false,
+                "areaStyle": {
+                    "color": [
+                        "#eeeeee"
+                    ]
+                }
+            }
+        },
+        "logAxis": {
+            "axisLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisTick": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisLabel": {
+                "show": true,
+                "color": "#eeeeee"
+            },
+            "splitLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": [
+                        "#aaaaaa"
+                    ]
+                }
+            },
+            "splitArea": {
+                "show": false,
+                "areaStyle": {
+                    "color": [
+                        "#eeeeee"
+                    ]
+                }
+            }
+        },
+        "timeAxis": {
+            "axisLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisTick": {
+                "show": true,
+                "lineStyle": {
+                    "color": "#eeeeee"
+                }
+            },
+            "axisLabel": {
+                "show": true,
+                "color": "#eeeeee"
+            },
+            "splitLine": {
+                "show": true,
+                "lineStyle": {
+                    "color": [
+                        "#aaaaaa"
+                    ]
+                }
+            },
+            "splitArea": {
+                "show": false,
+                "areaStyle": {
+                    "color": [
+                        "#eeeeee"
+                    ]
+                }
+            }
+        },
+        "toolbox": {
+            "iconStyle": {
+                "borderColor": "#999999"
+            },
+            "emphasis": {
+                "iconStyle": {
+                    "borderColor": "#666666"
+                }
+            }
+        },
+        "legend": {
+            "textStyle": {
+                "color": "#eeeeee"
+            }
+        },
+        "tooltip": {
+            "axisPointer": {
+                "lineStyle": {
+                    "color": "#eeeeee",
+                    "width": "1"
+                },
+                "crossStyle": {
+                    "color": "#eeeeee",
+                    "width": "1"
+                }
+            }
+        },
+        "timeline": {
+            "lineStyle": {
+                "color": "#eeeeee",
+                "width": 1
+            },
+            "itemStyle": {
+                "color": "#dd6b66",
+                "borderWidth": 1
+            },
+            "controlStyle": {
+                "color": "#eeeeee",
+                "borderColor": "#eeeeee",
+                "borderWidth": 0.5
+            },
+            "checkpointStyle": {
+                "color": "#e43c59",
+                "borderColor": "#c23531"
+            },
+            "label": {
+                "color": "#eeeeee"
+            },
+            "emphasis": {
+                "itemStyle": {
+                    "color": "#a9334c"
+                },
+                "controlStyle": {
+                    "color": "#eeeeee",
+                    "borderColor": "#eeeeee",
+                    "borderWidth": 0.5
+                },
+                "label": {
+                    "color": "#eeeeee"
+                }
+            }
+        },
+        "visualMap": {
+            "color": [
+                "#bf444c",
+                "#d88273",
+                "#f6efa6"
+            ]
+        },
+        "dataZoom": {
+            "backgroundColor": "rgba(47,69,84,0)",
+            "dataBackgroundColor": "rgba(255,255,255,0.3)",
+            "fillerColor": "rgba(167,183,204,0.4)",
+            "handleColor": "#a7b7cc",
+            "handleSize": "100%",
+            "textStyle": {
+                "color": "#eeeeee"
+            }
+        },
+        "markPoint": {
+            "label": {
+                "color": "#eeeeee"
+            },
+            "emphasis": {
+                "label": {
+                    "color": "#eeeeee"
+                }
+            }
+        }
+    });
+}));
--- a/src/main.js
+++ b/src/main.js
@ -24,6 +24,8 @@ import './assets/iconfonts/iconfont.js'
 import VueHighlightJS from 'vue-highlightjs'
 import 'highlight.js/styles/atom-one-dark.css'

+import './assets/echarts/echartDark.js'
+
 import App from './App'
 import store from './store'
 import router from './router/routers'
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@ -20,8 +20,7 @@
      </div>
      <div class="head-search">
        <!-- 搜索 -->
-        <!-- @change="crud.toQuery" -->
-        <el-select v-if="!recycleMain.isRecycle" v-model="anjuanQuery.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px">
+        <el-select v-if="!recycleMain.isRecycle" v-model="anjuanQuery.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="stateSelect">
          <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
          <el-option v-for="item in stateOptions" :key="item.key" :label="item.label" :value="item.key" />
        </el-select>
@ -77,6 +76,7 @@
        :data="anjuanData"
        highlight-current-row
        style="width: 100%;"
+        height="calc(100vh - 434px)"
        @select-all="selectAll"
        @selection-change="crud.selectionChangeHandler"
        @row-click="clickRowHandler"
@ -135,8 +135,8 @@
        :page-size="page.size"
        :pager-count="5"
        layout="total, prev, pager, next, sizes"
-        @size-change="crud.sizeChangeHandler($event)"
-        @current-change="getTableList"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentPage"
      />
    </el-card>

@ -236,7 +236,16 @@ export default {
      anjuanData: [],
      anjuanQuery: {},
      queryOption: [],
+      tableHeight: null,
      anjuanInputSelect: '',
+      stateOptions: [ // 搜索 - 状态选择
+        { key: '全部', label: '全部' },
+        { key: '未装', label: '未装' },
+        { key: '未入', label: '未入' },
+        { key: '在库', label: '在库' },
+        { key: '待借', label: '待借' },
+        { key: '已借', label: '已借' }
+      ],
      isAnjuan: true, // 用于判断卷内-新增/导出按钮
      lengingVisible: false // 借阅
    }
@ -274,6 +283,10 @@ export default {
    this.selections = []
  },
  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = window.innerHeight - 50
+      // 后面的50：根据需求空出的高度，自行调整
+    })
  },
  methods: {
    // 文件/案卷重置query
@ -297,8 +310,14 @@ export default {
    getTableDisplayFields(type) {
      this.getTableItemCommon(type)
    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.page.page = 1
+      this.getListCommon('anjuanData', 1)
+    },
    // list
-    getTableList(page) {
+    getTableList() {
+      this.query.queryType = null
      this.query.queryTitle = ''
      this.query.archiveNo = ''
      this.query.archiveCtgNo = ''
@ -317,7 +336,11 @@ export default {
          this.query.responsibleby = this.anjuanQuery[this.anjuanInputSelect]
          break
      }
-      this.getListCommon('anjuanData', page, 1)
+      this.getListCommon('anjuanData', 1)
+    },
+    stateSelect(val) {
+      this.query.queryType = val
+      this.getListCommon('anjuanData', 1, 1)
    },
    // table - 全选
    selectAll(val) {
@ -441,4 +464,9 @@ export default {
    padding-left: 106px !important;
  }
 }
+
+::v-deep .el-table__fixed-right-patch{
+  background-color:#13439e;
+  border-bottom: none;
+}
 </style>
--- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
@ -60,6 +60,7 @@
        :data="junneiData"
        highlight-current-row
        style="width: 100%;"
+        height="calc(100vh - 434px)"
        @select-all="selectAll"
        @selection-change="crud.selectionChangeHandler"
        @row-click="clickRowHandler"
@ -105,8 +106,8 @@
        :page-size="page.size"
        :pager-count="5"
        layout="total, prev, pager, next, sizes"
-        @size-change="crud.sizeChangeHandler($event)"
-        @current-change="getTableList"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentPage"
      />
    </el-card>

@ -222,8 +223,13 @@ export default {
    getTableDisplayFields(type) {
      this.getTableItemCommon(type)
    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.page.page = 1
+      this.getListCommon('junneiData', 2)
+    },
    // list
-    getTableList(page) {
+    getTableList() {
      this.query.queryTitle = ''
      this.query.archiveNo = ''
      this.query.responsibleby = ''
@ -238,7 +244,7 @@ export default {
          this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect]
          break
      }
-      this.getListCommon('junneiData', page, 2)
+      this.getListCommon('junneiData', 2)
    },
    // table - 全选
    selectAll(val) {
--- a/src/views/archivesManage/archivesList/archivesProject/index.vue
+++ b/src/views/archivesManage/archivesList/archivesProject/index.vue
@ -89,8 +89,8 @@
        :page-size="page.size"
        :pager-count="5"
        layout="total, prev, pager, next, sizes"
-        @size-change="crud.sizeChangeHandler($event)"
-        @current-change="getTableList"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentPage"
      />
    </el-card>

@ -170,6 +170,11 @@ export default {
    getTableDisplayFields(type) {
      this.getTableItemCommon(type)
    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.page.page = 1
+      this.getListCommon('projectData', 0)
+    },
    // table - list
    getTableList(page) {
      this.query.queryTitle = ''
@ -182,7 +187,7 @@ export default {
          this.query.itemNo = this.projectQuery[this.projectInputSelect]
          break
      }
-      this.getListCommon('projectData', page, 0)
+      this.getListCommon('projectData', 0)
    },
    // table - 全选
    selectAll(val) {
--- a/src/views/archivesManage/archivesList/mixins/archives.js
+++ b/src/views/archivesManage/archivesList/mixins/archives.js
@ -16,14 +16,6 @@ export const archivesCrud = {
        size: 10,
        total: 0
      },
-      stateOptions: [ // 搜索 - 状态选择
-        { key: '1', label: '全部' },
-        { key: '2', label: '未装' },
-        { key: '3', label: '未入' },
-        { key: '4', label: '在库' },
-        { key: '5', label: '待借' },
-        { key: '6', label: '已借' }
-      ],
      storageTxt: [],
      borrowTxt: [],
      tableDisplayFields: [], // table-list-title字段
@ -106,8 +98,12 @@ export const archivesCrud = {
        }
      })
    },
+    handleCurrentPage(val) {
+      this.page.page = val
+      this.getTableList()
+    },
    // table - list
-    getListCommon(name, page, type) {
+    getListCommon(name, type) {
      if (type === 0) {
        this.parentsId = null
      } else if (type === 1) {
@ -125,7 +121,7 @@ export const archivesCrud = {
      }
      if (this.categoryId !== null) { // 防止项目下无案卷门类情况
        this.selections = []
-        this.page.page = isNaN(page - 1) ? 0 : page - 1
+        this.page.page = isNaN(this.page.page - 1) ? 0 : this.page.page - 1
        this.formVisible = false
        this.getTableDisplayFieldsLoading = true
        const params = {
--- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
@ -15,7 +15,7 @@
          <el-row>
            <el-col v-for="(item,index) in archivesDetailsData" v-show="index<archivesDetailsData.length-5" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
              <span>{{ item.fieldCnName }}：</span>
-              <p :style="{ width: item.editLength+'px'}">{{ item.context }}</p>
+              <p :style="{ width: ( item.editLength ? item.editLength+'px' : '' ), flex: ( !item.editLength ? 1 : '' )}">{{ item.context }}</p>
            </el-col>
          </el-row>
          <el-row v-if="isDetailsInfo">
@ -247,6 +247,10 @@ export default {
  width: auto;
  color: #fff;
 }
+::v-deep .el-dialog .el-dialog__header .el-dialog__headerbtn {
+    top: 12px;
+    right: -320px;
+}
 ::v-deep .hljs{
  font-family: "Sans Mono", "Consolas", "Courier", monospace;
  font-size: 12px;
--- a/src/views/components/echarts/typePie.vue
+++ b/src/views/components/echarts/typePie.vue
@ -49,7 +49,7 @@ export default {
  methods: {
    drawChart() {
      const chartDom = document.getElementById('maintype')
-      this.chart = echarts.init(chartDom)
+      this.chart = echarts.init(chartDom, 'dark')
      let option = null
      option = {
        tooltip: {