Merge branch 'dev' of xiongzhu/jmrh into master

src/main/data-center-admin/src/components/TFA.vue

@@ -58,11 +58,13 @@ export default {
     },
     created() {
         this.getKey();
-        this.$http.get('/user/tfaStatus').then(res => {
-            if (res.status === false) {
-                this.showDialog = true;
-            }
-        });
+        if (!location.href.includes('192.168.')) {
+            this.$http.get('/user/tfaStatus').then(res => {
+                if (res.status === false) {
+                    this.showDialog = true;
+                }
+            });
+        }
     },
     computed: {
         qrcodeContent() {

src/main/data-center-admin/src/router.js

@@ -252,6 +252,30 @@ const router = new Router({
                     meta: {
                         title: '角色管理'
                     }
+                },
+                {
+                    path: '/metricEdit',
+                    name: 'MetricEdit',
+                    component: () => import(/* webpackChunkName: "metricEdit" */ '@/views/MetricEdit.vue'),
+                    meta: {
+                        title: '指标管理编辑'
+                    }
+                },
+                {
+                    path: '/metricList',
+                    name: 'MetricList',
+                    component: () => import(/* webpackChunkName: "metricList" */ '@/views/MetricList.vue'),
+                    meta: {
+                        title: '指标管理'
+                    }
+                },
+                {
+                    path: '/gis',
+                    name: 'gis',
+                    component: () => import(/* webpackChunkName: "gis" */ '@/views/gis.vue'),
+                    meta: {
+                        title: 'gis'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/data-center-admin/src/views/Admin.vue

@@ -127,10 +127,15 @@ export default {
             });
         console.log(this.userInfo.pwdUpdateAt);
         let pwdUpdateAt = this.userInfo.pwdUpdateAt;
-        if (!pwdUpdateAt || isBefore(parse(pwdUpdateAt, 'yyyy-MM-dd HH:mm:ss', new Date()), addDays(new Date(), -30))) {
-            this.$alert('您已30天未修改密码，请尽快修改密码', '提示').then(() => {
-                this.onShowPwdDialog();
-            });
+        if (!location.href.includes('192.168.')) {
+            if (
+                !pwdUpdateAt ||
+                isBefore(parse(pwdUpdateAt, 'yyyy-MM-dd HH:mm:ss', new Date()), addDays(new Date(), -30))
+            ) {
+                this.$alert('您已30天未修改密码，请尽快修改密码', '提示').then(() => {
+                    this.onShowPwdDialog();
+                });
+            }
         }
     },
     data() {
@@ -255,7 +260,17 @@ export default {
                         { active: false, name: '基地分布', path: '/baseStatList', icon: 'fas fa-bars' },
                         { active: false, name: '技术交易', path: '/techTradeStatList', icon: 'fas fa-bars' }
                     ]
-                }
+                },
+                {
+                    active: false,
+                    name: '指标体系管理',
+                    icon: 'fas fa-bars',
+                    children: [
+                        { active: false, name: '指标列表', path: '/metricList', icon: 'fas fa-bars' },
+                        { active: false, name: '指标编辑', path: '/metricEdit', icon: 'fas fa-bars' }
+                    ]
+                },
+                { active: false, name: 'GIS', path: '/gis', icon: 'fas fa-bars' }
             ];
             function setId(parentId, menus) {
                 menus.forEach((i, idx) => {

src/main/data-center-admin/src/views/MetricEdit.vue

@@ -0,0 +1,186 @@
+<template>
+    <div class="edit-view">
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="120px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="levelOne" label="一级指标">
+                        <el-input v-model="formData.levelOne"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="levelTwo" label="二级指标">
+                        <el-input v-model="formData.levelTwo"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="levelThree" label="三级指标">
+                        <el-input v-model="formData.levelThree"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="unit" label="单位">
+                        <el-input v-model="formData.unit"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="source" label="数据来源">
+                        <el-input v-model="formData.source"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="calcMethod" label="计算方法">
+                        <el-input v-model="formData.calcMethod"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="remark" label="指标说明">
+                        <el-input v-model="formData.remark"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="formula" label="计算公式">
+                        <el-input
+                            v-model="formData.formula"
+                            type="textarea"
+                            :autosize="{ minRows: 2 }"
+                            @blur="blur"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item prop="extend" label="数据库连接" style="width: 600px">
+                        <el-table :data="extend">
+                            <el-table-column label="公式参数" prop="key" width="100"> </el-table-column>
+                            <el-table-column label="数据库字段" prop="value">
+                                <template v-slot="{ row, $index }">
+                                    <el-input v-model="extend[$index].value"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                        <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id"
+                            >删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MetricEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('metric/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                    if (res.extend) {
+                        this.extend = Object.keys(res.extend).map(key => {
+                            return {
+                                key,
+                                value: res.extend[key]
+                            };
+                        });
+                    }
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                levelOne: [
+                    {
+                        required: true,
+                        message: '请输入一级指标',
+                        trigger: 'blur'
+                    }
+                ],
+                levelTwo: [
+                    {
+                        required: true,
+                        message: '请输入二级指标',
+                        trigger: 'blur'
+                    }
+                ],
+                levelThree: [
+                    {
+                        required: true,
+                        message: '请输入三级指标',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            extend: []
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData, extend: {} };
+
+            this.extend.forEach(i => {
+                data.extend[i.key] = i.value;
+            });
+            this.saving = true;
+            this.$http
+                .post('/metric/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metric/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        blur() {
+            console.log(this.formData.formula);
+            var re = /\$\{(.*?)\}/g;
+            var s = this.formData.formula;
+            var m;
+            let keys = [];
+            do {
+                m = re.exec(s);
+                if (m) {
+                    let key = m[1];
+                    keys.push(key);
+                    if (!this.extend.find(i => i.key === key)) {
+                        this.extend.push({ key, value: '' });
+                    }
+                }
+            } while (m);
+            this.extend = this.extend.filter(i => keys.findIndex(j => j === i.key) > -1);
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/data-center-admin/src/views/MetricList.vue

@@ -0,0 +1,164 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="levelOne" label="一级指标"> </el-table-column>
+            <el-table-column prop="levelTwo" label="二级指标"> </el-table-column>
+            <el-table-column prop="levelThree" label="三级指标"> </el-table-column>
+            <el-table-column prop="unit" label="单位"> </el-table-column>
+            <el-table-column prop="source" label="数据来源"> </el-table-column>
+            <el-table-column prop="calcMethod" label="计算方法"> </el-table-column>
+            <el-table-column prop="remark" label="指标说明"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'MetricList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metric/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
+            }
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/metricEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metricEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metric/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metric/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/data-center-admin/src/views/gis.vue

@@ -0,0 +1,16 @@
+<template>
+    <div class="edit-view">
+        <iframe src=""></iframe>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MetricEdit',
+    created() {},
+    data() {
+        return {};
+    },
+    methods: {}
+};
+</script>
+<style lang="less" scoped></style>

src/main/data-center/src/components/mapChart.vue

@@ -1,5 +1,18 @@
 <template>
-    <div ref="chart" id="map-chart"></div>
+    <div class="map">
+        <div id="baiduMap" v-if="chooseMenu === 0"></div>
+        <div ref="chart" id="map-chart" v-else></div>
+
+        <div class="box" v-if="showBox">
+            <div class="title">
+                <img :src="chooseInfo.logo" alt="" />
+                <span> {{ chooseInfo.orgName }}</span>
+            </div>
+            <div class="text">{{ chooseInfo.parentOrg }} {{ chooseInfo.orgType }}</div>
+            <div class="text">企业介绍:{{ chooseInfo.intro }}</div>
+            <div class="text">地 址:{{ chooseInfo.addressDetail }}</div>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -23,7 +36,7 @@ export default {
     mixins: [menuOptions],
     props: {
         valueInfo: {
-            type: Object,
+            type: [Object, Array],
             default: () => {
                 return {};
             },
@@ -40,6 +53,24 @@ export default {
             desc: 1000,
             sndStat: {},
             showLables: [],
+            map: null,
+            chooseInfo: {
+                address: '江西上饶',
+                addressDetail: '江西省上饶市信州区茶圣东路文创中心2号楼3楼',
+                contactName: '林必利 ',
+                id: 11836,
+                intro:
+                    '上饶市饶东现代产业发展有限公司成立于2017-02-21，法定代表人为林必利，注册资本为100000万元人民币，统一社会信用代码为91361100MA35Q7G85K，企业地址位于江西省上饶市信州区茶圣东路文创中心2号楼3楼，所属行业为商务服务业，经营范围包含：现代农业服务；节能环保产业服务；信息技术产业服务；智慧城市开发建设和运营管理。',
+                location: '116.309983,39.983965\r',
+                logo: 'https://image.qcc.com/auto/1658389f6237d1dc73c3281f589d0753.jpg',
+                orgName: '上饶市饶东现代产业发展有限公司',
+                orgType: '小微企业',
+                parentOrg: '商务服务业',
+                publicCompany: false,
+                status: 'PASS',
+                userId: 11835,
+            },
+            showBox: false,
         };
     },
     computed: {
@@ -76,15 +107,32 @@ export default {
             if (this.timeData) {
                 clearTimeout(this.timeData);
             }
-            if (!this.myChart) {
-                var chartDom = document.getElementById('map-chart');
-                this.myChart = echarts.init(chartDom);
+            this.showBox = false;
+
+            if (this.chooseMenu == 0) {
+                if (this.map) {
+                    this.map.destroy();
+                    this.map = null;
+                }
             } else {
-                this.myChart.dispose();
+                if (!this.myChart) {
+                    let chartDom = document.getElementById('map-chart');
+                    if (chartDom.style) {
+                        chartDom.style.backgroundImage = '';
+                    }
+                    this.myChart = echarts.init(chartDom);
+                } else if (this.myChart) {
+                    let chartDom = document.getElementById('map-chart');
+                    if (chartDom.style) {
+                        chartDom.style.backgroundImage = '';
+                    }
+
+                    this.myChart.dispose();
+                }
             }
         },
         init() {
-            // this.clearDom();
+            this.clearDom();
             this.$nextTick(() => {
                 console.log(this.chooseMenu);
                 if (this.chooseMenu === 0) {
@@ -105,7 +153,7 @@ export default {
         initBaidu() {
             var map = initMap(
                 {
-                    tilt: 30,
+                    tilt: 50,
                     heading: 0,
                     center: [115.853087, 28.689709],
                     zoom: 9,
@@ -117,13 +165,61 @@ export default {
                         'rgba(186, 211, 252, 1)',
                     ],
                 },
-                'map-chart'
+                'baiduMap'
             );
 
+            map.setMinZoom(8);
+            map.setMaxZoom(20);
+
+            map.enableScrollWheelZoom();
+            var bd = new BMapGL.Boundary();
+            bd.get('江西省', function (rs) {
+                var count = rs.boundaries.length; //行政区域的点有多少个
+                var pointArray = [];
+                for (let i = 0; i < count; i++) {
+                    let path = [];
+                    let str = rs.boundaries[i].replace(' ', '');
+                    let points = str.split(';');
+                    for (let j = 0; j < points.length; j++) {
+                        let lng = points[j].split(',')[0];
+                        let lat = points[j].split(',')[1];
+                        path.push(new BMapGL.Point(lng, lat));
+                    }
+                    let prism = new BMapGL.Prism(path, 5000, {
+                        topFillColor: '#5679ea',
+                        topFillOpacity: 0.2,
+                        sideFillColor: '#5679ea',
+                        sideFillOpacity: 0.5,
+                    });
+                    map.addOverlay(prism);
+                }
+            });
+
+            this.map = map;
+            this.initCity();
+        },
+        initCity() {
             var data = [];
+            var data2 = [];
 
             var citys = ['南昌', '景德镇', '萍乡', '九江', '新余', '鹰潭', '赣州', '吉安', '宜春', '抚州', '上饶'];
             var randomCount = citys.length;
+            var values = [...this.valueInfo].filter((item) => {
+                let pos = item.location.split(',');
+                return pos.length == 2;
+            });
+            let nums = {};
+            values.forEach((item) => {
+                console.log(item);
+                let address = item.address.replace(/江西/, '');
+                if (citys.includes(address)) {
+                    let _num = nums[address] || 0;
+                    _num++;
+                    nums[address] = _num;
+                }
+            });
+
+            console.log(nums);
 
             // 构造数据
             while (randomCount--) {
@@ -135,7 +231,7 @@ export default {
                         coordinates: [cityCenter.lng, cityCenter.lat],
                     },
                     properties: {
-                        text: cityName + '\n' + cityCenter.lng + '，' + cityCenter.lat,
+                        text: cityName + '\n' + (nums[cityName] || 0),
                         // textColor: '#fff',
                         // borderColor: ['#0f0', '#f00', '#00f'][randomCount % 3],
                         // backgroundColor: ['#0f0', '#f00', '#00f'][randomCount % 3],
@@ -143,10 +239,28 @@ export default {
                 });
             }
 
+            data2 = values.map((item) => {
+                let pos = item.location.split(',');
+                return {
+                    geometry: {
+                        type: 'Point',
+                        coordinates: [pos[0], pos[1]],
+                    },
+                    properties: {
+                        text: item.orgName,
+                        // textColor: '#fff',
+                        // borderColor: ['#0f0', '#f00', '#00f'][randomCount % 3],
+                        // backgroundColor: ['#0f0', '#f00', '#00f'][randomCount % 3],
+                    },
+                };
+            });
+
             var view = new mapvgl.View({
-                map: map,
+                map: this.map,
             });
 
+            let _this = this;
+
             var layer = new mapvgl.LabelLayer({
                 textAlign: 'center',
                 textColor: '#fc0',
@@ -160,11 +274,35 @@ export default {
                 enablePicked: true,
                 onClick: (e) => {
                     // 点击事件
-                    console.log('click', e);
+                    let _zoom = 11;
+                    let zoom = this.map.getZoom();
+                    console.log(this.map.getZoom());
+                    if (zoom > 10) {
+                        console.log(values[e.dataIndex]);
+                        _this.chooseInfo = values[e.dataIndex];
+                        _zoom = 18;
+                        setTimeout(() => {
+                            _this.showBox = true;
+                        }, 500);
+                    }
+                    if (e.dataItem) {
+                        let location = e.dataItem.geometry.coordinates;
+                        this.map.centerAndZoom(new BMapGL.Point(location[0], location[1]), _zoom);
+                    }
                 },
             });
             view.addLayer(layer);
             layer.setData(data);
+            this.map.addEventListener('zoomstart', (e) => {
+                this.showBox = false;
+            });
+            this.map.addEventListener('zoomend', (e) => {
+                if (e.currentTarget.zoomLevel > 9) {
+                    layer.setData(data2);
+                } else {
+                    layer.setData(data);
+                }
+            });
         },
         init3D() {
             var chartDom = document.getElementById('map-chart');
@@ -623,8 +761,45 @@ export default {
 </script>
 
 <style lang="less" scoped>
-#map-chart {
+#map-chart,
+#baiduMap {
+    width: 100%;
+    height: 100%;
+}
+.map {
     width: 100%;
     height: 100%;
 }
+@prim: #3cbef2;
+.box {
+    padding: 15px;
+    width: 500px;
+    box-sizing: border-box;
+    position: fixed;
+    top: 200px;
+    z-index: 999;
+    background-color: rgba(0, 0, 0, 0.5);
+    left: 50%;
+    transform: translateX(-50%);
+    color: @prim;
+    border-radius: 8px;
+    .title {
+        .flex();
+        img {
+            width: 40px;
+            height: 40px;
+            border-radius: 100px;
+        }
+        span {
+            font-size: 16px;
+            font-weight: bold;
+            margin-left: 6px;
+        }
+    }
+
+    .text {
+        font-size: 14px;
+        margin-top: 12px;
+    }
+}
 </style>

src/main/data-center/src/views/Home.vue

@@ -105,22 +105,44 @@ export default {
     },
     methods: {
         getData() {
-            this.$http
-                .get('/statDataCenter/cityData', {
-                    categoryId: this.menus[this.chooseMenu].id,
-                })
-                .then((res) => {
-                    this.valueInfo = {
-                        labels: res.map((item) => {
-                            return item.city;
-                        }),
-                        data: res.map((item) => {
-                            return item.num;
-                        }),
-                    };
-                    // this.valueInfo = res;
-                    this.$refs.mapChart.init();
-                });
+            if (this.chooseMenu == 0) {
+                this.$http
+                    .get('/orgInfo/all', {
+                        size: 99,
+                    })
+                    .then((res) => {
+                        console.log(res);
+                        this.valueInfo = res.content;
+
+                        // this.valueInfo = {
+                        //     labels: res.map((item) => {
+                        //         return item.city;
+                        //     }),
+                        //     data: res.map((item) => {
+                        //         return item.num;
+                        //     }),
+                        // };
+                        // // this.valueInfo = res;
+                        this.$refs.mapChart.init();
+                    });
+            } else {
+                this.$http
+                    .get('/statDataCenter/cityData', {
+                        categoryId: this.menus[this.chooseMenu].id,
+                    })
+                    .then((res) => {
+                        this.valueInfo = {
+                            labels: res.map((item) => {
+                                return item.city;
+                            }),
+                            data: res.map((item) => {
+                                return item.num;
+                            }),
+                        };
+                        // this.valueInfo = res;
+                        this.$refs.mapChart.init();
+                    });
+            }
         },
         goSearch() {
             this.$router.push('/search');

src/main/java/com/izouma/jmrh/config/DecryptFilter.java

@@ -30,7 +30,9 @@ public class DecryptFilter implements Filter {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        if ("true".equals(((HttpServletRequest) servletRequest).getHeader("content-encrypted"))) {
+        String contentType = ((HttpServletRequest) servletRequest).getHeader("content-type");
+        String encrypted = ((HttpServletRequest) servletRequest).getHeader("content-encrypted");
+        if ("true".equals(encrypted) && !"application/json".equals(contentType)) {
             filterChain.doFilter(new EncryptedRequest(servletRequest, config), servletResponse);
         } else {
             filterChain.doFilter(servletRequest, servletResponse);

src/main/java/com/izouma/jmrh/domain/Metric.java

@@ -0,0 +1,51 @@
+package com.izouma.jmrh.domain;
+
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.jmrh.converter.JSONObjectConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("指标")
+public class Metric extends BaseEntity {
+
+    @ApiModelProperty("一级指标")
+    private String levelOne;
+
+    @ApiModelProperty("二级指标")
+    private String levelTwo;
+
+    @ApiModelProperty("三级指标")
+    private String levelThree;
+
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @ApiModelProperty("数据来源")
+    private String source;
+
+    @ApiModelProperty("计算方法")
+    private String calcMethod;
+
+    @ApiModelProperty("指标说明")
+    private String remark;
+
+    @ApiModelProperty("计算公式")
+    private String formula;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = JSONObjectConverter.class)
+    private JSONObject extend;
+}

src/main/java/com/izouma/jmrh/repo/MetricRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.jmrh.repo;
+
+import com.izouma.jmrh.domain.Metric;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MetricRepo extends JpaRepository<Metric, Long>, JpaSpecificationExecutor<Metric> {
+}

src/main/java/com/izouma/jmrh/service/MetricService.java

@@ -0,0 +1,14 @@
+package com.izouma.jmrh.service;
+
+import com.izouma.jmrh.domain.Metric;
+import com.izouma.jmrh.repo.MetricRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MetricService {
+
+    private MetricRepo metricRepo;
+
+}

src/main/java/com/izouma/jmrh/web/GenCodeController.java

@@ -1,5 +1,9 @@
 package com.izouma.jmrh.web;
 
+import cn.licoy.encryptbody.annotation.decrypt.DecryptBody;
+import cn.licoy.encryptbody.annotation.encrypt.EncryptBody;
+import cn.licoy.encryptbody.enums.DecryptBodyMethod;
+import cn.licoy.encryptbody.enums.EncryptBodyMethod;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -23,6 +27,8 @@ import java.util.regex.Pattern;
 
 @RestController
 @RequestMapping("/genCode")
+@EncryptBody(EncryptBodyMethod.AES)
+@DecryptBody(DecryptBodyMethod.AES)
 public class GenCodeController {
     @Autowired
     private GenCodeService genCodeService;

src/main/java/com/izouma/jmrh/web/MetricController.java

@@ -0,0 +1,60 @@
+package com.izouma.jmrh.web;
+import com.izouma.jmrh.domain.Metric;
+import com.izouma.jmrh.service.MetricService;
+import com.izouma.jmrh.dto.PageQuery;
+import com.izouma.jmrh.exception.BusinessException;
+import com.izouma.jmrh.repo.MetricRepo;
+import com.izouma.jmrh.utils.ObjUtils;
+import com.izouma.jmrh.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/metric")
+@AllArgsConstructor
+public class MetricController extends BaseController {
+    private MetricService metricService;
+    private MetricRepo metricRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Metric save(@RequestBody Metric record) {
+        if (record.getId() != null) {
+            Metric orig = metricRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metricRepo.save(orig);
+        }
+        return metricRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Metric> all(PageQuery pageQuery) {
+        return metricRepo.findAll(toSpecification(pageQuery,Metric.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Metric get(@PathVariable Long id) {
+        return metricRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metricRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Metric> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/Metric.json

@@ -0,0 +1 @@
+{"tableName":"Metric","className":"Metric","remark":"指标管理","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/drew/Projects/Java/jmrh/src/main/java/com/izouma/jmrh","viewPath":"/Users/drew/Projects/Java/jmrh/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/jmrh/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/jmrh/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"levelOne","modelName":"levelOne","remark":"一级指标","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"levelTwo","modelName":"levelTwo","remark":"二级指标","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"levelThree","modelName":"levelThree","remark":"三级指标","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"unit","modelName":"unit","remark":"单位","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"source","modelName":"source","remark":"数据来源","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"calcMethod","modelName":"calcMethod","remark":"计算方法","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"remark","modelName":"remark","remark":"指标说明","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"formula","modelName":"formula","remark":"计算公式","showInList":false,"showInForm":true,"formType":"singleLineText"},{"name":"extend","modelName":"extend","remark":"extend","showInList":false,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jmrh","tablePackage":"com.izouma.jmrh.domain.Metric"}

src/main/vue/src/router.js

@@ -498,7 +498,23 @@ const router = new Router({
                     meta: {
                         title: '待办列表'
                     }
-                }
+                },
+                {
+                    path: '/metricEdit',
+                    name: 'MetricEdit',
+                    component: () => import(/* webpackChunkName: "metricEdit" */ '@/views/MetricEdit.vue'),
+                    meta: {
+                       title: '指标管理编辑',
+                    },
+                },
+                {
+                    path: '/metricList',
+                    name: 'MetricList',
+                    component: () => import(/* webpackChunkName: "metricList" */ '@/views/MetricList.vue'),
+                    meta: {
+                       title: '指标管理',
+                    },
+               }
                 /**INSERT_LOCATION**/
             ]
         },
@@ -553,4 +569,4 @@ router.beforeEach((to, from, next) => {
         next();
     }
 });
-export default router;
+export default router;

src/main/vue/src/views/MetricEdit.vue

@@ -0,0 +1,133 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="levelOne" label="一级指标">
+                            <el-input v-model="formData.levelOne"></el-input>
+                </el-form-item>
+                <el-form-item prop="levelTwo" label="二级指标">
+                            <el-input v-model="formData.levelTwo"></el-input>
+                </el-form-item>
+                <el-form-item prop="levelThree" label="三级指标">
+                            <el-input v-model="formData.levelThree"></el-input>
+                </el-form-item>
+                <el-form-item prop="unit" label="单位">
+                            <el-input v-model="formData.unit"></el-input>
+                </el-form-item>
+                <el-form-item prop="source" label="数据来源">
+                            <el-input v-model="formData.source"></el-input>
+                </el-form-item>
+                <el-form-item prop="calcMethod" label="计算方法">
+                            <el-input v-model="formData.calcMethod"></el-input>
+                </el-form-item>
+                <el-form-item prop="remark" label="指标说明">
+                            <el-input v-model="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item prop="formula" label="计算公式">
+                            <el-input v-model="formData.formula"></el-input>
+                </el-form-item>
+                <el-form-item prop="extend" label="extend">
+                            <el-input v-model="formData.extend"></el-input>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'MetricEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('metric/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                        levelOne: [
+                            {
+                                required: true,
+                                message: '请输入一级指标',
+                                trigger: 'blur'
+                            },
+                    ],
+                        levelTwo: [
+                            {
+                                required: true,
+                                message: '请输入二级指标',
+                                trigger: 'blur'
+                            },
+                    ],
+                        levelThree: [
+                            {
+                                required: true,
+                                message: '请输入三级指标',
+                                trigger: 'blur'
+                            },
+                    ],
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/metric/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/metric/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/MetricList.vue

@@ -0,0 +1,177 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="levelOne" label="一级指标"
+>
+                    </el-table-column>
+                    <el-table-column prop="levelTwo" label="二级指标"
+>
+                    </el-table-column>
+                    <el-table-column prop="levelThree" label="三级指标"
+>
+                    </el-table-column>
+                    <el-table-column prop="unit" label="单位"
+>
+                    </el-table-column>
+                    <el-table-column prop="source" label="数据来源"
+>
+                    </el-table-column>
+                    <el-table-column prop="calcMethod" label="计算方法"
+>
+                    </el-table-column>
+                    <el-table-column prop="remark" label="指标说明"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'MetricList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/metric/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/metricEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/metricEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/metric/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/metric/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>