.

(cherry picked from commit 2c8c839901c19676687b0c91ce945f309d3384bb)

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

@@ -1,133 +1,138 @@
 <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
+            :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="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'
-                            },
-                    ],
-                },
+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;
+                }
+            });
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                let data = {...this.formData};
+        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.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 => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

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

@@ -1,55 +1,39 @@
 <template>
-    <div  class="list-view">
+    <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-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-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>
@@ -64,114 +48,117 @@
                     <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
+                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";
+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,
+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 };
             }
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        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: {
+        addRow() {
+            this.$router.push({
+                path: '/metricEdit',
+                query: {
                     ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/metricEdit",
-                    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
+                }
+            });
+        },
+        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);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/metric/del/${row.id}`)
-                }).then(() => {
+        },
+        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 => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>