提交修改

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  OPEN_PROXY: false // 是否开启代理, 重置后需重启vue-cli
+  OPEN_PROXY: true // 是否开启代理, 重置后需重启vue-cli
 })

config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/lz_management': {
-        target: 'https://tlzmanagement.ldxinyong.com',
+        target: 'http://localhost:8080',
         changeOrigin: true
       }
     },

package-lock.json

@@ -116,9 +116,9 @@
       }
     },
     "ajv": {
-      "version": "6.12.2",
+      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5046,9 +5046,9 @@
       }
     },
     "fast-deep-equal": {
-      "version": "3.1.1",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -6446,11 +6446,11 @@
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "5.1.3",
+      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "requires": {
-        "ajv": "^6.5.5",
+        "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
       }
     },
@@ -10436,12 +10436,12 @@
           }
         },
         "globule": {
-          "version": "1.3.1",
+          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-          "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
+          "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
           "requires": {
             "glob": "~7.1.1",
-            "lodash": "~4.17.12",
+            "lodash": "~4.17.10",
             "minimatch": "~3.0.2"
           }
         },
@@ -17493,7 +17493,8 @@
           "dependencies": {
             "kind-of": {
               "version": "6.0.2",
-              "resolved": ""
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
             }
           }
         },
@@ -17507,7 +17508,8 @@
           "dependencies": {
             "kind-of": {
               "version": "6.0.2",
-              "resolved": ""
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
             }
           }
         },
@@ -17523,7 +17525,8 @@
           "dependencies": {
             "kind-of": {
               "version": "6.0.2",
-              "resolved": ""
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
             }
           }
         },

src/api/api_result.js

@@ -0,0 +1,6 @@
+import http from '../utils/http'
+
+// 获取侧边菜单栏
+export const apiGetResultRecordList = params => {
+  return http({ url: '/lz_management/user/lzresultrecord/list', method: 'get', params })
+}

src/views/modules/result/record/lzresultrecord-add-or-update.vue

@@ -0,0 +1,147 @@
+<template>
+  <el-dialog
+    :title="!dataForm.id ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+    <el-form-item label="是否删除状态，1：删除，0：有效" prop="isDelete">
+      <el-input v-model="dataForm.isDelete" placeholder="是否删除状态，1：删除，0：有效"></el-input>
+    </el-form-item>
+    <el-form-item label="创建时间" prop="gmtCreate">
+      <el-input v-model="dataForm.gmtCreate" placeholder="创建时间"></el-input>
+    </el-form-item>
+    <el-form-item label="最后修改时间" prop="gmtModified">
+      <el-input v-model="dataForm.gmtModified" placeholder="最后修改时间"></el-input>
+    </el-form-item>
+    <el-form-item label="月份" prop="monthTime">
+      <el-input v-model="dataForm.monthTime" placeholder="月份"></el-input>
+    </el-form-item>
+    <el-form-item label="0.新建，1 提交审批中，2 拒绝" prop="status">
+      <el-input v-model="dataForm.status" placeholder="0.新建，1 提交审批中，2 拒绝"></el-input>
+    </el-form-item>
+    <el-form-item label="最后得分" prop="lastScore">
+      <el-input v-model="dataForm.lastScore" placeholder="最后得分"></el-input>
+    </el-form-item>
+    <el-form-item label="总分" prop="allScore">
+      <el-input v-model="dataForm.allScore" placeholder="总分"></el-input>
+    </el-form-item>
+    <el-form-item label="备注" prop="remark">
+      <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+    </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          id: 0,
+          isDelete: '',
+          gmtCreate: '',
+          gmtModified: '',
+          monthTime: '',
+          status: '',
+          lastScore: '',
+          allScore: '',
+          remark: ''
+        },
+        dataRule: {
+          isDelete: [
+            { required: true, message: '是否删除状态，1：删除，0：有效不能为空', trigger: 'blur' }
+          ],
+          gmtCreate: [
+            { required: true, message: '创建时间不能为空', trigger: 'blur' }
+          ],
+          gmtModified: [
+            { required: true, message: '最后修改时间不能为空', trigger: 'blur' }
+          ],
+          monthTime: [
+            { required: true, message: '月份不能为空', trigger: 'blur' }
+          ],
+          status: [
+            { required: true, message: '0.新建，1 提交审批中，2 拒绝不能为空', trigger: 'blur' }
+          ],
+          lastScore: [
+            { required: true, message: '最后得分不能为空', trigger: 'blur' }
+          ],
+          allScore: [
+            { required: true, message: '总分不能为空', trigger: 'blur' }
+          ],
+          remark: [
+            { required: true, message: '备注不能为空', trigger: 'blur' }
+          ]
+        }
+      }
+    },
+    methods: {
+      init (id) {
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (this.dataForm.id) {
+            this.$http({
+              url: this.$http.adornUrl(`/user/lzresultrecord/info/${this.dataForm.id}`),
+              method: 'get',
+              params: this.$http.adornParams()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.isDelete = data.lzresultrecord.isDelete
+                this.dataForm.gmtCreate = data.lzresultrecord.gmtCreate
+                this.dataForm.gmtModified = data.lzresultrecord.gmtModified
+                this.dataForm.monthTime = data.lzresultrecord.monthTime
+                this.dataForm.status = data.lzresultrecord.status
+                this.dataForm.lastScore = data.lzresultrecord.lastScore
+                this.dataForm.allScore = data.lzresultrecord.allScore
+                this.dataForm.remark = data.lzresultrecord.remark
+              }
+            })
+          }
+        })
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl(`/user/lzresultrecord/${!this.dataForm.id ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData({
+                'id': this.dataForm.id || undefined,
+                'isDelete': this.dataForm.isDelete,
+                'gmtCreate': this.dataForm.gmtCreate,
+                'gmtModified': this.dataForm.gmtModified,
+                'monthTime': this.dataForm.monthTime,
+                'status': this.dataForm.status,
+                'lastScore': this.dataForm.lastScore,
+                'allScore': this.dataForm.allScore,
+                'remark': this.dataForm.remark
+              })
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/modules/result/record/lzresultrecord.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button v-if="isAuth('user:lzresultrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button v-if="isAuth('user:lzresultrecord:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="id"
+        header-align="center"
+        align="center"
+        label="">
+      </el-table-column>
+      <el-table-column
+        prop="isDelete"
+        header-align="center"
+        align="center"
+        label="是否删除状态，1：删除，0：有效">
+      </el-table-column>
+      <el-table-column
+        prop="gmtCreate"
+        header-align="center"
+        align="center"
+        label="创建时间">
+      </el-table-column>
+      <el-table-column
+        prop="gmtModified"
+        header-align="center"
+        align="center"
+        label="最后修改时间">
+      </el-table-column>
+      <el-table-column
+        prop="monthTime"
+        header-align="center"
+        align="center"
+        label="月份">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        header-align="center"
+        align="center"
+        label="0.新建，1 提交审批中，2 拒绝">
+      </el-table-column>
+      <el-table-column
+        prop="lastScore"
+        header-align="center"
+        align="center"
+        label="最后得分">
+      </el-table-column>
+      <el-table-column
+        prop="allScore"
+        header-align="center"
+        align="center"
+        label="总分">
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+  </div>
+</template>
+
+<script>
+  import AddOrUpdate from './lzresultrecord-add-or-update'
+  import { apiGetResultRecordList } from '@/api/api_result'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          key: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false
+      }
+    },
+    components: {
+      AddOrUpdate
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        apiGetResultRecordList({
+          'page': this.pageIndex,
+          'limit': this.pageSize
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(id)
+        })
+      },
+      // 删除
+      deleteHandle (id) {
+        var ids = id ? [id] : this.dataListSelections.map(item => {
+          return item.id
+        })
+        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/user/lzresultrecord/delete'),
+            method: 'post',
+            data: this.$http.adornData(ids, false)
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        })
+      }
+    }
+  }
+</script>