Эх сурвалжийг харах

门岗管理搜索功能,基层的训练器材字段

liangjiahao 3 жил өмнө
parent
commit
eec63ea5cf

+ 160 - 123
src/assets/styles/global.css

@@ -203,17 +203,17 @@ color: #fff;
 }
 
 /* 分页按钮 */
- .el-pagination.is-background .el-pager li {
+.el-pagination.is-background .el-pager li {
   background-color: #004d86;
   color: #fff;
 }
 
- .el-pagination.is-background .btn-next {
+.el-pagination.is-background .btn-next {
   background-color: #004d86;
   color: #fff;
 }
 
- /* .el-pagination.is-background .btn-prev,
+/* .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next,
 .el-pagination.is-background .el-pager li {
   background: #004d86 !important;
@@ -225,8 +225,9 @@ color: #fff;
   background: #004d86 !important;
   color: #fff !important;
 }
+
 /* 分页按钮 */
- /* .el-pagination.is-background .el-pager li {
+/* .el-pagination.is-background .el-pager li {
   background-color: #004d86;
   color: #fff;
   border: none !important;
@@ -538,18 +539,21 @@ color: #fff;
   background-color: #1d96ff;
   margin-bottom: 10px;
 }
+
 .el-button--bts:focus,
 .el-button--bts:hover {
   background: #41a4fa;
   border-color: #41a4fa;
   color: #FFFFFF;
 }
+
 .el-button--bts.is-active,
 .el-button--bts:active {
   background: #1d96ff;
   border-color: #1d96ff;
   color: #FFFFFF;
 }
+
 /* 控制按钮样式颜色 end */
 
 
@@ -844,7 +848,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 .el-date-picker__editor-wrap .el-input__inner{
   color: black;
 } */
-::v-deep .el-form-item__content{
+::v-deep .el-form-item__content {
   border-bottom: none;
 }
 
@@ -870,112 +874,130 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
 } */
- 
+
 /* 门岗管理 */
 
-::v-deep .el-form-item__content{
+::v-deep .el-form-item__content {
   border-bottom: none;
 }
-.el-select-dropdown>.el-scrollbar>.el-select-dropdown__wrap>.el-scrollbar__view{
+
+.el-select-dropdown>.el-scrollbar>.el-select-dropdown__wrap>.el-scrollbar__view {
   background-color: white;
 }
-.el-time-panel>.el-time-panel__content>.el-time-spinner .el-scrollbar__view{
+
+.el-time-panel>.el-time-panel__content>.el-time-spinner .el-scrollbar__view {
   background-color: white;
 }
-.el-date-picker__editor-wrap .el-input .el-input__inner{
+
+.el-date-picker__editor-wrap .el-input .el-input__inner {
   color: black !important;
 }
+
 /* 隐藏此刻按钮 */
-.el-picker-panel__footer .el-button--text span{
-  display: none ;
+.el-picker-panel__footer .el-button--text span {
+  display: none;
 }
-.el-tooltip__popper{
+
+.el-tooltip__popper {
   width: 300px !important;
   height: auto !important;
-  letter-spacing:.2em;
+  letter-spacing: .2em;
   /* text-align: center; */
   text-indent: 2em;
 }
 
- /* 主页左侧导航栏 */
- .nest-menu li{
+/* 主页左侧导航栏 */
+.nest-menu li {
   padding-left: 25px !important;
- }
- /* input下拉背景、字体颜色------input加类名 */
- .input_xiala{
+}
+
+/* input下拉背景、字体颜色------input加类名 */
+.input_xiala {
   color: #000 !important;
- }
- .input_xiala:hover{
+}
+
+.input_xiala:hover {
   color: #000 !important;
- }
+}
 
 
 /* 要事日记数据盒子的位置 */
 #dialoges .el-dialog {
- width: 528px !important;
- position: absolute;
-right: -1300px;
- top: 100px;
- min-height: 450px;
+  width: 528px !important;
+  position: absolute;
+  right: -1300px;
+  top: 100px;
+  min-height: 450px;
 }
-#dialoges .el-dialog .shuJuTime{
+
+#dialoges .el-dialog .shuJuTime {
   margin-left: 19px;
 }
+
 #dialoges .jiben {
- width: 461px !important;
- height: 32px;
- background-image: url(/static/img/小标题底.b7c6f45a.png);
- background-size: 100%;
- margin-bottom: 8px;
- color: #fff;
- padding-left: 16px;
- line-height: 32px;
- margin-left: 19px;
+  width: 461px !important;
+  height: 32px;
+  background-image: url(/static/img/小标题底.b7c6f45a.png);
+  background-size: 100%;
+  margin-bottom: 8px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+  margin-left: 19px;
 }
-#dialoges .el-dialog__body{
- margin: -5px 0px 21px 0;
- padding-top: 19px !important;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
-#dialoges .greeds{
- display: inline-block;
- width: 10px;
- height: 10px;
- background-color: #FF4949;
-margin-right: 8px;
-}
-#dialoges .greedss{
+
+#dialoges .el-dialog__body {
+  margin: -5px 0px 21px 0;
+  padding-top: 19px !important;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+#dialoges .greeds {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  background-color: #FF4949;
+  margin-right: 8px;
+}
+
+#dialoges .greedss {
   display: inline-block;
   width: 10px;
   height: 10px;
   background-color: #13CE66;
- margin-right: 8px;
- }
-#dialoges .greed{
- margin-left: 0px;
- /* background-color: #fff; */
- margin-bottom: 14px;
- margin-right: 40px;
-}
-#dialoges .zuiDa{
- width: 540px;
- min-height: 284px;
- /* background-color: #fff; */
- color: #fff;
-}
-#dialoges .red{
- width: 139px;
- display: inline-block;
- /* margin-left: 2px; */
- /* background-color: #fff; */
- /* margin-bottom: 14px; */
-margin-right: 34px;
- font-size: 14px;
- margin-bottom: 10px;
-}
-#dialoges .boxxx { margin-left: 20px;
+  margin-right: 8px;
+}
+
+#dialoges .greed {
+  margin-left: 0px;
+  /* background-color: #fff; */
+  margin-bottom: 14px;
+  margin-right: 40px;
+}
+
+#dialoges .zuiDa {
+  width: 540px;
+  min-height: 284px;
+  /* background-color: #fff; */
+  color: #fff;
+}
+
+#dialoges .red {
+  width: 139px;
+  display: inline-block;
+  /* margin-left: 2px; */
+  /* background-color: #fff; */
+  /* margin-bottom: 14px; */
+  margin-right: 34px;
+  font-size: 14px;
+  margin-bottom: 10px;
+}
+
+#dialoges .boxxx {
+  margin-left: 20px;
 }
+
 /* #dialoges .red::after{
   display: inline-block;
   content: "";
@@ -984,90 +1006,105 @@ margin-right: 34px;
   background-color: #FF4949;
   margin-left: -97px;
 } */
-.shuJuTime { margin-bottom: 10px;
+.shuJuTime {
+  margin-bottom: 10px;
 }
 
 /* 右侧上浮框 */
 ::v-deep .el-table .el-table__body .el-table__row.hover-row td {
   background-color: #004d86;
 }
+
 /* 调整输入框提示文字颜色 */
 .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
 }
- input::-webkit-input-placeholder {
+
+input::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
- input:-moz-placeholder {
+
+input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-.jinduchakan .el-table__body-wrapper .el-table__empty-block{
+
+.jinduchakan .el-table__body-wrapper .el-table__empty-block {
   border-bottom: 2px solid white !important;
   border-left: 2px solid white !important;
   border-right: 2px solid white !important;
 }
+
 /* 文本域提示文字颜色 */
- ::-webkit-input-placeholder {
+::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+
 /* 右侧上浮框 */
 .el-table .el-table__body .el-table__row.hover-row td {
-   background-color: #004d86;
-  }
-  /* .el-table__fixed-right {
+  background-color: #004d86;
+}
+
+/* .el-table__fixed-right {
     height: 100% !important;
   } */
-  /* 浮层底线 */
-  .el-table__fixed::before, .el-table__fixed-right::before {
-   background-color: transparent !important;
-  }
-
-  #app .sidebar-container {
-    -webkit-transition: width 0.28s;
-    transition: width 0.28s;
-    width: 265px !important;
-    background-color: #304156;
-    height: 100%;
-    position: fixed;
-    font-size: 0px;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1001;
-    overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
-    box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
-}
-  
-  #app .main-container {
-    min-height: 100%;
-    -webkit-transition: margin-left 0.28s;
-    transition: margin-left 0.28s;
-    margin-left: 265px;
-    position: relative;
-  }
-  /* .el-input__inner {
+/* 浮层底线 */
+.el-table__fixed::before,
+.el-table__fixed-right::before {
+  background-color: transparent !important;
+}
+
+#app .sidebar-container {
+  -webkit-transition: width 0.28s;
+  transition: width 0.28s;
+  width: 265px !important;
+  background-color: #304156;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+  -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+  box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+}
+
+#app .main-container {
+  min-height: 100%;
+  -webkit-transition: margin-left 0.28s;
+  transition: margin-left 0.28s;
+  margin-left: 265px;
+  position: relative;
+}
+
+/* .el-input__inner {
     border: 1px solid white !important;
 } */
 
 
 /* 表单验证提示文字居左 */
 .el-form-item__error {
-  margin-left: 0px;} 
-  .el-form-item__error {
-    left: 0 !important;
-  }
-    /* 添加内部滚动条 */
- .el-dialog__body .userAgree {
+  margin-left: 0px;
+}
+
+.el-form-item__error {
+  left: 0 !important;
+}
+
+/* 添加内部滚动条 */
+.el-dialog__body .userAgree {
   height: 600px;
   overflow: auto;
 }
+
 /*定义滚动条宽高及背景,宽高分别对应横竖滚动条的尺寸*/
 .userAgree::-webkit-scrollbar {
   width: 14px;
   /* height: 2px !important; */
   background: #3d83b8;
 }
+
 /*定义滑块,内阴影及圆角*/
 .userAgree::-webkit-scrollbar-thumb {
   /* border-radius: 20px; */
@@ -1075,6 +1112,7 @@ margin-right: 34px;
   width: 3px; */
   background: rgba(144, 206, 252, 1);
 }
+
 /*定义滚动条的轨道,内阴影及圆角*/
 /* .userAgree::-webkit-scrollbar-track {
   border-radius: 0;
@@ -1082,7 +1120,6 @@ margin-right: 34px;
 } */
 
 /* 树形结构合起来去掉选中背景色 */
-.el-tree-node:focus > .el-tree-node__content {
+.el-tree-node:focus>.el-tree-node__content {
   background-color: transparent;
-}
-
+}

+ 2 - 0
src/views/combatduty/basedutyinfo/index.vue

@@ -1195,6 +1195,7 @@ export default {
   background: #196299;
   border: none;
   color: #fff;
+      line-height: 12px !important;
 }
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none !important;
@@ -1205,6 +1206,7 @@ export default {
   border-color: #006cff !important;
   -webkit-box-shadow: -1px 0 0 0 #006cff !important;
   box-shadow: -1px 0 0 0 #006cff !important;
+      line-height: 12px !important;
 }
 /* 将水平线设为红色: */
 hr {

+ 2 - 0
src/views/combatduty/grassdutyinfo/index.vue

@@ -940,6 +940,7 @@ export default {
   background: #196299;
   border: none;
   color: #fff;
+      line-height: 12px !important;
 }
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none !important;
@@ -950,6 +951,7 @@ export default {
   border-color: #006cff !important;
   -webkit-box-shadow: -1px 0 0 0 #006cff !important;
   box-shadow: -1px 0 0 0 #006cff !important;
+      line-height: 12px !important;
 }
 /* 将水平线设为红色: */
 hr {

+ 3 - 3
src/views/doormanManage/bdglVisit/index.vue

@@ -30,7 +30,7 @@
           v-model="queryParams.name"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
       <el-form-item class="search">
@@ -41,7 +41,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="btr2" @click="resetQuery"
+        <el-button  size="btr" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -428,8 +428,8 @@ export default {
       this.queryParams.unitId = val.id;
       this.queryParams.peopleName = "";
       this.queryParams.unitName = val.label;
-      console.log(this.queryParams);
       this.getZhuChi(this.queryParams.unitId);
+      this.getList();
     },
     /** 查询人员来访登记列表 */
     getList() {

+ 1 - 1
src/views/grassrootsregistration/statistics/index.vue

@@ -362,7 +362,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除军事训练月统计表编号为"' + ids + '"的数据项?')
+        .confirm('是否确认删除数据项?')
         .then(function () {
           return delStatistics(ids);
         })