Merge branch 'dev-learning-report-0627' into 'release'

Dev learning report 0627



See merge request !72

src/views/learning/item-course-analysis.vue

@@ -142,7 +142,10 @@ export default {
     },
     search() {
       if (vm.formInline.region.length == 0) {
-        vm.$message("请选择地区");
+        const h = this.$createElement;
+        vm.$message({
+          message: h('p', { style: 'color: #FF3399' }, '请先选择地区后再进行查询 ')
+        });
         return;
       }
       let checkAll = operationData.hasAll(vm.formInline.organization)

src/views/learning/item-crowd-analysis.vue

@@ -93,7 +93,10 @@ export default {
   methods: {
     search() {
       if (vm.formInline.region.length == 0) {
-        vm.$message("请选择地区");
+        const h = this.$createElement;
+        vm.$message({
+          message: h('p', { style: 'color: #FF3399' }, '请先选择地区后再进行查询 ')
+        });
         return;
       }
       let checkAll = operationData.hasAll(vm.formInline.organization);
@@ -299,7 +302,7 @@ export default {
       }
       .sex {
         position: relative;
-        top: 0;
+        top: 42px;
         left: 0;
         .sex-item {
           float: left;
@@ -309,7 +312,9 @@ export default {
             margin: 0 auto;
             position: relative;
             left: 10%;
-            width: 80%;
+            // width: 80%;
+            width: 60%;
+            margin-left: 10%;
           }
           .sex-type {
             text-align: center;

src/views/learning/item-examination-analysis.vue

@@ -129,7 +129,10 @@ export default {
     // 搜索列表
     search() {
       if (vm.formInline.region.length == 0) {
-        vm.$message("请选择地区");
+        const h = this.$createElement;
+        vm.$message({
+          message: h('p', { style: 'color: #FF3399' }, '请先选择地区后再进行查询 ')
+        });
         return;
       }
       let checkAll = operationData.hasAll(vm.formInline.organization)

src/views/learning/item-list.vue

@@ -21,7 +21,7 @@
           <el-select
             size="small"
             v-model="formInline.organization"
-            placeholder="请选择机构"
+            :placeholder="organizationNotice"
             @change="changeOrganization"
             multiple
             collapse-tags
@@ -194,6 +194,7 @@ export default {
         pageNo: 1,
         pageSize: 20
       },
+      organizationNotice: '选择地区筛选到区才能选择机构',
       dialogData: {
         region: "",
         // regionData: "",
@@ -280,6 +281,9 @@ export default {
       // console.log('region',value,vm.formInline);
       if (value.length >= 3) {
         this.getOrganizationList();
+        this.organizationNotice = "请选择机构";
+      } else {
+        this.organizationNotice = "选择地区筛选到区才能选择机构";
       }
     },
     setMoreOption(data, type) {
@@ -472,7 +476,10 @@ export default {
     },
     exportExcel() {
       if (vm.formInline.region.length == 0) {
-        vm.$message("请选择地区");
+        const h = this.$createElement;
+        vm.$message({
+          message: h('p', { style: 'color: #FF3399' }, '请先选择地区后再进行导出 ')
+        });
         return;
       }
       //按钮置灰三秒
@@ -533,7 +540,10 @@ export default {
     },
     changeDate() {
       if (vm.formInline.region.length == 0) {
-        vm.$message("请选择地区");
+        const h = this.$createElement;
+        vm.$message({
+          message: h('p', { style: 'color: #FF3399' }, '请先选择地区后再进行修改 ')
+        });
         return;
       }
       this.setDialogData();

src/views/learning/item-part-in.vue

@@ -109,7 +109,10 @@ export default {
     
     search() {
       if (vm.formInline.region.length == 0) {
-        vm.$message("请选择地区");
+        const h = this.$createElement;
+        vm.$message({
+          message: h('p', { style: 'color: #FF3399' }, '请先选择地区后再进行查询 ')
+        });
         return;
       }
       let checkAll = operationData.hasAll(vm.formInline.organization)