Merge branch 'yl' of yinet2020/YinetOASystemWeb into master

src/components/Hamburger/index.vue

@@ -8,7 +8,7 @@
       width="64"
       height="64"
     >
-      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
+      <path fill="#fff" d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
     </svg>
   </div>
 </template>

src/views/dashboard/BarChart.vue

@@ -1,9 +1,9 @@
 <template>
   <el-card class="box-card">
-
     <el-row slot="header" class="clearfix">
+      <img src="../../assets/image/sq.png" style="display: block;float: left;margin: 1px 5px 0 0;" height="15" width="17"/>
       <span>公示公告</span>
-      <el-button style="float: right; padding: 5px 0;color: black;" type="text" @click="more">更   多</el-button>
+      <el-button style="float: right; padding: 5px 0;color: black;" type="text" @click="more">更多</el-button>
     </el-row>
     <el-table v-loading="loading" :data="mesList" size="small" :show-header="showHeader">
       <el-table-column label="标题"style="color:#1890ff"  prop="tatle" align="left"  :show-header="showHeader">
@@ -13,7 +13,7 @@
       </el-table-column>
       <el-table-column label="发布日期" align="right"prop="updateTime" :show-header="showHeader" >
       <template slot-scope="scope">
-        <el-button type="text" @click="handleUpdate(scope.row)" style="color: black">{{parseTime(scope.row.updateTime,'{y}-{m}-{d}')}}</el-button>
+        <el-button type="text" @click="handleUpdate(scope.row)" style="color: #606266">{{parseTime(scope.row.updateTime,'{y}-{m}-{d}')}}</el-button>
       </template>
       </el-table-column>
     </el-table>
@@ -155,7 +155,7 @@
 <style lang="less" scoped>
   .box-card{
     margin-left: 16px;
-    height: 400px;
+    height: 407px;
   }
   .el-table{
     color:#1890ff;

src/views/dashboard/PanelGroup.vue

@@ -141,11 +141,9 @@ export default {
     }
 
     .card-panel-description {
-      float: left;
+      /*float: left;*/
       font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-      margin-left:40px;
+      margin: 26px 26px 26px 115px;
 
       .card-panel-text {
         line-height: 18px;

src/views/dashboard/PieChart.vue

@@ -1,8 +1,9 @@
 <template>
   <el-card class="box-card">
     <div slot="header" class="clearfix">
+      <img src="../../assets/image/sq.png" style="display: block;float: left;margin: 1px 5px 0 0;" height="15" width="17"/>
       <span>我的通知</span>
-      <el-button style="float: right; padding: 3px 0;color: #202020;" type="text" @click="more">更多</el-button>
+      <el-button style="float: right; padding: 3px 0;color: #000000;" type="text" @click="more">更多</el-button>
     </div>
     <el-table v-loading="loading" :data="infoList" size="small" :show-header="showHeader">
       <el-table-column label="标题"style="color:#1890ff"  prop="tatle" align="left"  :show-header="showHeader">
@@ -10,9 +11,9 @@
           <el-button type="text" @click="handleUpdate(scope.row)"  style="color: black">{{scope.row.title}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="发布日期" align="right"prop="updateTime" :show-header="showHeader" >
+      <el-table-column label="发布日期" align="right" prop="updateTime" :show-header="showHeader" >
         <template slot-scope="scope">
-          <el-button type="text"  style="color: black">{{parseTime(scope.row.sendtime,'{y}-{m}-{d}')}}</el-button>
+          <el-button type="text"  style="color: #606266">{{parseTime(scope.row.sendtime,'{y}-{m}-{d}')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/dashboard/RaddarChart.vue

@@ -1,10 +1,11 @@
 <template>
   <el-card class="box-card" style="margin-left: 0px">
     <div slot="header" class="clearfix">
+      <img src="../../assets/image/sq.png" style="display: block;float: left;margin: 1px 5px 0 0;" height="15" width="17"/>
       <span>已办工作</span>
-      <el-button style="float: right; padding: 3px 0;color: #202020;" type="text" @click="more">更多</el-button>
+      <el-button style="float: right; padding: 3px 0;color: #000000;" type="text" @click="more">更多</el-button>
     </div>
-  <el-table class="body" :data="doneList" :header-cell-style="{background:'#eee',width:'100%'}">
+  <el-table  class="body" :data="doneList" :header-cell-style="{}">
 <!--        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>-->
         <el-table-column prop="fwtitle" label="标题"  align="left">
           <template slot-scope="scope">

src/views/index.vue

@@ -89,7 +89,7 @@ export default {
   .chart-wrapper {
     /*background: #fff;*/
     /*padding: 16px 16px 0;*/
-    margin-bottom: 12px;
+    margin-bottom: 15px;
   }
 }
 

src/views/system/user/index.vue

@@ -123,12 +123,12 @@
           </el-col>
           <el-col :span="1.5">
             <el-button
-              type="warning"
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
+            type="warning"
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:user:export']"
+          >导出</el-button>
           </el-col>
         </el-row>
 
@@ -208,7 +208,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :disable-branch-nodes="true"
+                :show-count="true"
+                placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
           <el-col :span="12">