Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/components/ImageUpload/index.vue

@@ -99,7 +99,7 @@
       </div>
     </el-upload>
 
-    <el-dialog
+    <DialogCom
       :visible.sync="dialogVisible"
       title="预览"
       width="800"
@@ -109,7 +109,7 @@
         :src="dialogImageUrl"
         style="display: block; max-width: 100%; margin: 0 auto"
       />
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/components/RightToolbar/index.vue

@@ -11,14 +11,14 @@
         <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
       </el-tooltip>
     </el-row>
-    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="550px" append-to-body>
       <el-transfer
         :titles="['显示', '隐藏']"
         v-model="value"
         :data="columns"
         @change="dataChange"
       ></el-transfer>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/components/elDialog/dialog.vue

@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <el-dialog v-bind="$attrs" v-on="$listeners" :close-on-click-modal="false">
+      <slot></slot>
+      <slot name="footer" class="dialog-footer"></slot>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: "SocWebDialog",
+
+  data() {
+    return {};
+  },
+
+  mounted() {},
+
+  methods: {},
+};
+</script>
+<style lang="scss">
+.dialog-footer {
+  text-align: right;
+}
+</style>

src/components/model/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <DialogCom
     ref="modal"
     :visible="visible"
     v-bind="_attrs"
@@ -35,7 +35,7 @@
       <slot :name="slotName"></slot>
     </template>
 
-  </el-dialog>
+  </DialogCom>
 </template>
 
 <script>

src/components/orgTreeSelect/index.vue

@@ -50,7 +50,7 @@
         :props="defaultProps"
         node-key="id"
         show-checkbox
-        check-strictly
+        :check-strictly="true"
         :expand-on-click-node="false"
         :default-checked-keys="nodes"
         @node-click="handleNodeClick"
@@ -80,6 +80,8 @@ export default {
   },
   data() {
     return {
+      //是否取消关联父子级
+      strictly: true,
       //清除图标
       showClearable: false,
       //弹窗显示
@@ -117,10 +119,19 @@ export default {
         });
       },
     },
+    checked: {
+      handler(v) {
+        if (v) {
+          this.strictly = false;
+        } else {
+          this.strictly = true;
+        }
+      },
+    },
     // queryForm: {
     //   deep: true,
     //   handler(n, o) {
-       
+
     //     if(!n.value&&!n.type){
     //       this.$refs.tree.filter({});
     //     }else{
@@ -146,8 +157,8 @@ export default {
       this.$emit("selectNode", JSON.stringify(this.sNodeList));
     },
     //筛选条件变化
-    serchTreeHandler(){
-      this.$refs.tree.filter(this.queryForm)
+    serchTreeHandler() {
+      this.$refs.tree.filter(this.queryForm);
     },
     /** 查询机构树 */
     getDeptTree() {
@@ -155,10 +166,12 @@ export default {
         this.orgTree = response.data;
       });
     },
-    filterNode(value,data,node){
-      
+    filterNode(value, data, node) {
       if (this.queryForm.value && this.queryForm.type) {
-        return data.name.indexOf(this.queryForm.value) !== -1 && data.type == this.queryForm.type;
+        return (
+          data.name.indexOf(this.queryForm.value) !== -1 &&
+          data.type == this.queryForm.type
+        );
       }
       if (this.queryForm.value) {
         return data.name.indexOf(this.queryForm.value) !== -1;
@@ -166,14 +179,33 @@ export default {
       if (this.queryForm.type) {
         return data.type == this.queryForm.type;
       }
-      return true
+      return true;
     },
-    
+
     handleNodeClick() {},
     onCheck(data, checked, tree) {
-      
-      this.sNodeList = this.$refs.tree.getCheckedNodes();
-      this.$emit("selectNode", JSON.stringify(this.sNodeList));
+      if (this.checked) {
+        //当前按过滤机构类型勾选
+
+        //递归查询
+        this.recursionTreeHandler(this.queryForm.type, [data]);
+      }
+      // debugger;
+      // this.sNodeList = this.$refs.tree.getCheckedNodes();
+      // this.$emit("selectNode", JSON.stringify(this.sNodeList));
+    },
+    recursionTreeHandler(type, tree) {
+      tree.forEach((item) => {
+        if (type == item.type) {
+          this.$refs.tree.setCheckedKeys([item.id])
+       
+        }
+      });
+      if (tree.children && tree.children.length > 0) {
+        this.recursionTreeHandler(type,tree.children)
+      } else {
+        return;
+      }
     },
     getSubOrgIdsByOrgType(topOrg, orgType, orgIdList) {
       if (!topOrg) return;

src/main.js

@@ -14,6 +14,7 @@ import './permission' // permission control
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
+
 import {
   parseTime,
   resetForm,
@@ -46,7 +47,8 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 // 下拉tree组件
 import TreeSelect from "@riophae/vue-treeselect";
-
+// elementui Dialog组件
+import DialogCom from '@/components/elDialog/dialog.vue'
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 //根据参数键名查询参数值
@@ -76,6 +78,7 @@ Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('ImageListPreview', ImageListPreview)
 Vue.component('TreeSelect', TreeSelect)
+Vue.component('DialogCom', DialogCom)
 
 Vue.use(directive)
 Vue.use(plugins)

src/views/core/accessPlan/index.vue

@@ -104,7 +104,7 @@
     </el-row>
 
     <!-- 添加或修改监控调阅计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="计划名称" prop="planName">
           <el-input v-model="form.planName" placeholder="请输入计划名称" />
@@ -166,7 +166,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/core/edu/plan/dialog.select.file.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <DialogCom
     title="选择学习附件"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
@@ -63,7 +63,7 @@
       <el-button @click="onHide">关闭</el-button>
       <el-button type="primary" @click="onSubmit">确定</el-button>
     </div>
-  </el-dialog>
+  </DialogCom>
 </template>
 <script>
 import GSearchTable from "@/components/table/gx.search.table.vue";

src/views/core/edu/plan/index.vue

@@ -135,7 +135,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" height="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="800px" height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -245,7 +245,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <DialogSelectFile
       ref="DialogSelectFile"
       :defaultSelect=defaultSelect

src/views/core/edu/task/dialog.info.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="edu-training-edit">
-        <el-dialog title="教育培训详情" :visible.sync="isShow" width="960px">
+        <DialogCom title="教育培训详情" :visible.sync="isShow" width="960px">
             <div class="page-body">
                 <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                     label-suffix=":">
@@ -132,7 +132,7 @@
             <div slot="footer" class="dialog-footer">
                 <el-button @click="onHide">关闭</el-button>
             </div>
-        </el-dialog>
+        </DialogCom>
     </div>
 </template>
 

src/views/core/edu/task/dialog.perform.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="edu-training-edit">
-    <el-dialog :title="'培训登记'" :visible.sync="isShow" width="960px">
+    <DialogCom :title="'培训登记'" :visible.sync="isShow" width="960px">
       <div class="page-body">
         <el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
           label-width="120px" label-prefix=":">
@@ -159,7 +159,7 @@
         <el-button type="primary" @click="onSave">暂存</el-button>
         <el-button type="primary" @click="onSubmit">提交</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/core/edu/task/index.vue

@@ -127,7 +127,7 @@
   </el-col>
   </el-row>
     <!-- 添加或修改教育任务对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <!-- <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="教育培训计划Id" prop="planId">
           <el-input v-model="form.planId" placeholder="请输入教育培训计划Id" />
@@ -212,7 +212,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog> -->
+    </DialogCom> -->
 
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
     <dialog-perform ref="performDialog" @success="handleQuery(true)"></dialog-perform>

src/views/core/knowledge/index.vue

@@ -95,7 +95,7 @@
     />
 
     <!-- 添加或修改知识库标签对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标签名称" prop="name">
           <el-input type="text" v-model="form.name" placeholder="请输入标签名称" maxlength="50" show-word-limit/>
@@ -105,7 +105,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/core/materials/index.vue

@@ -164,7 +164,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="资料标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入资料标题"  maxlength="50" show-word-limit/>
@@ -190,7 +190,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/core/task/dialog.info.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="edu-training-edit">
-        <el-dialog title="调阅详情" :visible.sync="isShow" width="960px">
+        <DialogCom title="调阅详情" :visible.sync="isShow" width="960px">
             <div class="page-body">
                 <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                     label-suffix=":">
@@ -81,7 +81,7 @@
             <div slot="footer" class="dialog-footer">
                 <el-button @click="onHide">关闭</el-button>
             </div>
-        </el-dialog>
+        </DialogCom>
     </div>
 </template>
 

src/views/monitor/job/index.vue

@@ -152,7 +152,7 @@
     />
 
     <!-- 添加或修改定时任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -234,14 +234,14 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
 
-    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
+    <DialogCom title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
       <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
-    </el-dialog>
+    </DialogCom>
 
     <!-- 任务日志详细 -->
-    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
+    <DialogCom title="任务详细" :visible.sync="openView" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -286,7 +286,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="openView = false">关 闭</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/monitor/job/log.vue

@@ -144,7 +144,7 @@
     />
 
     <!-- 调度日志详细 -->
-    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+    <DialogCom title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -175,7 +175,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="open = false">关 闭</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/resumption/plan/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑履职计划' : '新增履职计划'"
       :visible.sync="isShow"
       width="1500px"
@@ -202,7 +202,7 @@
         <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <DialogSelect
           ref="DialogSelect"
           :defaultSelect=defaultSelect

src/views/resumption/plan/distribute.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <DialogCom
     title="选择下发机构状态"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
@@ -62,7 +62,7 @@
       <el-button @click="onHide">关闭</el-button>
       <el-button type="primary" @click="onSubmit">确定</el-button>
     </div>
-  </el-dialog>
+  </DialogCom>
 </template>
 <script>
 import { listByTypes } from "@/api/system/org.js";

src/views/resumption/protection/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑防区' : '新增防区'"
       :visible.sync="isShow"
       @close="onHide"
@@ -48,7 +48,7 @@
         <el-button @click="isShow=false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/resumption/protection/dialog.history.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="device-info">
-    <el-dialog
+    <DialogCom
       title="布防历史"
       :visible.sync="isShow"
       width="600px"
@@ -64,7 +64,7 @@
         <!-- <el-button @click="onHide">取消</el-button>
           <el-button type="primary" @click="onSubmit">确定</el-button> -->
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/resumption/rule/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑履职内容库定义' : '新增履职内容库定义'"
       :visible.sync="isShow"
       @close="onHide"
@@ -87,7 +87,7 @@
         <el-button @click="isShow=false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="!formData.id ? '新增履职项' : '编辑履职项'"
       :visible.sync="dialogVisible"
       width="50%"
@@ -59,7 +59,7 @@
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
       </span>
-    </el-dialog>
+    </DialogCom>
     <EditPoint
       ref="editDialog"
       @submit="onPointSubmit"

src/views/resumption/ruleManager/dialog.editPoint.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       width="600px"
       :title="index >= 0 ? '编辑履职内容' : '新增履职内容'"
       :visible.sync="dataVisible"
@@ -82,7 +82,7 @@
           index >= 0 ? "保 存" : "添 加"
         }}</el-button>
       </span>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/resumption/ruleManager/dialog.select.point.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <DialogCom
     title="选择检查要点"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
@@ -62,7 +62,7 @@
       <el-button @click="onHide">关闭</el-button>
       <el-button type="primary" @click="onSubmit">确定</el-button>
     </div>
-  </el-dialog>
+  </DialogCom>
 </template>
 <script>
 import GSearchTable from "@/components/table/gx.search.table.vue";
@@ -122,7 +122,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.el-dialog-div {
+.DialogCom-div {
   overflow: auto;
 }
 </style>

src/views/resumption/taskManager/dialog.detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+    <DialogCom
       :title="title + '详情'"
       :visible.sync="isShow"
       width="1200px"
@@ -94,7 +94,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">取消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/resumption/taskManager/dialog.scanrecord.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+    <DialogCom
       title="扫描记录"
       :visible.sync="isShow"
       width="800px"
@@ -62,7 +62,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">取消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/system/area/index.vue

@@ -116,7 +116,7 @@
     />
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="区域名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入区域名称" />
@@ -141,7 +141,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/bind/index.vue

@@ -102,7 +102,7 @@
 
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="30">
@@ -152,7 +152,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/check/index.vue

@@ -84,7 +84,7 @@
 
 
     <!-- 添加或修改区域采集点对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="16">
@@ -111,7 +111,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/config/index.vue

@@ -145,7 +145,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />
@@ -173,7 +173,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/dept/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑' : '新增离行式自助银行'"
       :visible.sync="isShow"
       width="800px"
@@ -209,9 +209,9 @@
         <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
 
-    <el-dialog
+    <DialogCom
       :title="orgtitle"
       :visible.sync="orgopen"
       width="500px"
@@ -270,7 +270,7 @@
         <el-button type="primary" @click="submitOrgForm">确 定</el-button>
         <el-button @click="orgcancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/dept/extend.vue

@@ -648,7 +648,7 @@
       >
     </div>
     <!-- 添加或修改业务库物防建设对话框 -->
-    <el-dialog
+    <DialogCom
       :title="Businesstitle"
       :visible.sync="Businessopen"
       width="500px"
@@ -716,9 +716,9 @@
         <el-button type="primary" @click="submitBusinessForm">确 定</el-button>
         <el-button @click="Businesscancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <!-- 添加或修改银行物防建设对话框 -->
-    <el-dialog
+    <DialogCom
       :title="Banktitle"
       :visible.sync="Bankopen"
       width="500px"
@@ -790,9 +790,9 @@
         <el-button type="primary" @click="submitBankForm">确 定</el-button>
         <el-button @click="Bankcancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
 
-    <el-dialog
+    <DialogCom
       :title="orgtitle"
       :visible.sync="orgopen"
       width="500px"
@@ -856,9 +856,9 @@
         <el-button type="primary" @click="submitOrgForm">确 定</el-button>
         <el-button @click="orgcancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <!-- 添加或修改离行物防建设对话框 -->
-    <el-dialog
+    <DialogCom
       :title="detachedtitle"
       :visible.sync="detachedopen"
       width="500px"
@@ -930,7 +930,7 @@
         <el-button type="primary" @click="submitdetachedForm">确 定</el-button>
         <el-button @click="detachedcancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/dept/index.vue

@@ -211,7 +211,7 @@
     </el-row>
 
     <!-- 添加或修改机构对话框 -->
-    <el-dialog
+    <DialogCom
       :title="title"
       :visible.sync="open"
       width="600px"
@@ -332,7 +332,7 @@
         >
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <DialogEdit ref="dialogEdit" @success="refs"></DialogEdit>
   </div>
 </template>

src/views/system/device/index.vue

@@ -105,7 +105,7 @@
 
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open"  width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="10">
@@ -189,7 +189,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
 
   </div>
 </template>
@@ -199,6 +199,7 @@ import tableList from '@/mixins/tableList'
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
+
 import { listDevice, getDevice, delDevice, addDevice, updateDevice, getHostByOrgId } from "@/api/system/device";
 export default {
   /** 引入基础minxins*/
@@ -305,7 +306,7 @@ export default {
     }
   },
   methods: {
-
+   
     /** 下穿状态改变*/
     changeCheckBox() {
       this.getList();

src/views/system/dict/data.vue

@@ -141,7 +141,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
@@ -185,7 +185,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/dict/index.vue

@@ -154,7 +154,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
@@ -179,7 +179,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/information/index.vue

@@ -225,7 +225,7 @@
     />
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="用户ID" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入用户ID" />
@@ -292,7 +292,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/menu/index.vue

@@ -176,7 +176,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
@@ -409,7 +409,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/notice/index.vue

@@ -123,7 +123,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -165,7 +165,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/operlog/index.vue

@@ -147,7 +147,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <DialogCom title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -189,7 +189,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="open = false">关 闭</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/post/index.vue

@@ -124,7 +124,7 @@
     />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="岗位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入岗位名称" />
@@ -152,7 +152,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/role/index.vue

@@ -96,7 +96,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -150,10 +150,10 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
@@ -182,7 +182,7 @@
         <el-button type="primary" @click="submitDataScope">确 定</el-button>
         <el-button @click="cancelDataScope">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/role/selectUser.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 授权用户 -->
-  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <DialogCom title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="用户名称" prop="username">
         <el-input
@@ -51,7 +51,7 @@
       <el-button type="primary" @click="handleSelectUser">确 定</el-button>
       <el-button @click="visible = false">取 消</el-button>
     </div>
-  </el-dialog>
+  </DialogCom>
 </template>
 
 <script>

src/views/system/user/extend.vue

@@ -701,6 +701,7 @@ export default {
 .demo-form-inline {
 }
 .dialog-footer {
+  
 }
 .container {
 }

src/views/system/user/index.vue

@@ -137,7 +137,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="10">
@@ -216,10 +216,10 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <DialogCom :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
@@ -238,7 +238,7 @@
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/user/profile/userAvatar.vue

@@ -3,7 +3,7 @@
     <div class="user-info-head" @click="editCropper()">
       <img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" />
     </div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+    <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
 
@@ -52,7 +52,7 @@
           <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
         </el-col>
       </el-row>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/workTimeSet/dialog.add.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="question-infos">
-    <el-dialog title="新增作息" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
+    <DialogCom title="新增作息" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
       custom-class="gxDialog" width="75%" append-to-body>
 <!--      <div class="p-5 work-time">-->
         <el-form label-width="90px" label-suffix=":" label-position="right">
@@ -121,7 +121,7 @@
         <el-button @click="handleClose">取消</el-button>
         <btn-tip tip="确定要提交吗?" type="primary" @click="onSubmit">保存</btn-tip>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/system/workTimeSet/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="question-infos">
-    <el-dialog title="编辑作息" @close="handleClose" :visible="show" width="800px">
+    <DialogCom title="编辑作息" @close="handleClose" :visible="show" width="800px">
       <div class="page-body">
         <el-form :model="formData" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
@@ -99,7 +99,7 @@
         <el-button @click="handleClose">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/system/workTimeSet/dialog.template.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="question-infos">
-    <el-dialog :title="title" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
+    <DialogCom :title="title" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
       custom-class="gxDialog" width="75%"  append-to-body>
 <!--      <div class="p-5 work-time-modify">-->
         <el-form
@@ -121,9 +121,9 @@
         <el-button @click="handleClose">取消</el-button>
         <btn-tip tip="确定要提交吗?" type="primary" @click="onSubmit">保存</btn-tip>
       </div>
-    </el-dialog>
+    </DialogCom>
 
-    <el-dialog
+    <DialogCom
         title="提示"
         :visible="centerDialogVisible"
         width="25%"
@@ -134,9 +134,9 @@
         <el-button @click="submitData(0)">不覆盖</el-button>
         <el-button type="primary" @click="submitData(1)">覆盖</el-button>
       </span>
-    </el-dialog>
+    </DialogCom>
 
-    <el-dialog
+    <DialogCom
         title="提示"
         :visible="centerDialogVisiblea"
         width="25%"
@@ -147,7 +147,7 @@
         <el-button @click="handleClose()">取消</el-button>
         <el-button type="primary" @click="checkDataMsg(1)">提交</el-button>
       </span>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/tool/build/CodeTypeDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+    <DialogCom
       v-bind="$attrs"
       width="500px"
       :close-on-click-modal="false"
@@ -45,7 +45,7 @@
           确定
         </el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/tool/build/IconsDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="icon-dialog">
-    <el-dialog
+    <DialogCom
       v-bind="$attrs"
       width="980px"
       :modal-append-to-body="false"
@@ -30,7 +30,7 @@
           <div>{{ icon }}</div>
         </li>
       </ul>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/tool/build/TreeNodeDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+    <DialogCom
       v-bind="$attrs"
       :close-on-click-modal="false"
       :modal-append-to-body="false"
@@ -67,7 +67,7 @@
           取消
         </el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 <script>

src/views/tool/gen/importTable.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <DialogCom title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input
@@ -43,7 +43,7 @@
       <el-button type="primary" @click="handleImportTable">确 定</el-button>
       <el-button @click="visible = false">取 消</el-button>
     </div>
-  </el-dialog>
+  </DialogCom>
 </template>
 
 <script>

src/views/tool/gen/index.vue

@@ -158,7 +158,7 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+    <DialogCom :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
@@ -170,7 +170,7 @@
           <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
         </el-tab-pane>
       </el-tabs>
-    </el-dialog>
+    </DialogCom>
     <import-table ref="import" @ok="handleQuery" />
   </div>
 </template>