sunyanqiang 3 роки тому
батько
коміт
dc01c4b75e

+ 1 - 1
src/components/look_word/bdgldrill.vue

@@ -192,7 +192,7 @@
               "
             >
               <span align="center">
-                {{ message.common }}
+                {{ message.trainingContent }}
               </span>
             </td>
             <td

+ 3 - 2
src/views/grassrootsregistration/bdglarmaments/index.vue

@@ -85,7 +85,7 @@ export default {
 }
 ul {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
@@ -97,7 +97,8 @@ li {
   /* margin: 20px 0; */
   margin-bottom: 20px;
   background-size: 100% 100%;
-  flex: 0 0 15%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
 .names {
   color: #fff;

+ 45 - 18
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -236,7 +236,7 @@
           prop="drillEndtime"
           style="margin-left: 130px"
         >
-          <el-date-picker
+          <!-- <el-date-picker
             clearable
             size="small"
             v-model="form.drillEndtime"
@@ -245,20 +245,26 @@
             placeholder="选择训练结束时间"
             @change="drillTimechange"
           >
+          </el-date-picker> -->
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.drillEndtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择训练结束时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="周工作内容">
-          <input
-            v-model="nr"
-            placeholder=""
-            style="
-              width: 810px;
-              height: 36px;
-              background: transparent;
-              color: #fff;
-              border: 1px solid #fff !important;
-            "
-          />
+        <el-form-item label="周工作内容" class="boxtext">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="form.trainingContent"
+            autosize
+          >
+          </el-input>
         </el-form-item>
         <el-row>
           <el-checkbox
@@ -360,6 +366,7 @@
             v-model="form.fail"
             type="textarea"
             placeholder="请输入内容"
+            autosize
           />
         </el-form-item>
         <el-row>
@@ -527,8 +534,15 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="周工作内容">
-          <input
+        <el-form-item label="周工作内容" class="boxtext">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            v-model="form.trainingContent"
+            autosize
+          >
+          </el-input>
+          <!-- <input
             v-model="nr"
             placeholder=""
             style="
@@ -539,7 +553,7 @@
               border: 1px solid #fff !important;
             "
             disabled
-          />
+          /> -->
         </el-form-item>
         <el-row>
           <el-checkbox
@@ -641,6 +655,7 @@
             v-model="form.fail"
             type="textarea"
             placeholder="请输入内容"
+            autosize
           />
         </el-form-item>
         <el-row>
@@ -757,7 +772,6 @@ import {
   getZhuChiRen,
   getDept2,
 } from "@/api/grassrootsregistration/bdglmeeting";
-
 export default {
   name: "Bdgldrill",
   components: { Treeselect, bdgldrill },
@@ -1261,8 +1275,8 @@ export default {
 }
 ::v-deep .el-textarea__inner {
   width: 920px;
-  height: 104px;
   margin: auto;
+  min-height: 120px !important;
 }
 #chakan /deep/ .el-dialog__body {
   padding: 30px 64px;
@@ -1271,4 +1285,17 @@ export default {
 .shouForm /deep/ .el-input__inner {
   width: 220px;
 }
+
+::v-deep .boxtext .el-textarea__inner {
+  width: 810px;
+}
+::v-deep .el-dialog__body {
+  margin-left: 53px;
+}
+::v-deep .el-form .el-table {
+  width: 921px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 47px;
+}
 </style>

+ 3 - 2
src/views/grassrootsregistration/bdgldrills/index.vue

@@ -85,7 +85,7 @@ export default {
 }
 ul {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
@@ -97,7 +97,8 @@ li {
   /* margin: 20px 0; */
   margin-bottom: 20px;
   background-size: 100% 100%;
-  flex: 0 0 15%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
 .names {
   color: #fff;

+ 3 - 172
src/views/grassrootsregistration/bdglequips/index.vue

@@ -85,7 +85,7 @@ export default {
 }
 ul {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
@@ -97,7 +97,8 @@ li {
   /* margin: 20px 0; */
   margin-bottom: 20px;
   background-size: 100% 100%;
-  flex: 0 0 15%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
 .names {
   color: #fff;
@@ -109,174 +110,4 @@ li {
 .btn {
   text-align: center;
 }
-</style>
-/* 对话框背景颜色 */
-::v-deep .el-dialog {
-  background: #004d86 !important;
-}
-::v-deep .el-textarea__inner {
-  width: 920px;
-  height: 104px;
-}
-::v-deep .el-dialog__header {
-  border-bottom: 1px solid #718a9d;
-}
-::v-deep .el-dialog__title {
-  color: #fff;
-  font: 18px;
-}
-::v-deep .el-dialog__headerbtn .el-dialog__close {
-  color: #fff;
-}
-::v-deep .el-form-item__label {
-  font: 16px;
-  color: #fff;
-  width: 100px !important;
-}
-::v-deep .el-input__inner {
-  /* width: 200px !important;
-  height: 36px; */
-  background: transparent;
-  color: #fff;
-  border: 1px solid white !important;
-  border-color: #fff !important;
-}
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
-}
-/* 基本信息背景 */
-.jiben {
-  width: 920px;
-  height: 32px;
-  background-image: url(../../../images/小标题底.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
-/*调整表单间距 */
-::v-deep .el-form-item__content {
-  width: 200px;
-}
-::v-deep .el-input__inner {
-  cursor: pointer !important;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 30px 50px;
-}
-::v-deep .el-dialog__body {
-  margin: 10px 35px 20px 44px;
-  padding-top: 20px !important;
-  box-sizing: border-box;
-}
-.contents {
-  padding: 0px 40px !important;
-}
-/* 下拉菜单 */
-.el-dropdown-link {
-  cursor: pointer;
-  color: #409eff;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-/* 刷新图标 */
-/* .el-icon-refresh {
-  width: 76px;
-  height: 36px;
-  color: #fff;
-  background-color: #1d96ff !important;
-  border-radius: 4px;
-  border: none;
-  margin-left: 20px;
-  font-size: 14px;
-} */
-/* 下拉菜单字体/背景颜色 */
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
-  background-color: #004d86;
-  color: #fff;
-}
-.el-select-dropdown__item {
-  color: #fff;
-}
-/* 时间选择 */
-::v-deep .el-input--small .el-input__inner {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-.el-date-editor.el-input {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-::v-deep .el-date-editor.el-input .el-input__inner {
-  height: 36px;
-  line-height: 36px;
-}
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
-  color: #fff;
-}
-/* 单位下拉菜单选中字体颜色 */
-::v-deep .vue-treeselect__single-value {
-  color: #fff !important;
-}
-/* 分页按钮 */
-::v-deep .el-pagination.is-background .el-pager li {
-  background-color: #004d86;
-  color: #fff;
-}
-::v-deep .el-pagination.is-background .btn-next {
-  background-color: #004d86;
-  color: #fff;
-}
-/* 计数器按钮 */
-::v-deep .el-input-number__increase {
-  background-color: transparent !important;
-  border: none;
-  color: #cccccc;
-  border-bottom: none !important;
-}
-::v-deep .el-input-number__decrease {
-  background-color: transparent !important;
-  border: none !important;
-  color: #cccccc;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 18px 42px 30px 0px;
-  margin-right: 30px;
-}
-/* 增加按钮弹框 */
-::v-deep .el-dialog {
-  width: 1060px !important;
-}
-::v-deep .el-dialog__body {
-  padding: none !important;
-}
-::v-deep .box4 .el-textarea__inner {
-  min-height: 120px !important;
-}
-/* 调整输入框提示文字颜色 */
-::v-deep .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
-}
-::v-deep input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
-::v-deep input:-moz-placeholder {
-  color: #bdbdbd4f !important;
-}
-/* 文本域提示文字颜色 */
-::v-deep ::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
-#chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 23px;
-}
 </style>

+ 3 - 2
src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -85,7 +85,7 @@ export default {
 }
 ul {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
@@ -97,7 +97,8 @@ li {
   /* margin: 20px 0; */
   margin-bottom: 20px;
   background-size: 100% 100%;
-  flex: 0 0 15%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
 .names {
   color: #fff;

+ 3 - 2
src/views/grassrootsregistration/bdglpublicpropertys/index.vue

@@ -85,7 +85,7 @@ export default {
 }
 ul {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
@@ -97,7 +97,8 @@ li {
   /* margin: 20px 0; */
   margin-bottom: 20px;
   background-size: 100% 100%;
-  flex: 0 0 15%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
 .names {
   color: #fff;

+ 3 - 2
src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -88,7 +88,7 @@ export default {
 }
 ul {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
@@ -100,7 +100,8 @@ li {
   /* margin: 20px 0; */
   margin-bottom: 20px;
   background-size: 100% 100%;
-  flex: 0 0 15%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
 .names {
   color: #fff;