添加工作安排、战备值班、对话框滚动条

修改系统管理、门岗管理首次进入页面边框绿色

src/views/combatduty/teamdutyinfo/index.vue

@@ -441,6 +441,7 @@
       append-to-body
       :close-on-click-modal="false"
     >
+    <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
       <el-form
         ref="form"
         :model="form"
@@ -725,6 +726,7 @@
           />
         </el-form-item>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -1173,10 +1175,10 @@ export default {
   height: 104px;
 }
 ::v-deep .el-dialog__footer {
-  margin-right: 14px !important;
+  margin-right: 20px !important;
 }
 ::v-deep .el-dialog__body {
-  padding: 30px 0px 30px 31px;
+  padding: 30px 0px 30px 25px;
 }
 .addspan {
   width: 30px;

src/views/doormanManage/bdglVisit/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="到访单位" prop="unitId">
+      <el-form-item label="" prop="unitId">
         <!-- <el-input
           v-model="queryParams.unitId"
           placeholder="请输入到访单位"
@@ -23,7 +23,7 @@
           @select="selectPeo1"
         />
       </el-form-item>
-      <el-form-item label="到访人员姓名" prop="name">
+      <el-form-item label="" prop="name">
         <el-input
           placeholder="请选择到访人员姓名"
           class="daofang"
@@ -578,6 +578,7 @@ export default {
   background-color: #004d86 !important;
   width: 220px;
   color: white;
+  border: 1px solid white !important;
 }
 /* 标题弹框 */
 ::v-deep .el-dialog__title {

src/views/grassrootsregistration/statistics/index.vue

@@ -166,7 +166,7 @@
     />
 
     <!-- 添加或修改军事训练月统计班对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body :close-on-click-modal="false">
       <div class="jiben">基本信息</div>
 
       <el-form
@@ -424,9 +424,10 @@ export default {
 }
 /* 基本信息背景 */
 .jiben {
-  width: 500px;
+  width: 338px;
   height: 32px;
   background-image: url(../../../images/小标题底.png);
+  background-size: 100%;
   margin-bottom: 25px;
   margin-left: 0px;
   color: #fff;
@@ -443,12 +444,12 @@ export default {
   box-sizing: border-box;
 }
 .el-dialog__body .el-form-item{
-  margin-left: 40px;
+  margin-left: -23px;
 }
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
-  padding: 0px 10px 20px 0px;
-  margin-right: 37px;
+  padding: 0px 10px 25px 0px;
+  margin-right: 54px;
 }
 ::v-deep .el-input--small .el-input__inner {
     height: 36px;

src/views/peopleChuRu/bdglLeave/index.vue

@@ -1273,6 +1273,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/config/index.vue

@@ -487,6 +487,8 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
+
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/dept/index.vue

@@ -499,6 +499,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/dict/data.vue

@@ -543,6 +543,8 @@ export default {
   height: 36px; 
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
+
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/dict/index.vue

@@ -493,6 +493,8 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
+
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/menu/index.vue

@@ -623,6 +623,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/notice/index.vue

@@ -449,6 +449,8 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
+
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/post/index.vue

@@ -438,6 +438,8 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
+
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/system/role/index.vue

@@ -212,12 +212,13 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="700px"
+      width="760px"
       style=""
       append-to-body
       :closeOnClickModal="false"
       :expand-on-click-node="false"
     >
+    <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
       <div class="jiben">基本信息</div>
       <el-form
         ref="form"
@@ -296,6 +297,7 @@
           ></el-input>
         </el-form-item>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -768,7 +770,6 @@ export default {
 ::v-deep .el-textarea__inner {
   width: 700px;
   height: 104px;
-  margin: auto !important;
 }
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
@@ -790,6 +791,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -920,9 +922,8 @@ export default {
   background: #00365f;
 }
 ::v-deep .el-textarea__inner {
-  width: 660px;
+  width: 684px;
   height: 104px;
-  margin: auto !important;
 }
 
 ::v-deep .el-tree-node__content:hover {
@@ -954,4 +955,10 @@ export default {
 ::v-deep .el-date-editor .el-range-input {
   color: #fff;
 }
+.el-dialog__body {
+    padding: 30px 0px 0px 27px;
+}
+::v-deep .el-dialog__footer{
+  margin-right: 37px !important;
+}
 </style>

src/views/system/user/index.vue

@@ -1046,6 +1046,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色
 ::v-deep .vue-treeselect__control {

src/views/workingArrangements/planTask/index.vue

@@ -213,15 +213,19 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+
+
     <!-- 添加或修改工作计划对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="990px"
+      width="1020px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
+     <div class="userAgree">
       <el-form
         ref="form"
         :model="form"
@@ -358,20 +362,25 @@
           />
         </el-form-item>
       </el-form>
+     </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
     <!-- 进度录入弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open1"
-      width="980px"
+      width="1040px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
+    <div class="userAgree">
       <el-form
         ref="Progress"
         :model="Progress"
@@ -452,20 +461,25 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    
+
+
     <!-- 单人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open2"
-      width="980px"
+      width="1020px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
+   <div class="userAgree">
       <el-form
         ref="singleTable"
         :model="singleTable"
@@ -536,20 +550,25 @@
         </el-form-item> -->
         <div class="thistext">{{ singleTable.contents }}</div>
       </el-form>
+   </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
     <!-- 多人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open3"
-      width="980px"
+      width="1020px"
       append-to-body
       class="el-dialog__header jinduchakan"
       :close-on-click-modal="false"
     >
+    <div class="userAgree">
       <el-form
         ref="moreTable"
         :model="moreTable"
@@ -619,7 +638,7 @@
         <el-table
           :data="moreTable.planProgresses"
           border
-          style="width: 100%; background: #004d86"
+          style="width: 97%; background: #004d86"
           class="tabless"
         >
           <el-table-column prop="peopleName" label="执行人" width="180">
@@ -654,6 +673,10 @@
           </el-table-column>
         </el-table>
       </el-form>
+    </div>
+
+
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -1452,7 +1475,7 @@ export default {
 }
 /* 完成进度 */
 .complue .el-input__inner {
-  width: 940px;
+  width: 900px;
 }
 .complue {
   width: 940px;
@@ -1511,6 +1534,9 @@ export default {
 .el-progress-bar__outer {
   background-color: rgba(25, 98, 153, 1);
 }
+.el-progress-bar{
+  width: 97% !important;
+}
 /* 上下箭头 */
 .el-icon-arrow-up,
 .el-icon-arrow-down {
@@ -1563,5 +1589,11 @@ export default {
 }
 .vue-treeselect__menu {
   color: #606266;
+}
+ .el-dialog__body {
+  padding: 30px 0px 0px 34px;
+}
+ .el-dialog__footer {
+  margin-right: 26px !important;
 }
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -178,9 +178,7 @@
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.startTime)
-          }}</span>
+          <span>{{ parseTime(scope.row.startTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -190,9 +188,7 @@
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.endTime)
-          }}</span>
+          <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -263,161 +259,168 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="980px"
+      width="1020px"
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
-        <div class="jiben">基本信息</div>
-        <el-form-item label="任务名称" prop="name">
-          <el-input
-            placeholder="请选择任务名称"
-            v-model="form.name"
-            @click.native="planName"
-          />
-        </el-form-item>
-        <el-form-item label="任务编号" prop="number">
-          <el-input
-            placeholder="请选择任务编号"
-            label="任务编号"
-            v-model="form.number"
-            :disabled="true"
-            class="ipt"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="发布单位" prop="adminId">
-          <treeselect
-            v-model="form.adminId"
-            :options="part"
-            @select="selectPeo"
-            class="threeselects"
-            disabled
-            placeholder="请选择发布单位"
-          />
-        </el-form-item>
-        <el-form-item label="执行单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="users"
-            class="threeselects"
-            @select="selectPeo1"
-            placeholder="请选择执行单位"
-          />
-        </el-form-item>
-        <el-form-item label="任务类型" prop="type">
-          <el-select
-            v-model="form.type"
-            style="width: 200px"
-            clearable
-            placeholder="请选择任务类型"
-            size="small"
-          >
-            <el-option
-              v-for="(item, i) in ziDian"
-              :key="i"
-              :label="item.dictLabel"
-              :value="parseInt(item.dictSort)"
+      <div class="userAgree">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="100px"
+          :inline="true"
+        >
+          <div class="jiben">基本信息</div>
+          <el-form-item label="任务名称" prop="name">
+            <el-input
+              placeholder="请选择任务名称"
+              v-model="form.name"
+              @click.native="planName"
+            />
+          </el-form-item>
+          <el-form-item label="任务编号" prop="number">
+            <el-input
+              placeholder="请选择任务编号"
+              label="任务编号"
+              v-model="form.number"
+              :disabled="true"
+              class="ipt"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="发布人" prop="username">
-          <el-input
-            placeholder="请输入发布人"
-            v-model="form.username"
-            :disabled="true"
-            class="ipt"
-          >
-          </el-input>
-        </el-form-item>
-        <div>
-          <el-form-item label="执行人" prop="peopleName" label-width="100px">
-            <div>
-              <el-select
-                multiple
-                v-model="form.peopleName"
-                id="execute"
-                ref="peoplenames"
-                placeholder="请选择执行人"
+            </el-input>
+          </el-form-item>
+          <el-form-item label="发布单位" prop="adminId">
+            <treeselect
+              v-model="form.adminId"
+              :options="part"
+              @select="selectPeo"
+              class="threeselects"
+              disabled
+              placeholder="请选择发布单位"
+            />
+          </el-form-item>
+          <el-form-item label="执行单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              :options="users"
+              class="threeselects"
+              @select="selectPeo1"
+              placeholder="请选择执行单位"
+            />
+          </el-form-item>
+          <el-form-item label="任务类型" prop="type">
+            <el-select
+              v-model="form.type"
+              style="width: 200px"
+              clearable
+              placeholder="请选择任务类型"
+              size="small"
+            >
+              <el-option
+                v-for="(item, i) in ziDian"
+                :key="i"
+                :label="item.dictLabel"
+                :value="parseInt(item.dictSort)"
               >
-                <el-option
-                  v-for="item in executor"
-                  :key="item.deptId"
-                  :label="item.nickName"
-                  :value="item.userId"
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布人" prop="username">
+            <el-input
+              placeholder="请输入发布人"
+              v-model="form.username"
+              :disabled="true"
+              class="ipt"
+            >
+            </el-input>
+          </el-form-item>
+          <div>
+            <el-form-item label="执行人" prop="peopleName" label-width="100px">
+              <div>
+                <el-select
+                  multiple
+                  v-model="form.peopleName"
                   id="execute"
-                  @click.native="returnExecutor(item.deptId, item.nickName)"
-                />
-              </el-select>
-            </div>
+                  ref="peoplenames"
+                  placeholder="请选择执行人"
+                >
+                  <el-option
+                    v-for="item in executor"
+                    :key="item.deptId"
+                    :label="item.nickName"
+                    :value="item.userId"
+                    id="execute"
+                    @click.native="returnExecutor(item.deptId, item.nickName)"
+                  />
+                </el-select>
+              </div>
+            </el-form-item>
+          </div>
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              placeholder="请选择开始时间"
+              clearable
+              size="small"
+              v-model="form.startTime"
+              type="datetime"
+              style="width: 200px"
+            >
+            </el-date-picker>
           </el-form-item>
-        </div>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker
-            placeholder="请选择开始时间"
-            clearable
-            size="small"
-            v-model="form.startTime"
-            type="datetime"
-            style="width: 200px"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" label-width="100px" prop="endTime">
-          <el-date-picker
-            placeholder="请选择结束时间"
-            clearable
-            size="small"
-            v-model="form.endTime"
-            type="datetime"
-            default-time="00:00:00"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <div class="jiben">任务附件</div>
-        <el-form-item style="margin-left: 30px">
-          <fileUpload v-model="form.file" />
-        </el-form-item>
-        <div class="jiben">任务描述</div>
-        <el-form-item prop="contents">
-          <el-input
-            v-model="form.contents"
-            type="textarea"
-            placeholder="请输入内容"
-            style="width: 950px"
-          />
-        </el-form-item>
-        <div class="jiben">备注</div>
-        <el-form-item prop="remark">
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-            style="width: 950px"
-          />
-        </el-form-item>
-      </el-form>
+          <el-form-item label="结束时间" label-width="100px" prop="endTime">
+            <el-date-picker
+              placeholder="请选择结束时间"
+              clearable
+              size="small"
+              v-model="form.endTime"
+              type="datetime"
+              default-time="00:00:00"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <div class="jiben">任务附件</div>
+          <el-form-item style="margin-left: 30px">
+            <fileUpload v-model="form.file" />
+          </el-form-item>
+          <div class="jiben">任务描述</div>
+          <el-form-item prop="contents">
+            <el-input
+              v-model="form.contents"
+              type="textarea"
+              placeholder="请输入内容"
+              style="width: 950px"
+            />
+          </el-form-item>
+          <div class="jiben">备注</div>
+          <el-form-item prop="remark">
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              placeholder="请输入内容"
+              style="width: 950px"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
+
     <!-- 进度录入弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open1"
-      width="980px"
+      width="1020px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
+    <div class="userAgree">
       <el-form
         ref="Progress"
         :model="Progress"
@@ -469,20 +472,26 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
+
     <!-- 单人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open2"
-      width="980px"
+      width="1020px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
+    <div class="userAgree">
       <el-form
         ref="singleTable"
         :model="singleTable"
@@ -538,20 +547,26 @@
         <div class="jiben">任务描述</div>
         <div class="thistext">{{ singleTable.contents }}</div>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
+
     <!-- 多人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open3"
-      width="980px"
+      width="1020px"
       append-to-body
       class="el-dialog__header jinduchakan"
       :close-on-click-modal="false"
     >
+    <div class="userAgree">
       <el-form
         ref="moreTable"
         :model="moreTable"
@@ -599,7 +614,7 @@
         <el-table
           :data="moreTable.workProgresses"
           border
-          style="width: 100%; background: #004d86"
+          style="width: 97%; background: #004d86"
           class="tabless"
         >
           <el-table-column prop="peopleName" label="执行人" width="180">
@@ -634,6 +649,7 @@
           </el-table-column>
         </el-table>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -1447,7 +1463,7 @@ export default {
   top: 5px;
 }
 /* 表格 */
- .tabless .el-table__row {
+.tabless .el-table__row {
   background-color: #004d86;
 }
 
@@ -1493,6 +1509,9 @@ export default {
 .el-progress-bar__outer {
   background-color: rgba(25, 98, 153, 1);
 }
+.el-progress-bar{
+  width: 97% !important;
+}
 /* 上下箭头 */
 .el-icon-arrow-up,
 .el-icon-arrow-down {
@@ -1535,4 +1554,10 @@ export default {
 .vue-treeselect__menu {
   color: #606266;
 }
+.userAgree .el-dialog__body {
+  padding: 30px 0px 0px 34px;
+}
+.userAgree .el-dialog__footer {
+  margin-right: 26px !important;
+}
 </style>