.

src/components/ECharts/Apache.vue

@@ -17,6 +17,7 @@ export default {
       type: Array,
       default: () => ([])
     },
+    type: String,
     loading: Boolean
   },
   computed: {
@@ -40,7 +41,7 @@ export default {
         ],
         series: [
           {
-            name: '人数',
+            name: this.type,
             type: 'bar',
             data: this.value[1]
           }

src/views/dashboard/index.vue

@@ -10,26 +10,25 @@
     <el-row class="sec" type="flex" justify="space-between" :gutter="20">
       <el-col :span="12">
         <el-card style="height:496px">
-          <div slot="header">
+          <div slot="header" class="clearfix">
             <span>各学期总人数柱状图</span>
           </div>
-          <apache-chart :value="termData" />
+          <apache-chart type="人数" :value="termData" />
         </el-card>
       </el-col>
       <el-col :span="12">
         <el-card style="height:496px">
-          <div slot="header">
+          <div slot="header" class="clearfix">
             <span>班级人数列表</span>
+            <el-select v-model="termId" style="float: right; padding: 3px 0" size="medium" filterable placeholder="请选择" @change="changeTerm">
+              <el-option
+                v-for="item in options"
+                :key="item.termId"
+                :label="item.name"
+                :value="item.termId"
+              />
+            </el-select>
           </div>
-          学期名称：
-          <el-select v-model="termId" filterable placeholder="请选择" @change="changeTerm">
-            <el-option
-              v-for="item in options"
-              :key="item.termId"
-              :label="item.name"
-              :value="item.termId"
-            />
-          </el-select>
           <el-table stripe :data="tableData" border style="width: 100%; margin-top:16px">
             <el-table-column prop="key" label="班级" />
             <el-table-column prop="value" label="人数" />
@@ -51,12 +50,9 @@
     <el-row class="sec" type="flex" justify="space-between" :gutter="20">
       <el-col :span="12">
         <el-card style="height:496px">
-          <div slot="header">
+          <div slot="header" class="clearfix">
             <span>年龄分布图</span>
-          </div>
-          <div style="display: inline-block;">
-            学期名称：
-            <el-select v-model="termId2" filterable placeholder="请选择" @change="changeTermAge">
+            <el-select v-model="termId2" style="float: right; padding: 3px 0" size="medium" filterable placeholder="请选择" @change="changeTermAge">
               <el-option
                 v-for="item in options"
                 :key="item.termId"
@@ -70,14 +66,14 @@
       </el-col>
       <el-col :span="12">
         <el-card style="height:496px">
-          <div slot="header">
+          <div slot="header" class="clearfix">
             <span>{{ radio }}签到率折线图</span>
+            <el-radio-group v-model="radio" style="float: right; padding: 3px 0" @change="handleChangeDate">
+              <el-radio-button label="每日" />
+              <el-radio-button label="每周" />
+              <el-radio-button label="每月" />
+            </el-radio-group>
           </div>
-          <el-radio-group v-model="radio" style="margin-right:32px" @change="handleChangeDate">
-            <el-radio-button label="每日" />
-            <el-radio-button label="每周" />
-            <el-radio-button label="每月" />
-          </el-radio-group>
           <line-chart :value="lineData" />
         </el-card>
       </el-col>
@@ -85,10 +81,10 @@
     <el-row class="sec" type="flex" justify="space-between" :gutter="20">
       <el-col :span="24">
         <el-card style="height:496px">
-          <div slot="header">
+          <div slot="header" class="clearfix">
             <span>各培训签到率柱状图</span>
           </div>
-          <apache-chart :value="signData" />
+          <apache-chart type="签到率" :value="signData" />
         </el-card>
       </el-col>
     </el-row>
@@ -267,7 +263,7 @@ export default {
       const arr2 = []
       res.data.map(item => {
         arr1.push(item.key)
-        arr2.push(item.value)
+        arr2.push(item.value / 100)
       })
       this.signData.push(arr1)
       this.signData.push(arr2)
@@ -343,4 +339,15 @@ export default {
 .sec {
   margin: 24px 0;
 }
+.clearfix {
+  line-height: 46px;
+}
+.clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
 </style>

src/views/photoWall/index.vue

@@ -14,44 +14,45 @@
               <div v-for="item in images" :key="item.attchId" style="display:inline-block;position:relative;margin:16px">
                 <el-card :body-style="{ padding: '0px', height:'100%' }" style="width:320px; height:280px;text-align:center;border:0">
                   <el-image fit="cover" :preview-src-list="[item.url]" :src="item.url" style="height: calc(100% - 40px); display:block" />
-                  <div style="width:100%;height:40px"><div class="imgbtn"><i class="el-icon-more" /></div><div class="imgbtn" style="color:red" @click="deletePhoto(item)"><i class="el-icon-delete" />删除</div></div>
+                  <div style="width:100%;height:40px"><div class="imgbtn"><i class="el-icon-more" /></div><div class="imgbtn" style="color:red;font-size:14px" @click="deletePhoto(item)"><i class="el-icon-delete" style="margin-right:6px" />删除</div></div>
                 </el-card>
               </div>
             </div>
           </el-col>
           <el-col :span="6">
-            <el-collapse v-model="activeNames" accordion>
-              <el-collapse-item title="照片墙分组" name="1">
-                <el-tag
-                  v-for="tag in dynamicTags"
-                  :key="tag"
-                  closable
-                  style="margin-bottom:8px"
-                  :type="currentPack===tag?'':'info' "
-                  :disable-transitions="false"
-                  @close="handleClose(tag)"
-                  @click="handleCurrent(tag)"
-                >
-                  {{ tag }}
-                </el-tag>
-                <el-input
-                  v-if="inputVisible"
-                  ref="saveTagInput"
-                  v-model="inputValue"
-                  class="input-new-tag"
-                  size="small"
-                  style="width:200px"
-                  @keyup.enter.native="handleInputConfirm"
-                  @blur="handleInputConfirm"
-                />
-                <el-button
-                  v-else
-                  class="button-new-tag"
-                  size="small"
-                  @click="showInput"
-                >新建照片墙分组</el-button>
-              </el-collapse-item>
-            </el-collapse>
+            <el-card style="border: 0;box-shadow: none;">
+              <div slot="header">
+                <span>照片墙分组</span>
+              </div>
+              <el-tag
+                v-for="tag in dynamicTags"
+                :key="tag"
+                closable
+                style="margin-bottom:8px"
+                :type="currentPack===tag?'':'info' "
+                :disable-transitions="false"
+                @close="handleClose(tag)"
+                @click="handleCurrent(tag)"
+              >
+                {{ tag }}
+              </el-tag>
+              <el-input
+                v-if="inputVisible"
+                ref="saveTagInput"
+                v-model="inputValue"
+                class="input-new-tag"
+                size="small"
+                style="width:200px"
+                @keyup.enter.native="handleInputConfirm"
+                @blur="handleInputConfirm"
+              />
+              <el-button
+                v-else
+                class="button-new-tag"
+                size="small"
+                @click="showInput"
+              >新建照片墙分组</el-button>
+            </el-card>
           </el-col>
         </el-row>
       </div>