coys

.env.development

@@ -6,19 +6,11 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-<<<<<<< HEAD
-#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
-  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
-=======
-# VUE_APP_BASE_API = 'http://47.92.229.224:8080'
-#罗俊
-#VUE_APP_BASE_API = 'http://10.87.21.60:8080'
-#罗伟
- VUE_APP_BASE_API = 'http://10.87.23.62:8080'
->>>>>>> d909b77fe3593021b73d72d6276f6df848c73f8a
+  # VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/components/elDialog/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog  v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
+    <el-dialog center v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
       <slot></slot>
       <slot name="footer" class="dialog-footer"></slot>
     </el-dialog>
@@ -27,6 +27,9 @@ export default {
 .dialog-footer {
   text-align: right;
 }
+.el-dialog{
+  margin:  0 auto;
+}
 </style>
 <style lang="scss" scoped>
   //.centerDialog{

src/views/safetyBook/aqbwbndjh/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '安全保卫部年度工作计划详情' : '新增安全保卫部年度工作计划'"
       :visible.sync="isShow"
       @close="onHide"
-      width="900px"
+      width="50%"
     >
       <div class="page-body">
         <el-form

src/views/safetyBook/hsggbsdj/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '高管工作部署会议记录详情' : '新增高管工作部署会议记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="700px"
+      width="50%"
     >
       <div class="page-body">
         <el-form
@@ -109,8 +109,8 @@
                 :fileSize="2"
               ></imgs-upload> -->
               <W-file-upload
-              :isRem="false"
-              :isShowTip="false"
+                :isRem="false"
+                :isShowTip="false"
                 ref="upload"
                 :defaultValue="formFileListDefualtValue"
                 v-model="formData.images"
@@ -160,7 +160,7 @@ import Editor from "@/components/Editor";
 import dayjs from "dayjs";
 import WFileUpload from "@/components/W-FileUpload/index.vue";
 export default {
-  components: { UserSelector, ImgsUpload, Editor,WFileUpload },
+  components: { UserSelector, ImgsUpload, Editor, WFileUpload },
   dicts: ["hsggbsdj_role"],
   data() {
     return {
@@ -176,7 +176,7 @@ export default {
         "min-width": "300px",
         "word-break": "break-all",
       },
-      formFileListDefualtValue:[],
+      formFileListDefualtValue: [],
       id: null,
       isShow: false,
       formData: this.reset(),
@@ -255,7 +255,7 @@ export default {
         await gethsggbsdj(id).then((res) => {
           // this.formData.names = res.data.userNames.split(",");
           this.formData = res.data;
-          this.formFileListDefualtValue=res.data.images;
+          this.formFileListDefualtValue = res.data.images;
         });
       }
     },