update

package-lock.json

@@ -2306,9 +2306,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.6.1",
-      "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.6.1.tgz",
-      "integrity": "sha1-htt5/13psbzDGHtls3crDFQHRxg=",
+      "version": "2.10.0",
+      "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.10.0.tgz",
+      "integrity": "sha1-5hKfa21v/g260SWkqNF9RHpfY5w=",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -2777,8 +2777,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",

package.json

@@ -20,18 +20,18 @@
     "axios": "0.16.2",
     "better-scroll": "^0.1.15",
     "echarts": "^4.2.0-rc.2",
-    "element-ui": "2.6.1",
+    "element-ui": "^2.10.0",
     "fastclick": "^1.0.6",
     "iscroll": "^5.2.0",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
+    "node-sass": "^4.9.2",
     "qrcode": "^1.3.3",
     "showdown": "^1.6.4",
     "vue": "^2.1.0",
     "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^2.1.1",
-    "vuex": "^2.0.0",
-    "node-sass": "^4.9.2"
+    "vuex": "^2.0.0"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",

src/utils/filter.js

@@ -171,6 +171,19 @@ const vueFilter = {
         return '已结束'
     }
   },
-
+  partJoin: (value) => {
+    if(value == 1) {
+        return '是'
+    }else  {
+        return '否'
+    }
+  },
+  partFinish: (value) => {
+    if(value == 1) {
+        return '是'
+    }else  {
+        return '否'
+    }
+  },
 }
 export default vueFilter
\ No newline at end of file

src/views/learning/item-list.vue

@@ -2,8 +2,7 @@
   <div class="course-analysis-wrap">
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
-
-      <el-form ref="formInline" :model="formInline" label-width="80px">
+      <el-form ref="formInline" :model="formInline" label-width="80px" style="width:50%">
         <el-form-item label="选择地区：">
           <el-cascader
               size="small"
@@ -23,6 +22,7 @@
             @change="changeOrganization"
             multiple
             collapse-tags
+            :disabled="formInline.region.length !== 3"
             style="width:330px"
           >
             <el-option
@@ -33,18 +33,24 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <div class="choose">{{ chooseOrganization }}</div>
-        <el-tag
-          v-for="tag in tags"
-          :key="tag.name"
-          closable>
-          {{ tag }}
-        </el-tag>
+        <div class="tag-group" >
+          <el-tag
+            v-for="tag in tags"
+            :key="tag.value"
+            type="info"
+            closable
+            @close="handleTagClose(tag)">
+            {{ tag.label }}
+          </el-tag>
+        </div>
         <el-form-item label="">
           <el-checkbox size="small" v-model="formInline.checked">查看原始数据</el-checkbox>
         </el-form-item>
       </el-form>
-      <!-- <div class="choose">{{ chooseOrganization }}</div> -->
+      <div class="form-button">
+        <el-button @click="search()" type="primary">查询</el-button>
+        <el-button @click="resetForm()">重置</el-button>
+      </div>
       <div class="button-group">
         <el-button type="default" size="small" @click="exportExcel">导出Excel</el-button>
         <el-button type="default" size="small" @click="changeDate" v-if="activeName=='first'">数据调整</el-button>
@@ -53,7 +59,7 @@
       </div>
       <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="参与情况" name="first">
-              <part-in></part-in>
+              <part-in ref="childPart" :formInline="formInline" :activeName="activeName" :organizationNum="organizationNum"></part-in>
             </el-tab-pane>
             <el-tab-pane label="人群分析" name="second">
               <crowd-analysis ref="childCrowd" :formInline="formInline" :activeName="activeName">
@@ -108,14 +114,17 @@ export default {
         },
         {
           label: "西湖区第二人民医院",
-          value: 1,
+          value: 66,
         },
         {
           label: "杭州市中医院",
-          value: 2,
+          value: 233,
+        },
+        {
+          label: "仁济医院",
+          value: 999,
         }
       ],
-      chooseOrganization: "",
       optionsRegion: [],
       formInline: {
         region: [],
@@ -123,10 +132,11 @@ export default {
         organization: [],
         checked: false,
         pageNo: 1,
-        pageSize: 10
+        pageSize: 10,
       },
       tags: [],
       activeName: "first",
+      organizationNum: 0,
     };
   },
   computed: {
@@ -151,37 +161,102 @@ export default {
       }
     },
     handleChange(value) {
-      console.log(value);
+      // console.log(value);
+      this.formInline.organization = [];
+      this.tags = [];
     },
     changeOrganization(value) {
-      console.log(value);
-      this.chooseOrganization = "";
+      // console.log('formInline',this.formInline.organization);
       this.tags = [];
+      //选了全部的情况下
+      for (let a = 0; a < this.formInline.organization.length; a++) {
+        if(this.formInline.organization[a] == 0) {//选了全部
+          let tagItem = {
+            label: '全部',
+            value: 0,
+          }
+          this.tags.push(tagItem);
+          return;
+        }
+      }
+      //没选全部
       for (let i = 0; i < this.organizationList.length; i++) {
         for(let j=0; j<value.length;j++) {
           if (value[j] == this.organizationList[i].value) {
-            console.log('value[j]',j,value[j],this.organizationList[i].label )
-            this.chooseOrganization += this.organizationList[i].label + '   ';
-            this.tags.push(this.organizationList[i].label);
+            // console.log('value[j]',j,value[j],this.organizationList[i].label )
+            let tagItem = {
+              label: this.organizationList[i].label,
+              value: this.organizationList[i].value,
+            };
+            this.tags.push(tagItem);
           }
         }
       }
     },
+    handleTagClose(tag) {
+      // console.log(tag);
+      //选了全部的情况下
+      if(this.tags.length > 0 && this.tags[0].value == 0) {
+        this.tags.splice(0, 1);
+        this.formInline.organization = [];
+        return;
+      }
+      //没全部的情况下
+      for(let i=0;i<this.tags.length;i++) {
+        if(tag.value == this.tags[i].value) {
+          this.tags.splice(i, 1);
+          this.formInline.organization.splice(this.formInline.organization.indexOf(tag.value), 1);
+          break;
+        }
+      }
+    },
     getRegionOption() {
       this.optionsRegion = operationData.getRegionOption();
     },
+    getOrganizationNum() {
+      //选择全部
+      let num = 0;
+      if(this.tags[0].value == 0) {
+        num = this.organizationList.length - 1;
+        return num;
+      }
+      //没有选择全部
+      num = this.tags.length;
+      return num;
+    },
     search() {
-      //console.log(this.formInline,this.activeName);
+      // console.log(this.formInline,this.activeName);
       if (this.activeName == "first") {
+        this.organizationNum = this.getOrganizationNum();
+        // console.log('this.organizationNum',this.organizationNum)
+        this.$nextTick(function() {
+          this.$refs.childPart.$emit("search");
+        })
       } else if (this.activeName == "second") {
         this.$refs.childCrowd.$emit("search");
       } else if (this.activeName == "third") {
         this.$refs.childCourse.$emit("search");
       } else if (this.activeName == "fourth") {
+
       } else if (this.activeName == "fifth") {
+
       }
     },
-    reset() {},
+    //重置
+    resetForm() {
+      vm.formInline = Object.assign(
+        {},
+        {
+          region: [],
+          date: "",
+          organization: [],
+          checked: false,
+          pageNo: 1,
+          pageSize: 10,
+        }
+      );
+      vm.tags = [];
+    },
     exportExcel() {
       console.log('excel');
     },
@@ -204,6 +279,12 @@ export default {
       color: #449284;
       border-bottom: 1px solid #efefef;
     }
+    .form-button {
+      width: 45%;
+      top: -120px;
+      position: relative;
+      left: 50%;
+    }
     .button-group {
       // position: absolute;
       // right: 100px;
@@ -218,7 +299,13 @@ export default {
       color: #409eff;
     }
     .el-tabs__header {
-      width: 81%;
+      width: 65%;
+    }
+    .tag-group  {
+      margin-left: 78px;
+      .el-tag {
+        margin-right: 20px;
+      }
     }
   }
 }

src/views/learning/report-list.vue

@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="200">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="go(scope.row)">查看学情报告</el-button>
+            <el-button style="color:#509284" type="text" size="small" @click="go(scope.row)">查看学情报告</el-button>
           </template>
         </el-table-column>
         <div slot="empty">