修改

src/main/h5/src/components/rateInfo.vue

@@ -13,10 +13,10 @@
           >
             <div class="rate-text">
               <span class="name">{{ kIndex + 1 }}.{{ k.label }}</span>
-              <span class="val not" v-if="!getValue(k.value) && isPreview"
+              <!-- <span class="val not" v-if="!getValue(k.value) && isPreview"
                 >未评分</span
-              >
-              <span class="val" v-else>{{ getValue(k.value) }}分</span>
+              > -->
+              <span class="val">{{ getValue(k.value) }}分</span>
             </div>
 
             <div class="rate-img" v-if="getImg(k.value).length > 0">

src/main/h5/src/mixins/expert.js

@@ -11,35 +11,35 @@ export default {
               label: "考级组织",
               value: "examOrganization",
               sub: "有专门负责考级活动的部门和人员，考级工作方案内容详实细致。",
-              score: 3
+              score: [0, 1, 2, 3]
             },
             {
               label: "考点设置",
               value: "examSite",
               sub:
                 "考点选择、考点布局、功能分区、设备设施、临建设施等方面符合国家标准 要求，提供个性化服务。",
-              score: 4
+              score: [0, 1, 2, 3, 4]
             },
             {
               label: "考场设置",
               value: "examRoom",
               sub:
                 "考场设置体现服务优先、相对集中和环境整洁原则，考场设备、设施符合国 家标准要求。",
-              score: 4
+              score: [0, 1, 2, 3, 4]
             },
             {
               label: "环境要求",
               value: "environment",
               sub:
                 "考点和考场环境、基本设施、卫生清洁、标志标识符合国家标准要求。",
-              score: 4
+              score: [0, 1, 2, 3, 4]
             },
             {
               label: "安全保障",
               value: "safety",
               sub:
                 "有开展艺术考级活动的卫生和安全应急预案，安保资源配置、考点安全巡查、 考场人员管控、考试信息安全符合相关国家标准要求。",
-              score: 5
+              score: [0, 1, 2, 3, 4, 5]
             }
           ]
         },
@@ -53,55 +53,55 @@ export default {
               value: "promote",
               sub:
                 "有完备的考前宣传方案，考生和家长获取考级信息便捷准确，考前报备信息 及时准确。",
-              score: 2
+              score: [0, 1, 2]
             },
             {
               label: "考级报名",
               value: "signUp",
               sub:
                 "考试报名符合国家标准要求，有规范的报名表（准考证)、收据和考生统计表。",
-              score: 2
+              score: [0, 1, 2]
             },
             {
               label: "考试准备",
               value: "examPreparation",
               sub: "考试工作协调会、人员培训和考场布置符合国家标准要求。",
-              score: 3
+              score: [0, 1, 2, 3]
             },
             {
               label: "考场服务",
               value: "examService",
               sub:
                 "制订规范化、人性化考场服务方案；考试服务流程清晰，5见场服务设施完善，提供 考生引导服务，显著位置张贴考级机构《考级简章》、考级机构统一模板的考官和工作人员信息。每个考场、每个考官当日执考人数上限符合《实施细则》要求。",
-              score: 5
+              score: [0, 1, 2, 3, 4, 5]
             },
             {
               label: "考务考官",
               value: "examiner",
               sub:
                 "考务人员遵守各项规定，考官执考规范，着装整洁、执证上岗。考试期间和 考后试卷收回工作符合国家标准；考官管理及职责符合《实施细则》要求。",
-              score: 5
+              score: [0, 1, 2, 3, 4, 5]
             },
             {
               label: "考级规范",
               value: "specification",
               sub:
                 "在签约考级机构协议范围内以艺术考级机构名义组织艺术考级活动，使用规 范的考级教材，考级范围合规，考前备案与考试内容一致。",
-              score: 5
+              score: [0, 1, 2, 3, 4, 5]
             },
             {
               label: "视频器材",
               value: "video",
               sub:
                 "考点考场内安装监控设备，考级现场全程录像，音视频材料（含线上考级）完整保留不少于一年。",
-              score: 5
+              score: [0, 1, 2, 3, 4, 5]
             },
             {
               label: "考试成绩",
               value: "score",
               sub:
                 "成绩核实、公布及证书领取符合国家标准规定，提供细致周到服务。",
-              score: 3
+              score: [0, 1, 2, 3]
             }
           ]
         },
@@ -115,14 +115,14 @@ export default {
               value: "artTrain",
               sub:
                 "艺术培训组织能力强，专业水平高；配合艺术考级机构做好师资培训、考级 培训、学术研讨活动等，举办社会艺术考级普及教育公益活动。",
-              score: 4
+              score: [0, 1, 2, 3, 4]
             },
             {
               label: "艺术成果",
               value: "artResult",
               sub:
                 "定期举办艺术教育成果交流展示活动；积极组织参加各级管理部门和艺术考 级机构举办的艺术成果交流展示展演和各类社会公益活动；积极参与各级各类艺术教育成果比赛和展演，获得表彰和奖项。",
-              score: 6
+              score: [0, 1, 2, 3, 4, 5, 6]
             }
           ]
         }

src/main/h5/src/plugins/http.js

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

src/main/h5/src/views/expert/expertAdd.vue

@@ -34,7 +34,9 @@
             </div>
 
             <van-uploader
+              multiple
               :after-read="afterRead"
+              :file-list="fileList"
               :before-read="beforeRead"
               :before-delete="beforeDelete"
               v-model="submitList[score.value].imgs"
@@ -107,7 +109,6 @@
         :color="$colors.prim"
         block
         round
-        :disabled="!canSubmit"
         >提交</van-button
       >
     </div>
@@ -142,6 +143,7 @@ export default {
         img: [],
         imgs: []
       },
+      fileList: [],
       img: [],
       submitList: {},
       saving: false
@@ -208,7 +210,9 @@ export default {
       });
   },
   methods: {
-    afterRead(file, detail) {
+    afterRead(file, fileList, detail) {
+      console.log(file);
+      console.log(fileList);
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true
@@ -252,6 +256,7 @@ export default {
       }
     },
     beforeRead(file) {
+      console.log(file);
       return new Promise(resolve => {
         // compressorjs 默认开启 checkOrientation 选项
         // 会将图片修正为正确方向

src/main/vue/src/components/ArrangeLog.vue

@@ -53,15 +53,6 @@ export default {
             rules: {},
             arrid: '',
             timeRange: '',
-            optionProps: {
-                value: 'id',
-                label: 'name',
-                children: 'children',
-                multiple: true,
-                emitPath: false,
-                checkStrictly: true,
-                expandTrigger: 'hover'
-            },
             artTypes: []
         };
     },

src/main/vue/src/components/MultiUpload.vue

@@ -64,6 +64,8 @@ export default {
     },
     methods: {
         handleRemove(file, fileList) {
+            console.log(file);
+            console.log(fileList);
             this.realFileList = fileList;
             this.$emit(
                 'input',
@@ -71,12 +73,16 @@ export default {
             );
         },
         handlePictureCardPreview(file) {
+            console.log(file);
             this.previewUrl = file.value;
             this.previewList = this.fileList.map(i => i.value);
             console.log(this.$refs.preview.$el);
             this.$refs.preview.showViewer = true;
         },
         handleSuccess(res, file, fileList) {
+            console.log(file);
+            console.log(res);
+            console.log(fileList);
             if (res instanceof Array) {
                 file.value = res[0];
             } else {
@@ -89,6 +95,7 @@ export default {
             );
         },
         updateFileList(list) {
+            console.log(list);
             if (!list) {
                 list = [];
             } else if (typeof list == 'string') {

src/main/vue/src/components/OrganLog.vue

@@ -21,7 +21,7 @@
                     <div class="subform">
                         <div style="margin-bottom: 20px">
                             <el-select
-                                v-model="employeeId"
+                                v-model="userId"
                                 style="width: 82.5%; margin-right: 10px;"
                                 multiple
                                 filterable
@@ -34,17 +34,15 @@
                                     :value="item.value"
                                     :label="item.label"
                                 >
-                                    <!-- <span style="float: left">{{ item.nickname }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.phone }}</span> -->
                                 </el-option>
                             </el-select>
                             <el-button @click="chooseEmp">添加</el-button>
                         </div>
                         <el-table :data="emps">
-                            <el-table-column prop="nickname" label="用户名"></el-table-column>
+                            <el-table-column prop="nickname" label="姓名"></el-table-column>
                             <el-table-column prop="phone" label="手机号"></el-table-column>
                             <el-table-column prop="artType" label="专业"></el-table-column>
-                            <el-table-column label="操作" v-if="formData.status == 'ASSIGN_EXPERT'">
+                            <el-table-column label="操作">
                                 <template slot-scope="{ row }">
                                     <el-button @click="remove(row)" type="danger" size="mini" plain>移除</el-button>
                                 </template>
@@ -53,19 +51,9 @@
                     </div>
                 </el-form-item>
             </el-form>
-            <el-form-item class="btn">
-                <el-button @click="onSave" :loading="saving" type="primary" v-if="formData.status == 'ASSIGN_EXPERT'"
-                    >保存</el-button
-                >
-                <el-button
-                    type="danger"
-                    v-if="formData.status == 'REVIEW_PENDING'"
-                    @click="saveDismiss"
-                    :loading="loading"
-                >
-                    退回
-                </el-button>
-            </el-form-item>
+            <!-- <el-form-item> -->
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+            <!-- </el-form-item> -->
             <!-- <div class="btn">
                 <el-button @click="$router.go(-1)">返回</el-button>
             </div> -->
@@ -79,12 +67,11 @@ export default {
         return {
             saving: false,
             formData: {},
-            url: '/user/all1',
+            list: [],
             rules: {},
-            users: [],
             emps: [],
-            employeeId: '',
-            employeeIds: [],
+            userId: '',
+            userIds: [],
             dateRange: [],
             audits: [],
             grading: [],
@@ -100,29 +87,52 @@ export default {
         closeDialog() {
             this.$emit('close');
         },
+        remove(row) {
+            console.log(row);
+            // this.emps.splice(row, 1);
+            this.emps.pop(row);
+            this.userIds.pop(this.userId);
+            // this.userIds.pop(row.id);
+        },
+        onSave() {
+            console.log(this.userIds);
+        },
+        chooseEmp() {
+            if (this.userId.length > 0) {
+                this.userId.forEach(index => {
+                    console.log(index);
+                    if (this.userIds.indexOf(index) < 0) {
+                        this.emps.push(
+                            this.users.find(item => {
+                                return item.id === index;
+                            })
+                        );
+                        this.userIds.push(index);
+                        console.log(this.userIds);
+                    }
+                });
+                this.userId = '';
+            }
+        },
         init(row) {
             this.$http
-                .post('user/all1', { body: 'json' })
+                .post('/user/all1', { size: 0, query: {}, size: 20, sort: '' }, { body: 'json' })
                 .then(res => {
-                    console.log(res);
-                    // this.artTypes = this.delChild(res);
+                    this.users = res.content;
+                    res.content.forEach(item => {
+                        let nickname = item.nickname;
+                        if (nickname.length < 3) {
+                            nickname = nickname.slice(0, 1) + '　' + nickname.slice(1);
+                        }
+                        this.expert.push({
+                            label: nickname + '--' + item.phone + '--' + item.artType,
+                            value: item.id
+                        });
+                    });
                 })
                 .catch(e => {
                     console.log(e);
                 });
-            let keys = [...this.columnKeys].slice(0, 3).map(item => {
-                return row[item];
-            });
-            let info = this.getInfo(this.showTable, keys);
-            let aid = info.list.map(item => {
-                return item.id;
-            });
-            this.$router.push({
-                path: '/arrangeAssignExpert',
-                query: {
-                    aid: aid.join(',')
-                }
-            });
         }
     }
 };

src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -378,10 +378,12 @@ export default {
             // let keys = [...this.columnKeys].slice(0, 3).map(item => {
             //     return row[item];
             // });
+            // console.log(keys);
             // let info = this.getInfo(this.showTable, keys);
             // let aid = info.list.map(item => {
             //     return item.id;
             // });
+            // console.log(aid);
             // this.$router.push({
             //     path: '/arrangeAssignExpert',
             //     query: {