浏览代码

修改T本

sunyanqiang 2 年之前
父节点
当前提交
6967560835
共有 26 个文件被更改,包括 912 次插入174 次删除
  1. 2 3
      src/api/grassrootsregistration/bdglarmament.js
  2. 2 3
      src/api/grassrootsregistration/bdgldrill.js
  3. 2 3
      src/api/grassrootsregistration/bdglequip.js
  4. 2 2
      src/api/grassrootsregistration/bdgleven.js
  5. 2 3
      src/api/grassrootsregistration/bdglfilemanagement.js
  6. 3 3
      src/api/grassrootsregistration/bdglmeeting.js
  7. 2 2
      src/api/grassrootsregistration/bdglparty.js
  8. 2 3
      src/api/grassrootsregistration/bdglpublicproperty.js
  9. 2 3
      src/api/grassrootsregistration/bdglsecrecy.js
  10. 2 2
      src/api/grassrootsregistration/bdglsoldier.js
  11. 6 2
      src/views/combatduty/militarydutyinfo/index.vue
  12. 1 0
      src/views/grassrootsregistration/bdglarmament/index.vue
  13. 62 4
      src/views/grassrootsregistration/bdglarmaments/index.vue
  14. 14 2
      src/views/grassrootsregistration/bdgldiary/index.vue
  15. 62 4
      src/views/grassrootsregistration/bdgldrills/index.vue
  16. 64 4
      src/views/grassrootsregistration/bdglequips/index.vue
  17. 131 34
      src/views/grassrootsregistration/bdglevens/index.vue
  18. 63 4
      src/views/grassrootsregistration/bdglfilemanagements/index.vue
  19. 68 9
      src/views/grassrootsregistration/bdglmeetings/index.vue
  20. 137 35
      src/views/grassrootsregistration/bdglpartys/index.vue
  21. 63 4
      src/views/grassrootsregistration/bdglpublicpropertys/index.vue
  22. 62 4
      src/views/grassrootsregistration/bdglsecrecys/index.vue
  23. 148 31
      src/views/grassrootsregistration/bdglsoldiers/index.vue
  24. 1 1
      src/views/login.vue
  25. 0 1
      src/views/militaryvehicleManagement/thebus/index.vue
  26. 9 8
      src/views/pt.vue

+ 2 - 3
src/api/grassrootsregistration/bdglarmament.js

@@ -61,10 +61,9 @@ export function exportBdglarmament(query) {
 }
 
 // 领导列表
-export function armamentList(query) {
+export function armamentList(year) {
   return request({
-    url: '/grassrootsregistration/bdglarmament/armamentList',
+    url: `/grassrootsregistration/bdglarmament/armamentList?year=${year}`,
     method: 'get',
-    params: query
   })
 }

+ 2 - 3
src/api/grassrootsregistration/bdgldrill.js

@@ -91,10 +91,9 @@ export function treeselects(id) {
 }
 
 // 领导列表查看
-export function drillList(query) {
+export function drillList(year) {
   return request({
-    url: `/grassrootsregistration/bdgldrill/drillList`,
+    url: `/grassrootsregistration/bdgldrill/drillList?year=${year}`,
     method: 'get',
-    params: query
   })
 }

+ 2 - 3
src/api/grassrootsregistration/bdglequip.js

@@ -77,10 +77,9 @@ export function getList(query) {
 }
 
 // 查看领导列表
-export function equipList(query) {
+export function equipList(year) {
   return request({
-    url: '/grassrootsregistration/bdglequip/equipList',
+    url: `/grassrootsregistration/bdglequip/equipList?year=${year}`,
     method: 'get',
-    params: query
   })
 }

+ 2 - 2
src/api/grassrootsregistration/bdgleven.js

@@ -72,9 +72,9 @@ export function getDept(query) {
   }
 
     // 领导本
-    export function getMeetRecordList() {
+    export function getMeetRecordList(year) {
       return request({
-       url: '/grassrootsregistration/bdgleven/getMeetRecordList',
+       url: `/grassrootsregistration/bdgleven/getMeetRecordList?year=${year}`,
        method: 'get',
       })
      }

+ 2 - 3
src/api/grassrootsregistration/bdglfilemanagement.js

@@ -61,10 +61,9 @@ export function exportBdglfilemanagement(query) {
 }
 
 // 列表
-export function docList(query) {
+export function docList(year) {
   return request({
-    url: '/grassrootsregistration/bdglfilemanagement/docList',
+    url: `/grassrootsregistration/bdglfilemanagement/docList?year=${year}`,
     method: 'get',
-    params: query
   })
 }

+ 3 - 3
src/api/grassrootsregistration/bdglmeeting.js

@@ -207,10 +207,10 @@ export function getRenYuanXiangQing(query) {
   })
 }
 
-// 查看人员名册列表
-export function getMeetingList(query) {
+// 领导本列表
+export function getMeetingList(year) {
   return request({
-    url: '/grassrootsregistration/bdglmeeting/getMeetingList',
+    url: `/grassrootsregistration/bdglmeeting/getMeetingList?year=${year}`,
     method: 'get',
   })
 }

+ 2 - 2
src/api/grassrootsregistration/bdglparty.js

@@ -69,9 +69,9 @@ export function getZhuChiRen(data) {
 }
 
 //领导查看
-export function getPartyList() {
+export function getPartyList(year) {
   return request({
-    url: '/grassrootsregistration/bdglparty/getPartyList',
+    url: `/grassrootsregistration/bdglparty/getPartyList?year=${year}`,
     method: 'get',
   })
 }

+ 2 - 3
src/api/grassrootsregistration/bdglpublicproperty.js

@@ -61,10 +61,9 @@ export function exportBdglpublicproperty(query) {
 }
 
 // 领导列表
-export function propertyList(query) {
+export function propertyList(year) {
   return request({
-    url: '/grassrootsregistration/bdglpublicproperty/propertyList',
+    url: `/grassrootsregistration/bdglpublicproperty/propertyList?year=${year}`,
     method: 'get',
-    params: query
   })
 }

+ 2 - 3
src/api/grassrootsregistration/bdglsecrecy.js

@@ -60,10 +60,9 @@ export function exportBdglsecrecy(query) {
 }
 
 // 领导列表
-export function getSecrecyStats(query) {
+export function getSecrecyStats(year) {
   return request({
-    url: '/grassrootsregistration/bdglsecrecy/getSecrecyStats',
+    url: `/grassrootsregistration/bdglsecrecy/getSecrecyStats?year=${year}`,
     method: 'get',
-    params: query
   })
 }

+ 2 - 2
src/api/grassrootsregistration/bdglsoldier.js

@@ -53,9 +53,9 @@ export function exportBdglsoldier(query) {
 }
 
 // 领导查询军人委员会会议登记本
-export function getSoldierList() {
+export function getSoldierList(year) {
   return request({
-    url: '/grassrootsregistration/bdglsoldier/getSoldierList',
+    url: `/grassrootsregistration/bdglsoldier/getSoldierList?year=${year}`,
     method: 'get',
   })
 }

+ 6 - 2
src/views/combatduty/militarydutyinfo/index.vue

@@ -196,7 +196,7 @@
           <el-input v-model="form.carType" placeholder="" />
         </el-form-item>
         <el-form-item label="车辆状态" prop="carStates">
-          <el-select v-model="form.carStates" placeholder="">
+          <el-select v-model="form.carStates" placeholder="" :disabled="chuFn">
             <el-option v-for="dict in dict.type.military" :key="dict.value" :label="dict.label" :value="dict.value">
             </el-option>
           </el-select>
@@ -316,7 +316,8 @@ export default {
       busDuoList: [],
       // 所有车辆
       suoYouBus: [],
-      buses: []
+      buses: [],
+      chuFn:false
     };
   },
   created() {
@@ -443,12 +444,15 @@ export default {
     this.open = true;
     this.title = "添加军车值班";
     this.qdflg = 1;
+    this.chuFn=true;
+    this.form.carStates='1';
     this.busDuoList = [];
   },
   /** 修改按钮操作 */
   handleUpdate(row) {
     this.reset();
     this.getthebusfun();
+    this.chuFn=true;
     const id = row.id || this.ids;
     getMilitarydutyinfo(id).then((response) => {
       this.baoCun = false;

+ 1 - 0
src/views/grassrootsregistration/bdglarmament/index.vue

@@ -410,6 +410,7 @@ export default {
           { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
         name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        recordDate:[{ required: true, message: "登记时间不能为空", trigger: "blur" }]
       },
       //下拉
       options: [],

+ 62 - 4
src/views/grassrootsregistration/bdglarmaments/index.vue

@@ -1,6 +1,28 @@
 <!-- 军械装备登记本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+    :model="form"
+    ref="form"
+    :inline="true"
+    label-width="68px"
+    style="padding-left: 30px"
+  >
+    <el-form-item prop="year">
+      <el-date-picker
+        v-model="form.year"
+        type="year"
+        placeholder="选择年"
+        @change="getSoulist"
+        value-format="yyyy"
+        :editable="false"
+      >
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button size="btr" @click="resetQuery">重置</el-button>
+    </el-form-item>
+  </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -39,16 +61,36 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
+      form:{},
+      year:null
     };
   },
 
   created() {
-    armamentList().then((res) => {
-      // console.log(res);
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      armamentList(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        armamentList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       const unitId = row;
       armamentunits(unitId).then((response) => {
@@ -110,4 +152,20 @@ li {
 .btn {
   text-align: center;
 }
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 14 - 2
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -247,7 +247,7 @@
                 class="text"
                 @change="blogDate"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                disabled
+                :disabled="!statustimer"
               >
               </el-date-picker>
             </el-form-item>
@@ -875,7 +875,8 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getUserzs } from "@/api/grassrootsregistration/bdgldiary";
 // 获取当前单位
 import { getUserProfile } from "@/api/system/user";
-import id from "../../../../public/assets/libs/moment/dist/locale/id";
+// 获取时间状态
+import {listDiary} from "@/api/system/diary"
 export default {
   components: { Treeselect, bdgldiary },
   name: "Bdgldiary",
@@ -1080,6 +1081,7 @@ export default {
       sz: null,
       dw: {},
       formes: {},
+      statustimer:false
     };
   },
   created() {
@@ -1102,6 +1104,14 @@ export default {
     this.getUser();
   },
   methods: {
+    // 动态判断时间的修改
+    gettimer(){
+      listDiary().then(res=>{
+        if(res.rows[0].setnum==1){
+          this.statustimer=true
+        }
+      })
+    },
     // 获取登录信息
     getUser() {
       getUserProfile().then((response) => {
@@ -1350,6 +1360,7 @@ export default {
       this.getShiLiRen(this.form.deptId);
       this.getRenYuan(this.form.unitId);
       this.getShou(this.form.unitId);
+      this.getTimes();
       // 判断是否全部选择
       if (this.form.unitId !== null && this.form.blogDate) {
         this.XunLian(this.form.unitId, this.form.blogDate);
@@ -1509,6 +1520,7 @@ export default {
       this.renYuan = [];
       this.getTreeselect();
       this.reset();
+      this.gettimer();
       this.form.unitId = this.dw.deptId;
       this.getShiLiRen(this.form.deptId);
       this.getRenYuan(this.form.unitId);

+ 62 - 4
src/views/grassrootsregistration/bdgldrills/index.vue

@@ -1,6 +1,28 @@
 <!-- 文件管理登记本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -39,16 +61,36 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
+      form: {},
+      year: null,
     };
   },
 
   created() {
-    drillList().then((res) => {
-      // console.log(res);
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      drillList(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        drillList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       const unitId = row;
       getInfoByUnitId(unitId).then((response) => {
@@ -110,4 +152,20 @@ li {
 .btn {
   text-align: center;
 }
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 64 - 4
src/views/grassrootsregistration/bdglequips/index.vue

@@ -1,6 +1,28 @@
 <!-- 训练登记本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -38,16 +60,36 @@ export default {
       menuRoleVisible: false,
       wordInfo: [],
       title: null,
+      form:{},
+      year:null
     };
   },
 
   created() {
-    equipList().then((res) => {
-      // console.log(res);
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      equipList(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        equipList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       const unitId = row;
       equipuntits(unitId).then((response) => {
@@ -110,4 +152,22 @@ li {
 .btn {
   text-align: center;
 }
+
+
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 131 - 34
src/views/grassrootsregistration/bdglevens/index.vue

@@ -1,6 +1,28 @@
 <!-- 文连务会记录本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+    :model="form"
+    ref="form"
+    :inline="true"
+    label-width="68px"
+    style="padding-left: 30px"
+  >
+    <el-form-item prop="year">
+      <el-date-picker
+        v-model="form.year"
+        type="year"
+        placeholder="选择年"
+        @change="getSoulist"
+        value-format="yyyy"
+        :editable="false"
+      >
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button size="btr" @click="resetQuery">重置</el-button>
+    </el-form-item>
+  </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -11,13 +33,25 @@
     </ul>
 
     <!-- 查看第一次 -->
-    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
-      custom-class="lieBiao">
-      <el-table v-loading="loading" :data="bdglevenList" :header-cell-style="{ background: '#003C69', color: 'white' }">
+    <el-dialog
+      :visible.sync="tableStatus"
+      :title="title"
+      append-to-body
+      id="list"
+      :close-on-click-modal="false"
+      custom-class="lieBiao"
+    >
+      <el-table
+        v-loading="loading"
+        :data="bdglevenList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }"
+      >
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
             }}</span>
           </template>
         </el-table-column>
@@ -28,24 +62,50 @@
           </template>
         </el-table-column>
         <el-table-column label="主持人" align="center" prop="compereRen" />
-        <el-table-column label="出席人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column
+          label="出席人"
+          align="center"
+          prop="joinId"
+          show-overflow-tooltip
+        />
         <el-table-column label="召开地点" align="center" prop="address" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
-            <el-button size="btk" type="text" @click="handleChakan(scope.row)"><span class="chakan">查看</span>
+            <el-button size="btk" type="text" @click="handleChakan(scope.row)"
+              ><span class="chakan">查看</span>
             </el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-dialog>
 
     <!-- 查看第二次 -->
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
-      :before-close="closes">
-      <bdgleven v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdgleven>
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <bdgleven
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdgleven>
     </el-dialog>
   </div>
 </template>
@@ -73,32 +133,46 @@ export default {
       bdglevenList: [],
       loading: false,
       total: 0,
-      unitId: undefined
+      unitId: undefined,
+      form:{},
+      year:null
     };
   },
 
   created() {
-    getMeetRecordList().then((res) => {
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
-    getList() {
-      this.queryParams.unitId = this.unitId;
-      getMeetRecordOnUnitList(this.queryParams).then((response) => {
-        this.bdglpartyList = response.rows;
-        this.total = response.total;
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      getMeetRecordList(this.year).then((res) => {
+        this.lieList = res.rows;
       });
     },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        getMeetRecordList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       this.queryParams.unitId = row;
       this.unitId = row;
-      getMeetRecordOnUnitList(this.queryParams).then(res => {
-        this.bdglevenList = res.rows
-        this.total = res.total
-        this.title = "查看连务会记录本"
+      getMeetRecordOnUnitList(this.queryParams).then((res) => {
+        this.bdglevenList = res.rows;
+        this.total = res.total;
+        this.title = "查看连务会记录本";
         this.tableStatus = true;
-      })
+      });
     },
     handleChakan(row) {
       this.tableStatus = false;
@@ -122,7 +196,7 @@ export default {
     closes() {
       this.menuRoleVisible = false;
       this.tableStatus = true;
-    }
+    },
   },
   components: {
     bdgleven,
@@ -130,7 +204,7 @@ export default {
 
   computed: {},
 
-  mounted() { },
+  mounted() {},
   watch: {},
 };
 </script>
@@ -184,7 +258,6 @@ li {
   text-align: center;
 }
 
-
 ::v-deep .lieBiao {
   background: #004d86 !important;
   min-height: 42vh !important;
@@ -210,23 +283,47 @@ li {
 }
 
 ::v-deep .el-pagination .el-select .el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination__editor.el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {
-  background: #00365F;
+  background: #00365f;
+}
+
+::v-deep .el-table__body tr:hover > td {
+  background-color: #3c749d !important;
+}
+::v-deep .el-table tr:nth-child(even) {
+  background: #00365f;
+}
+
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
 }
 </style>

+ 63 - 4
src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -1,6 +1,28 @@
 <!-- 文件管理登记本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -39,16 +61,36 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
+      form: {},
+      year: null,
     };
   },
 
   created() {
-    docList().then((res) => {
-      // console.log(res);
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      docList(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        docList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       const unitId = row;
       fileunits(unitId).then((response) => {
@@ -110,4 +152,21 @@ li {
 .btn {
   text-align: center;
 }
+
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 68 - 9
src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -1,6 +1,28 @@
 <!-- 查看团支部记录本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+    :model="form"
+    ref="form"
+    :inline="true"
+    label-width="68px"
+    style="padding-left: 30px"
+  >
+    <el-form-item prop="year">
+      <el-date-picker
+        v-model="form.year"
+        type="year"
+        placeholder="选择年"
+        @change="getSoulist"
+        value-format="yyyy"
+        :editable="false"
+      >
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button size="btr" @click="resetQuery">重置</el-button>
+    </el-form-item>
+  </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -83,23 +105,37 @@ export default {
       bdglpartyList: [],
       loading: false,
       total: 0,
-      unitId: undefined
+      unitId: undefined,
+      form:{},
+      year:null
     };
   },
 
   created() {
-    getMeetingList().then((res) => {
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
-    getList() {
-      this.queryParams.unitId = this.unitId;
-      getMeetingOnUnitList(this.queryParams).then((response) => {
-        this.bdglpartyList = response.rows;
-        this.total = response.total;
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      getMeetingList(this.year).then((res) => {
+        this.lieList = res.rows;
       });
     },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        getMeetingList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       this.queryParams.unitId = row.deptId;
       this.unitId = row.deptId
@@ -239,4 +275,27 @@ li {
 ::v-deep .el-pagination.is-background .el-pager li {
   background: #00365F;
 }
+
+::v-deep .el-table__body tr:hover>td{
+  background-color: #3c749d !important;
+}
+::v-deep .el-table tr:nth-child(even){
+  background: #00365F;
+}
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 137 - 35
src/views/grassrootsregistration/bdglpartys/index.vue

@@ -1,6 +1,28 @@
 <!--党支部记录本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+    :model="form"
+    ref="form"
+    :inline="true"
+    label-width="68px"
+    style="padding-left: 30px"
+  >
+    <el-form-item prop="year">
+      <el-date-picker
+        v-model="form.year"
+        type="year"
+        placeholder="选择年"
+        @change="getSoulist"
+        value-format="yyyy"
+        :editable="false"
+      >
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button size="btr" @click="resetQuery">重置</el-button>
+    </el-form-item>
+  </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -11,21 +33,34 @@
     </ul>
 
     <!-- 查看第一次 -->
-    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
-      custom-class="lieBiao">
-      <el-table v-loading="loading" :data="bdglpartyList"
-        :header-cell-style="{ background: '#003C69', color: 'white' }">
+    <el-dialog
+      :visible.sync="tableStatus"
+      :title="title"
+      append-to-body
+      id="list"
+      :close-on-click-modal="false"
+      custom-class="lieBiao"
+    >
+      <el-table
+        v-loading="loading"
+        :data="bdglpartyList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }"
+      >
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
             }}</span>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
             }}</span>
           </template>
         </el-table-column>
@@ -36,24 +71,54 @@
           </template>
         </el-table-column>
         <el-table-column label="主持人" align="center" prop="compereRen" />
-        <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column
+          label="参加人"
+          align="center"
+          prop="joinId"
+          show-overflow-tooltip
+        />
         <el-table-column label="召开地点" align="center" prop="address" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
-            <el-button size="btk" type="text" @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"><span class="chakan">查看</span></el-button>
+            <el-button
+              size="btk"
+              type="text"
+              @click="handleChakan(scope.row)"
+              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              ><span class="chakan">查看</span></el-button
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-dialog>
 
     <!-- 查看二次 -->
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
-      :before-close="closes">
-      <bdglparty v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglparty>
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <bdglparty
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdglparty>
     </el-dialog>
   </div>
 </template>
@@ -82,30 +147,44 @@ export default {
       bdglpartyList: [],
       loading: false,
       total: 0,
-      unitId: undefined
+      unitId: undefined,
+      form:{},
+      year:null
     };
   },
 
   created() {
-    getPartyList().then((res) => {
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
-    getList() {
-      this.queryParams.unitId = this.unitId;
-      listBdglsoldier(this.queryParams).then((response) => {
-        this.bdglpartyList = response.rows;
-        this.total = response.total;
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      getPartyList(this.year).then((res) => {
+        this.lieList = res.rows;
       });
     },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        getPartyList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       this.queryParams.unitId = row.deptId;
-      this.unitId=row.deptId;
+      this.unitId = row.deptId;
       getPartyOnUnitList(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;
-        this.title = "查看党支部记录本"
+        this.title = "查看党支部记录本";
         this.tableStatus = true;
       });
     },
@@ -131,7 +210,7 @@ export default {
     closes() {
       this.menuRoleVisible = false;
       this.tableStatus = true;
-    }
+    },
   },
   components: {
     bdglparty,
@@ -139,7 +218,7 @@ export default {
 
   computed: {},
 
-  mounted() { },
+  mounted() {},
   watch: {},
 };
 </script>
@@ -193,8 +272,6 @@ li {
   text-align: center;
 }
 
-
-
 ::v-deep .lieBiao {
   background: #004d86 !important;
   min-height: 42vh !important;
@@ -220,23 +297,48 @@ li {
 }
 
 ::v-deep .el-pagination .el-select .el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination__editor.el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {
-  background: #00365F;
+  background: #00365f;
+}
+
+::v-deep .el-table__body tr:hover > td {
+  background-color: #3c749d !important;
+}
+::v-deep .el-table tr:nth-child(even) {
+  background: #00365f;
+}
+
+
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
 }
 </style>

+ 63 - 4
src/views/grassrootsregistration/bdglpublicpropertys/index.vue

@@ -1,6 +1,28 @@
 <!-- 营产公物领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+    :model="form"
+    ref="form"
+    :inline="true"
+    label-width="68px"
+    style="padding-left: 30px"
+  >
+    <el-form-item prop="year">
+      <el-date-picker
+        v-model="form.year"
+        type="year"
+        placeholder="选择年"
+        @change="getSoulist"
+        value-format="yyyy"
+        :editable="false"
+      >
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button size="btr" @click="resetQuery">重置</el-button>
+    </el-form-item>
+  </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -39,16 +61,36 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
+      form:{},
+      yrar:null
     };
   },
 
   created() {
-    propertyList().then((res) => {
-      console.log(res);
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      propertyList(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+        this.getTime();
+      } else {
+        propertyList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row) {
       const unitId = row;
       publiccpropertyunits(unitId).then((response) => {
@@ -110,4 +152,21 @@ li {
 .btn {
   text-align: center;
 }
+
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 62 - 4
src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -1,6 +1,28 @@
 <!-- 网络手机领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -41,16 +63,36 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
+      form:{},
+      year:null,
     };
   },
 
   created() {
-    getSecrecyStats().then((res) => {
-      // console.log(res);
-      this.lieList = res.rows;
-    });
+   this.getTime()
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      getSecrecyStats(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+       this.getTime()
+      } else {
+        getSecrecyStats(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     chaKan(row, tiem) {
       const unitId = row;
       const stiem = tiem;
@@ -113,4 +155,20 @@ li {
 .btn {
   text-align: center;
 }
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
+}
 </style>

+ 148 - 31
src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -1,6 +1,28 @@
 <!-- 军人委员会记录本领导 -->
 <template>
   <div class="arr_conten">
+    <el-form
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -11,14 +33,25 @@
     </ul>
 
     <!-- 查看第一次 -->
-    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
-      custom-class="lieBiao">
-      <el-table v-loading="loading" :data="bdglpartyList"
-        :header-cell-style="{ background: '#003C69', color: 'white' }">
+    <el-dialog
+      :visible.sync="tableStatus"
+      :title="title"
+      append-to-body
+      id="list"
+      :close-on-click-modal="false"
+      custom-class="lieBiao"
+    >
+      <el-table
+        v-loading="loading"
+        :data="bdglpartyList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }"
+      >
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
             }}</span>
           </template>
         </el-table-column>
@@ -30,38 +63,79 @@
         </el-table-column>
         <el-table-column label="记录人" align="center" prop="peopleJiLu" />
         <el-table-column label="主持人" align="center" prop="compereRen" />
-        <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip />
-        <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip />
-        <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column
+          label="列席人"
+          align="center"
+          prop="peopleIds"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="缺席人"
+          align="center"
+          prop="absentIds"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="参加人"
+          align="center"
+          prop="joinId"
+          show-overflow-tooltip
+        />
         <el-table-column label="召开地点" align="center" prop="address" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="100"
+        >
           <template slot-scope="scope">
-            <el-button size="btk" type="text" @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"><span class="chakan">查看</span></el-button>
+            <el-button
+              size="btk"
+              type="text"
+              @click="handleChakan(scope.row)"
+              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              ><span class="chakan">查看</span></el-button
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </el-dialog>
     <!-- 查看二次-->
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
-      :before-close="closes">
-      <bdglsoldier v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglsoldier>
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <bdglsoldier
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdglsoldier>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  listBdglsoldier,
+  getBdglsoldier,
   getSoldierList,
   getSoldierOnUnitList,
 } from "@/api/grassrootsregistration/bdglsoldier";
 //引入查看表格
 import bdglsoldier from "@/components/look_word/bdglsoldier.vue";
 export default {
+  name: "bdglsoldiers",
   data() {
     return {
       lieList: [],
@@ -77,16 +151,37 @@ export default {
       bdglpartyList: [],
       loading: false,
       total: 0,
-      unitId: undefined
+      unitId: undefined,
+      form: {},
+      year: null,
     };
   },
 
   created() {
-    getSoldierList().then((res) => {
-      this.lieList = res.rows;
-    });
+    this.getTime();
   },
   methods: {
+    resetQuery() {
+      this.form.year = null;
+      this.getTime();
+    },
+    getTime() {
+      var myDate = new Date();
+      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
+      getSoldierList(this.year).then((res) => {
+        this.lieList = res.rows;
+      });
+    },
+    getSoulist() {
+      this.year = this.form.year;
+      if (this.year == null) {
+       this.getTime()
+      } else {
+        getSoldierList(this.year).then((res) => {
+          this.lieList = res.rows;
+        });
+      }
+    },
     getList() {
       this.queryParams.unitId = this.unitId;
       getSoldierOnUnitList(this.queryParams).then((response) => {
@@ -96,11 +191,11 @@ export default {
     },
     chaKan(row) {
       this.queryParams.unitId = row;
-      this.unitId = row
+      this.unitId = row;
       getSoldierOnUnitList(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;
-        this.title = "查看军人委员会工作记录本"
+        this.title = "查看军人委员会工作记录本";
         this.tableStatus = true;
       });
     },
@@ -126,7 +221,7 @@ export default {
     closes() {
       this.menuRoleVisible = false;
       this.tableStatus = true;
-    }
+    },
   },
   components: {
     bdglsoldier,
@@ -134,7 +229,7 @@ export default {
 
   computed: {},
 
-  mounted() { },
+  mounted() {},
   watch: {},
 };
 </script>
@@ -188,7 +283,6 @@ li {
   text-align: center;
 }
 
-
 ::v-deep .lieBiao {
   background: #004d86 !important;
   min-height: 42vh !important;
@@ -214,23 +308,46 @@ li {
 }
 
 ::v-deep .el-pagination .el-select .el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination__editor.el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {
-  background: #00365F;
+  background: #00365f;
+}
+
+::v-deep .el-table__body tr:hover > td {
+  background-color: #3c749d !important;
+}
+::v-deep .el-table tr:nth-child(even) {
+  background: #00365f;
+}
+
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+  border-color: #fff !important;
+}
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 38px;
+  line-height: 37px;
 }
 </style>

+ 1 - 1
src/views/login.vue

@@ -153,7 +153,7 @@ export default {
           this.$store
             .dispatch("Login", this.loginForm)
             .then(() => {
-              this.requestFullScreen()
+              // this.requestFullScreen()
               // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
               this.$router.push({ path: "/pt" }).catch(() => { });
             })

+ 0 - 1
src/views/militaryvehicleManagement/thebus/index.vue

@@ -442,7 +442,6 @@ export default {
       this.chuF = false;
       this.title = "添加军车管理";
       this.form.status="1";
-      this.chuF=true
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

+ 9 - 8
src/views/pt.vue

@@ -784,7 +784,7 @@ export default {
     this.xianShang();
     getNone().then((res) => {
       this.str = res.msg;
-      // console.log(res);
+      console.log(res);
     });
     noReminder().then((res) => {
       if (res.data[0] != 0) {
@@ -1107,12 +1107,10 @@ export default {
       }, 10000); /* 每500毫秒执行一次,实现动态显示时间效果 */
     },
     tongzhifun() {
-      // this.title = "添加通知通告";
-      // this.open5 = true;
-      // this.ggflg = true;
-      // this.reset();
-      // window.open(`/system/notice`, "_self");
-      this.$router.push({ path: "/system/notice" }).catch(() => {});
+      // this.$router.push({ path: "/system/notice" }).catch(() => {});
+      this.$router
+        .push({ path: "/index", query: { name: "/notice" } })
+        .catch(() => {});
     },
     submitForm() {
       // addNotice(this.form).then((response) => {
@@ -1128,7 +1126,10 @@ export default {
       this.getlist();
     },
     tiaddfun() {
-      this.$router.push({ path: "/system/notice" }).catch(() => {});
+      this.$router
+        .push({ path: "/index", query: { name: "/notice" } })
+        .catch(() => {});
+      // this.$router.push({ path: "/system/notice" }).catch(() => {});
     },
     tzggfun(item) {
       // item.start = 1;