v

src/assets/styles/global.css

@@ -723,6 +723,8 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 .el-menu-item.is-active {
   color: #fff !important;
   background-image: url('../images/左侧导航栏选中.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
 }
 
 .el-scrollbar li {
@@ -1001,4 +1003,14 @@ margin-right: 34px;
   /* 浮层底线 */
   .el-table__fixed::before, .el-table__fixed-right::before {
    background-color: transparent !important;
+  }
+
+  #app .sidebar-container{
+    width: 265px !important;
+    padding:0 !important;
+    text-overflow:no !important;
+  }
+  
+  #app .main-container{
+    margin-left: 265px !important;
   }

src/views/peopleManage/people/index.vue

@@ -520,7 +520,7 @@
               @click="handleExport"
               v-hasPermi="['peopleManage:people:export']"
             >导出</el-button>
-          </el-col> -->
+          </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -533,7 +533,13 @@
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" type="index" />
           <!-- <el-table-column label="备用手机号" align="center" prop="id" /> -->
-           <el-table-column label="单位"  align="center" prop="deptId" width="180" :formatter="deptIdformatter" />
+          <el-table-column
+            label="单位"
+            align="center"
+            prop="deptId"
+            width="180"
+            :formatter="deptIdformatter"
+          />
           <el-table-column label="姓名" align="center" prop="name" />
           <el-table-column label="性别" align="center" prop="sex">
             <template slot-scope="scope">
@@ -548,7 +554,7 @@
             </template>
           </el-table-column>
           <el-table-column label="命令号" align="center" prop="command" />-->
-          <el-table-column label="部职别"  align="center" prop="duty" />
+          <el-table-column label="部职别" align="center" prop="duty" />
           <el-table-column label="职务" align="center" prop="postId">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.post_Level" :value="scope.row.postId" />
@@ -584,7 +590,7 @@
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_user_rank" :value="scope.row.rankId" />
             </template>
-          </el-table-column> -->
+          </el-table-column>-->
           <!-- <el-table-column label="军衔时间" align="center" prop="rankDate" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.rankDate, '{y}-{m}-{d}') }}</span>
@@ -601,7 +607,7 @@
             <template slot-scope="scope">
               <dict-tag :options="dict.type.Degree_level" :value="scope.row.educationId" />
             </template>
-          </el-table-column> -->
+          </el-table-column>-->
           <!-- <el-table-column label="学位" align="center" prop="degreeId">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.degree" :value="scope.row.degreeId" />
@@ -613,7 +619,7 @@
             </template>
           </el-table-column>-->
           <!-- <el-table-column label="毕业院校" align="center" prop="school" width="120" /> -->
-           <el-table-column label="在位情况" align="center" prop="reign" width="90">
+          <el-table-column label="在位情况" align="center" prop="reign" width="90">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.people_state" :value="scope.row.reign" />
             </template>
@@ -705,12 +711,7 @@
           </el-table-column>
           <el-table-column label="部门名称" align="center" prop="deptName" />
           <el-table-column label="备用手机号" align="center" prop="phoneStandby" />-->
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            fixed="right"
-          >
+          <el-table-column label="操作" align="center" width="160" fixed="right">
             <template slot-scope="scope">
               <el-button
                 size="btu"
@@ -742,7 +743,10 @@
     <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
         <div class="jiben">基本信息</div>
-        <div class="div-box-title1"><span>个人信息</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <div class="div-box-title1">
+          <span>个人信息</span>
+          <img src="@/assets/images/虚线.png" alt />
+        </div>
         <div style="width:100%;display:flex;flex-direction: row;">
           <div>
             <el-row>
@@ -804,7 +808,7 @@
           </div>
           <div style="margin-left:50px;display:flex;">
             <div class="pictureUploading-img">
-                <img src="@/assets/images/提示.png" alt="">
+              <img src="@/assets/images/提示.png" alt />
             </div>
             <el-form-item prop="pictureUploading" class="personphoto">
               <imageUpload :limit="1" v-model="form.avatar" style="height:200px;" />
@@ -861,7 +865,10 @@
             <el-input v-model="form.payrollCardNo" placeholder />
           </el-form-item>
         </el-row>
-        <div class="div-box-title1"><span>婚姻信息</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <div class="div-box-title1">
+          <span>婚姻信息</span>
+          <img src="@/assets/images/虚线.png" alt />
+        </div>
         <el-row>
           <el-form-item label="婚姻情况" prop="marryList">
             <el-select v-model="form.marryList" clearable placeholder>
@@ -884,7 +891,10 @@
             </el-select>
           </el-form-item>
         </el-row>
-        <div class="div-box-title1"><span>学历教育</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <div class="div-box-title1">
+          <span>学历教育</span>
+          <img src="@/assets/images/虚线.png" alt />
+        </div>
         <el-form-item label="学历" prop="educationId">
           <el-select v-model="form.educationId" clearable placeholder>
             <el-option
@@ -931,7 +941,10 @@
         <el-form-item label="毕业学校" prop="school">
           <el-input v-model="form.school" placeholder />
         </el-form-item>
-        <div class="div-box-title1"><span>联系方式</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <div class="div-box-title1">
+          <span>联系方式</span>
+          <img src="@/assets/images/虚线.png" alt />
+        </div>
         <el-form-item label="手机型号" prop="mobilePhoneModel">
           <el-input v-model="form.mobilePhoneModel" placeholder />
         </el-form-item>
@@ -1077,7 +1090,10 @@
             placeholder
           ></el-date-picker>
         </el-form-item>
-        <div class="jiben">家庭信息<span @click="tiaddfun">+</span></div>
+        <div class="jiben">
+          家庭信息
+          <span @click="tiaddfun">+</span>
+        </div>
         <el-row
           style="background-color: rgba(255, 255, 255, 0.10980392156862745);padding-top:20px;margin-top:10px;margin-bottom:20px;"
           v-for="(item, index) in jtlist"
@@ -1378,7 +1394,7 @@ export default {
         label: "label"
       },
       deptOptions: [],
-      value:null,
+      value: null
     };
   },
   created() {
@@ -1449,7 +1465,7 @@ export default {
     });
   },
   methods: {
-     //单位翻译
+    //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
       this.unitId.map(item => {
@@ -1540,7 +1556,7 @@ export default {
         rankUpgradeTime: null,
         phoneStandby: null,
         deptName: null,
-        isBianzhi:null,
+        isBianzhi: null
       };
       this.bdglPeopleList = [];
       this.resetForm("form");
@@ -1786,8 +1802,8 @@ export default {
   height: 36px;
 }
 
-.pictureUploading-img img{
-  width:60px;
+.pictureUploading-img img {
+  width: 60px;
   height: 210px;
   margin-right: 10px;
 }
@@ -1796,11 +1812,11 @@ export default {
   height: 210px;
   width: 170px;
   line-height: 210px;
-  background-image: url('../../../assets/images/头像.png');
+  background-image: url("../../../assets/images/头像.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
-::v-deep .el-upload--picture-card .el-icon-plus{
+::v-deep .el-upload--picture-card .el-icon-plus {
   display: none;
 }
 .el-upload--picture-card /deep/ .el-upload--picture-card i {
@@ -1824,7 +1840,7 @@ export default {
   cursor: pointer;
   /* margin-left: 851px; */
   position: absolute;
-  right:20px;
+  right: 20px;
 }
 .el-select-dropdown__item:hover {
   color: #1c86e1;
@@ -1839,18 +1855,21 @@ export default {
 ::v-deep .el-tree-node__content:hover {
   color: #fff;
   background-color: #003156;
-  background-image: url('../../../assets/images/选中.png');
+  background-image: url("../../../assets/images/选中.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
   color: #fff !important;
   background-color: #003156;
-  background-image: url('../../../assets/images/选中.png');
+  background-image: url("../../../assets/images/选中.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-::v-deep .el-tree-node__label{
+::v-deep .el-tree-node__label {
   color: #fff !important;
 }
 ::v-deep .el-upload-list--picture-card .el-upload-list__item {
@@ -1861,7 +1880,7 @@ export default {
   height: 40px;
   background: #003156;
   /* border-bottom: 1px solid #718A9D ; */
-  background-image: url('../../../assets/images/矩形 1386 拷贝.png');
+  background-image: url("../../../assets/images/矩形 1386 拷贝.png");
   background-repeat: no-repeat;
   background-position: 0px 39px;
   font-size: 16px;
@@ -1892,47 +1911,51 @@ export default {
   top: -5px;
   left: 15px;
 }
-.data .a1{
+.data .a1 {
   width: 128px;
   height: 26px;
   background: rgba(23, 74, 112, 0.4);
   border-radius: 13px;
   position: absolute;
-  top:7px;
+  top: 7px;
   left: 60px;
 }
-::v-deep .data .el-date-editor.el-input{
+::v-deep .data .el-date-editor.el-input {
   width: 100%;
   border: none;
 }
-::v-deep .data .el-input__inner{
-   width: 100% !important;
-   border: none;
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none;
 }
 ::v-deep .data .el-input--medium .el-input__icon {
-    line-height: 36px;
-    position: absolute;
-    right: -223px;
-    top: 2px;
+  line-height: 36px;
+  position: absolute;
+  right: -223px;
+  top: 2px;
 }
 ::v-deep .data .el-input__inner {
-    background-color: transparent;
-    color: #fff;
-    text-align: center;
-    margin-top: 2px;
+  background-color: transparent;
+  color: #fff;
+  text-align: center;
+  margin-top: 2px;
 }
 ::v-deep .data .el-input__suffix {
-    position: absolute;
-    right: 281px;
+  position: absolute;
+  right: 281px;
 }
-::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
-    color: #00365f !important; 
-    /* background-color: #003156 !important; */
-  }
-  ::v-deep .tree .el-tree{
-    height: 81vh;
-  }
-  ::v-deep .el-tree-node__content{
-      height: 32px;
-  }
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  color: #00365f !important;
+  /* background-color: #003156 !important; */
+}
+::v-deep .tree .el-tree {
+  height: 81vh;
+}
+::v-deep .el-tree-node__content {
+  height: 32px;
+}
+
 </style>

src/views/taishi/index.vue

@@ -839,9 +839,9 @@ export default {
         { name: "通信值班员", value: "" },
         { name: "机要值班员", value: "" },
         { name: "政治工作部值班员", value: "" },
-        { name: "政治工作部值班员", value: "" },
-        { name: "政治工作部值班员", value: "" },
-        { name: "政治工作部值班员", value: "" }
+        { name: "保障部值班员", value: "" },
+        { name: "值班通信员", value: "" },
+        { name: "值班分队", value: "" }
       ]
     };
   },
@@ -876,12 +876,12 @@ export default {
             });
           } else if (i == "guaranteeName") {
             this.jrzblist.push({
-              name: "政治工作部值班员",
+              name: "保障部值班员",
               value: res.data[i]
             });
           } else if (i == "messengerName") {
             this.jrzblist.push({
-              name: "政治工作部值班员",
+              name: "值班通信员",
               value: res.data[i]
             });
           } else if (i == "detachmentName") {
@@ -1113,6 +1113,7 @@ export default {
       var data1 = [];
       var data = [];
       var data2 = [];
+      console.log(this.wclist);
       for (var i in this.wclist) {
         data.push(i);
         for (var e in this.wclist[i][0]) {
@@ -1123,7 +1124,12 @@ export default {
           }
         }
       }
-
+      var n = 0;
+      data1.map(item => {
+        n += item;
+      });
+      // data1=[50,10,60,90,10];
+      // console.log(n)
       const path = "path://M1390,595h79l-39,22Z";
       const myColor = ["#fff", "#fff", "#fff", "#fff", "#fff"];
       const option12 = {
@@ -1157,9 +1163,12 @@ export default {
           axisTick: {
             show: false
           },
-          data: ["休假", "请假", "学习", "出差", "特殊类型"]
+          data: data
         },
         yAxis: {
+          max: n,
+          min: 0,
+
           axisLine: {
             lineStyle: {
               color: "#6e6e6e",
@@ -1168,7 +1177,7 @@ export default {
           },
           axisLabel: {
             interval: 0,
-            formatter: "{value}%",
+            formatter: "{value}",
             textStyle: {
               fontSize: 12,
               color: "#fff"
@@ -1179,6 +1188,7 @@ export default {
             show: true
           },
           axisTick: {
+            show: true,
             lineStyle: {
               color: "#fff",
               width: 1,
@@ -1189,10 +1199,12 @@ export default {
         series: [
           {
             type: "bar",
-            barWidth: 60,
+            barWidth: 10,
             barGap: "-100%",
             stack: "广告",
+            fontSize: 12,
             itemStyle: {
+              fontSize: 12,
               color: function(params) {
                 const colorList = [
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
@@ -1303,7 +1315,7 @@ export default {
               color: "#e2e2e2",
               opacity: 0
             },
-            data: data2
+            data: data1
           },
           {
             name: "",
@@ -1410,7 +1422,7 @@ export default {
                 return colorList[params.dataIndex];
               }
             },
-            data: [1, 1, 1, 1, 1]
+            data: data1
           },
           {
             name: "",
@@ -1663,7 +1675,7 @@ export default {
 
 <style scoped>
 .out {
-  background-image: url("../../assets/images/tsbj.png");
+  background-image: url("../../assets/images/taishibg.png");
   background-size: 100% 100%;
   height: 100%;
   width: 100%;