承办单位等

src/main/java/com/izouma/wenlvju/domain/GradingOrganization.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.domain;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,4 +22,20 @@ public class GradingOrganization extends BaseEntity {
 
     private String name;
 
+    private String introduction;
+
+    private String province;
+
+    private String city;
+
+    private String district;
+
+    private String street;
+
+    private String address;
+
+    @ApiModelProperty(value = "联系人")
+    private String contact;
+
+    private String contactPhone;
 }

src/main/vue/package-lock.json

@@ -2004,6 +2004,16 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
@@ -2030,6 +2040,27 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -2039,6 +2070,25 @@
             "ms": "2.1.2"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2061,6 +2111,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
@@ -2077,6 +2137,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.2.0",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
+          "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -3525,6 +3597,11 @@
         }
       }
     },
+    "claygl": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
+      "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
+    },
     "clean-css": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -4979,6 +5056,31 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.1.tgz",
+      "integrity": "sha512-b3nP8M9XwZM2jISuA+fP0EuJv8lcfgWrinel185Npy8bE/UhXTDIPJcqgQOCWdvk0c5CeT6Dsm1xBjmJXAGlxQ==",
+      "requires": {
+        "tslib": "2.0.3",
+        "zrender": "5.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+        }
+      }
+    },
+    "echarts-gl": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.4.tgz",
+      "integrity": "sha512-QTMFOFE7N1wxjRIiwjq4m1gFa5KBZT9V0MKkT8gJyTj/kzyCCReRW8n6hjG7+QtfZ5DtPao98vPIFDFWEMlRGA==",
+      "requires": {
+        "claygl": "^1.2.1",
+        "zrender": "^5.0.3"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -12002,80 +12104,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.2.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
-      "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
@@ -13040,6 +13068,21 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.0.tgz",
+      "integrity": "sha512-c+8VRx52ycbmqwHeHLlo/BAfIHBl/JZNLM6cfDQFgzIH05yb+f5J9F/fbRsP+zGc8dW9XHuhdt8/iqukgMZSeg==",
+      "requires": {
+        "tslib": "2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+        }
+      }
     }
   }
 }

src/main/vue/src/views/GradingOrganizationEdit.vue

@@ -4,16 +4,41 @@
             :model="formData"
             :rules="rules"
             ref="form"
-            label-width="52px"
+            label-width="80px"
             label-position="right"
             size="small"
-            style="max-width: 500px;"
+            style="max-width: 640px;"
         >
+            <!-- <el-form-item prop="code" label="代码">
+                <el-input v-model="formData.code"></el-input>
+            </el-form-item> -->
             <el-form-item prop="name" label="名称">
                 <el-input v-model="formData.name"></el-input>
             </el-form-item>
-            <el-form-item prop="code" label="代码">
-                <el-input v-model="formData.code"></el-input>
+            <el-form-item prop="introduction" label="简介">
+                <el-input
+                    type="textarea"
+                    :autosize="{ minRows: 6, maxRows: 8 }"
+                    v-model="formData.introduction"
+                ></el-input>
+            </el-form-item>
+            <el-form-item prop="code" label="地址">
+                <!-- <el-input v-model="formData.province" style="margin-right: 10px; width:180px"></el-input>
+                <el-input v-model="formData.code" style="margin-right: 10px; width:180px"></el-input>
+                <el-input v-model="formData.code" style="width:180px"></el-input> -->
+                <district-choose style="width:560px" v-model="district"></district-choose>
+                <el-input
+                    type="textarea"
+                    :autosize="{ minRows: 2, maxRows: 3 }"
+                    v-model="formData.address"
+                    style="margin-top: 10px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item prop="contact" label="联系人">
+                <el-input v-model="formData.contact"></el-input>
+            </el-form-item>
+            <el-form-item prop="contactPhone" label="联系方式">
+                <el-input v-model="formData.contactPhone"></el-input>
             </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
@@ -32,6 +57,10 @@ export default {
                 .get('gradingOrganization/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
+                    this.district.push(res.province);
+                    this.district.push(res.city);
+                    this.district.push(res.district);
+                    this.district.push(res.street);
                 })
                 .catch(e => {
                     console.log(e);
@@ -43,7 +72,8 @@ export default {
         return {
             saving: false,
             formData: {},
-            rules: {}
+            rules: {},
+            district: []
         };
     },
     methods: {
@@ -58,7 +88,10 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
-
+            data.province = this.district[0];
+            data.city = this.district[1];
+            data.district = this.district[2];
+            data.street = this.district[3];
             this.saving = true;
             this.$http
                 .post('/gradingOrganization/save', data, { body: 'json' })

src/main/vue/src/views/GradingOrganizationList.vue

@@ -25,9 +25,13 @@
             :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="name" label="名称"> </el-table-column>
-            <el-table-column prop="code" label="代码"> </el-table-column>
+            <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
+            <el-table-column prop="code" label="编号" min-width="60"> </el-table-column>
+            <el-table-column prop="name" label="名称" min-width="150"> </el-table-column>
+            <el-table-column prop="province" label="所属省份" min-width="100"> </el-table-column>
+            <el-table-column prop="introduction" label="简介" min-width="200" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="contact" label="联系人"> </el-table-column>
+            <el-table-column prop="contactPhone" 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>

src/main/vue/src/views/RegulatoryList.vue

@@ -159,7 +159,7 @@
             append-to-body
             :visible.sync="showViedo"
             @close="closeEvent"
-            width="80%"
+            width="70%"
         >
             <video
                 :src="videoUrl"
@@ -175,7 +175,9 @@
             >
                 您的浏览器不支持 video 标签。
             </video>
-
+            <div style="text-align: center; margin: 5px auto 0 auto">
+                <el-button type="mini" icon="el-icon-caret-right">录制</el-button>
+            </div>
             <div class="close" @click="showViedo = false">关闭</div>
         </el-dialog>
     </div>

src/main/vue/src/views/Video.vue

@@ -43,11 +43,11 @@ export default {
     data() {
         return {
             layout: [
-                { x: 0, y: 0, w: 4, h: 17, i: '0', name: 'Video3' },
-                { x: 0, y: 0, w: 4, h: 16, i: '0', name: 'Video1' },
-                { x: 4, y: 4, w: 4, h: 16, i: '3', name: 'Video4' },
-                { x: 8, y: 4, w: 3, h: 23.5, i: '1', name: 'Video2' },
-                { x: 4, y: 12.5, w: 4, h: 17, i: '4', name: 'Video5' }
+                { x: 0, y: 0, w: 4, h: 17.5, i: '0', name: 'Video3' },
+                { x: 0, y: 0, w: 4, h: 16.5, i: '2', name: 'Video1' },
+                { x: 4, y: 4, w: 4, h: 16.5, i: '3', name: 'Video4' },
+                { x: 8, y: 4, w: 3, h: 24, i: '1', name: 'Video2' },
+                { x: 4, y: 12.5, w: 4, h: 17.5, i: '4', name: 'Video5' }
                 // { x: 0, y: 12.5, w: 4, h: 12.5, i: '5', name: 'Video4' }
                 // { x: 8, y: 0, w: 4, h: 13.5, i: '6', name: 'Video3' }
             ],
@@ -61,6 +61,8 @@ export default {
         }
     },
     components: {
+        GridLayout,
+        GridItem,
         Video1,
         Video2,
         Video3,

src/main/vue/src/views/rate/RateList.vue

@@ -12,6 +12,7 @@
                 :disabled="totalElements <= 0"
                 >导出EXCEL
             </el-button>
+            <el-select class="filter-item" placeholder="请选择考级机构"> </el-select>
             <el-input
                 placeholder="输入承办单位名称"
                 v-model="search"
@@ -52,6 +53,62 @@
                 ></el-option>
             </el-select>
             <!-- <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button> -->
+            <!-- <div>
+                <span class="span-width">
+                    <span class="span-size">承办单位名称</span>
+                    <el-input placeholder="输入承办单位名称" v-model="search" clearable class="filter-item"></el-input>
+                </span>
+                <span class="span-width">
+                    <span class="span-size">考级机构名称</span>
+                    <el-input placeholder="输入考级机构名称" v-model="agency" clearable class="filter-item"></el-input>
+                </span>
+                <span class="span-width2">
+                    <label class="span-size">申请时间</label>
+                    <el-date-picker
+                        v-model="dateRange"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        start-placeholder="请选择开始时间"
+                        end-placeholder="请选择结束时间"
+                        range-separator="至"
+                        class="filter-item"
+                    >
+                    </el-date-picker>
+                </span>
+            </div>
+            <div style="padding-left: 70px">
+                <label class="span-size">地址</label>
+                <district-choose style="width: 202px"></district-choose>
+                <span class="span-width" style="padding-left: 10px">
+                    <label class="span-size">状态</label>
+                    <el-select
+                        class="filter-item"
+                        v-model="status"
+                        clearable
+                        placeholder="请选择状态"
+                        style="width: 200px"
+                    >
+                        <el-option
+                            v-for="item in statusOptions"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </span>
+            </div>
+            <div style="padding-left: 20px">
+                <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
+                <el-button
+                    @click="download"
+                    type="primary"
+                    icon="el-icon-download"
+                    :loading="downloading"
+                    class="filter-item"
+                    :disabled="totalElements <= 0"
+                    >导出EXCEL
+                </el-button>
+            </div> -->
         </div>
         <el-table
             :data="tableData"
@@ -69,6 +126,9 @@
             <el-table-column prop="createdAt" label="申请时间" min-width="100"></el-table-column>
             <el-table-column prop="year" label="年度" min-width="60"> </el-table-column>
             <el-table-column prop="gradingOrganization" label="考级机构" min-width="100"> </el-table-column>
+            <el-table-column prop="district" label="地址" min-width="100">
+                <template slot-scope="{ row }"> 江苏省{{ row.district }} </template>
+            </el-table-column>
             <el-table-column prop="status1" label="状态" min-width="100"> </el-table-column>
             <el-table-column prop="score" label="分数">
                 <template slot-scope="{ row }">
@@ -88,7 +148,7 @@
                     <span v-else><el-link :underline="false" type="info">暂无</el-link></span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="right" fixed="right" min-width="200">
+            <el-table-column label="操作" align="right" fixed="right" min-width="100">
                 <template slot-scope="{ row }">
                     <!-- <el-button
                         v-if="row.status === 'FIRST_REVIEW_PENDING'"
@@ -563,4 +623,21 @@ export default {
 .el-link {
     font-size: 12px;
 }
+.span-size {
+    font-size: 14px;
+    color: #565b66;
+    line-height: 15px;
+    padding: 0 10px 0 10px;
+}
+.span-width {
+    width: 330px;
+    display: inline-block;
+    text-align: right;
+}
+.span-width2 {
+    width: 500px;
+    // float: left;
+    text-align: right;
+    display: inline-block;
+}
 </style>

src/main/vue/src/views/record/RecordList.vue

@@ -85,9 +85,9 @@
             </div>
             <div style="padding-left: 20px">
                 <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="update" type="primary" class="filter-item">一键更新 </el-button>
-                <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button>
+                <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">上传 </el-button>
+                <!-- <el-button @click="update" type="primary" class="filter-item">一键更新 </el-button> -->
+                <!-- <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button> -->
                 <el-button
                     @click="download"
                     type="primary"

src/main/vue/src/views/user/UserList.vue

@@ -25,7 +25,7 @@
         >
             <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="username" label="用户名" min-width="100"> </el-table-column>
+            <el-table-column prop="username" label="账号" min-width="100"> </el-table-column>
             <el-table-column prop="nickname" label="昵称" min-width="100"> </el-table-column>
             <!-- <el-table-column label="头像" min-width="100">
                 <template slot-scope="{ row }">