demo修改bug

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

@@ -24,10 +24,10 @@ import java.util.List;
 @ApiModel(value = "等级评定")
 public class Rate extends BaseEntity {
     @ApiModelProperty(value = "是否承办考级活动")
-    private Boolean undertakeExamination;
+    private boolean undertakeExamination;
 
     @Convert(converter = StringArrayConverter.class)
-    @ApiModelProperty(value = "承办过的考级机构名称")
+    @ApiModelProperty(value = "承办过的考级活动名称")
     private List<String> examination;
 
 //    @ApiModelProperty(value = "简介")

src/main/vue/src/plugins/http.js

@@ -6,7 +6,7 @@ let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
         baseUrl = 'http://localhost:8080';
-        // baseUrl = 'http://192.168.50.127:8080';
+        // baseUrl = 'http://wlj.izouma.com';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/main/vue/src/views/RateEdit.vue

@@ -23,38 +23,66 @@
             </el-form-item> -->
             <el-form-item label="是否承办过">
                 <el-radio-group v-model="formData.undertakeExamination" size="small">
-                    <el-radio-button label="true">承办过</el-radio-button>
-                    <el-radio-button label="false">未承办过</el-radio-button>
+                    <el-radio :label="true">承办过</el-radio>
+                    <el-radio :label="false">未承办过</el-radio>
                 </el-radio-group>
             </el-form-item>
+            <el-form-item label="考级活动名称" v-if="formData.undertakeExamination">
+                <el-tag
+                    :key="tag"
+                    v-for="tag in formData.examination"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose(tag)"
+                    size="medium"
+                    class="el-tag-height"
+                >
+                    {{ tag }}
+                </el-tag>
+                <div>
+                    <el-input
+                        class="input-new-tag"
+                        v-if="inputVisible"
+                        v-model="inputValue"
+                        ref="saveTagInput"
+                        size="small"
+                        @blur="handleInputConfirm"
+                    >
+                    </el-input>
+                    <el-button v-else class="button-new-tag" size="small" @click="showInput"
+                        >添加考级活动名称</el-button
+                    >
+                </div>
+            </el-form-item>
             <el-form-item prop="privacyPolicy" label="法人资格">
                 <!-- <el-upload class="upload-demo" action="../upload/file" :on-change="handleChange" :file-list="fileList3">
                     <el-button size="small" type="primary">
                         点击上传
                     </el-button>
                 </el-upload> -->
-                <file-upload v-model="formData.privacyPolicy"></file-upload>
+                <!-- <file-upload v-model="formData.privacyPolicy"></file-upload> -->
             </el-form-item>
             <el-form-item prop="business" label="业务内容">
-                <file-upload v-model="formData.business"></file-upload>
+                <!-- <file-upload v-model="formData.business"></file-upload> -->
+                <el-input></el-input>
             </el-form-item>
             <el-form-item prop="credits" label="社会信誉">
-                <file-upload v-model="formData.credits"></file-upload>
+                <!-- <file-upload v-model="formData.credits"></file-upload> -->
             </el-form-item>
             <el-form-item prop="fire" label="消防卫生">
-                <file-upload v-model="formData.fire"></file-upload>
+                <!-- <file-upload v-model="formData.fire"></file-upload> -->
             </el-form-item>
             <el-form-item prop="finance" label="财务报表">
-                <file-upload v-model="formData.finance"></file-upload>
+                <!-- <file-upload v-model="formData.finance"></file-upload> -->
             </el-form-item>
             <el-form-item prop="property" label="房产证明">
-                <file-upload v-model="formData.property"></file-upload>
+                <!-- <file-upload v-model="formData.property"></file-upload> -->
             </el-form-item>
             <el-form-item>
-                <el-button @click="onSave('SUBMIT_PENDING')" :loading="saving" type="primary">保存申请信息</el-button>
                 <el-button @click="onSave('FIRST_REVIEW_PENDING')" :loading="saving" type="success"
                     >提交申请信息</el-button
                 >
+                <el-button @click="onSave('SUBMIT_PENDING')" :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>
@@ -81,14 +109,19 @@ export default {
     data() {
         return {
             saving: false,
-            formData: {},
+            formData: {
+                examination: []
+            },
             rules: {},
             statusOptions: [
                 { label: '待提交', value: 'SUBMIT_PENDING' },
                 { label: '初审中', value: 'FIRST_REVIEW_PENDING' },
                 { label: '初审通过', value: 'FIRST_REVIEW_PASS' },
                 { label: '专家通过', value: 'EXPERT_PASS' }
-            ]
+            ],
+            inputVisible: false,
+            // dynamicTags: [],
+            inputValue: ''
         };
     },
     computed: {
@@ -111,7 +144,6 @@ export default {
             data.status = status;
             console.log(status);
             data.organizationId = Number(this.$route.query.organId);
-
             this.saving = true;
             this.$http
                 .post('/rate/save', data, { body: 'json' })
@@ -141,8 +173,47 @@ export default {
                         this.$message.error((e || {}).error || '删除失败');
                     }
                 });
+        },
+        handleClose(tag) {
+            this.formData.examination.splice(this.formData.examination.indexOf(tag), 1);
+        },
+        showInput() {
+            this.inputVisible = true;
+            this.$nextTick(_ => {
+                this.$refs.saveTagInput.$refs.input.focus();
+            });
+        },
+        handleInputConfirm() {
+            let inputValue = this.inputValue;
+            if (inputValue) {
+                this.formData.examination.push(inputValue);
+            }
+            this.inputVisible = false;
+            this.inputValue = '';
         }
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.el-tag + .el-tag {
+    margin-left: 10px;
+    // margin-bottom: 10px;
+}
+.el-tag-height {
+    line-height: 30px;
+    height: 32px !important;
+    margin-bottom: 10px;
+}
+.button-new-tag {
+    // margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+}
+.input-new-tag {
+    width: 200px;
+    // margin-left: 10px;
+    vertical-align: bottom;
+}
+</style>

src/main/vue/src/widgets/LineChartWidget.vue

@@ -27,7 +27,7 @@ export default {
         this.myChart = new Chart(this.$refs.chart.getContext('2d'), {
             type: 'line',
             data: {
-                labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
+                labels: ['1月', '2月', '3月', '4月', '5月', '6月', '7月'],
                 datasets: [
                     {
                         label: '报考人数',