更新vue文件

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -82,12 +82,12 @@
 
     <select id="checkRoleNameUnique" parameterType="java.lang.String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_name=#{roleName} and del_flag = '0' limit 1
+        where r.role_name=#{roleName} and r.del_flag = '0' limit 1
     </select>
 
     <select id="checkRoleKeyUnique" parameterType="java.lang.String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_key=#{roleKey} and del_flag = '0' limit 1
+        where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
     </select>
 
     <insert id="insertRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole" useGeneratedKeys="true"

ruoyi-ui/.env.development

@@ -2,11 +2,7 @@
 ENV = 'development'
 
 # 若依管理系统/开发环境
-#VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.101.11:8080'
+VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-
-#端口
-port = 8089

ruoyi-ui/src/components/Editor/WEditor.vue

@@ -21,52 +21,57 @@
       };
     },
     mounted() {
-      const editor = new wangEditor(`#wangEditorId`);
-      // 配置 onchange 回调函数，将数据同步到 vue 中
-      editor.config.onchange = (newHtml) => {
-        this.editorData = newHtml;
-        this.$emit("editorContent", newHtml);
-      };
-      editor.config.uploadImgServer = settings.apiUrl + '/file/upload'
-      editor.config.uploadFileName = 'files';
-      editor.config.uploadImgHooks = {
-        // 图片上传并返回了结果，图片插入已成功
-        success: function (xhr) {
-          console.log('success', xhr)
-        },
-        // 图片上传并返回了结果，但图片插入时出错了
-        fail: function (xhr, editor, resData) {
-          console.log('fail', resData)
-          this.$message.error("文件上传失败")
-        },
-        // 上传图片出错，一般为 http 请求的错误
-        error: function (xhr, editor, resData) {
-          console.log('error', xhr, resData)
-          this.$message.error("文件上传失败")
-        },
-        // 上传图片超时
-        timeout: function (xhr) {
-          console.log('timeout')
-        },
-        // 图片上传并返回了结果，想要自己把图片插入到编辑器中
-        // 例如服务器端返回的不是 { errno: 0, data: [...] } 这种格式，可使用 customInsert
-        customInsert: function (insertImgFn, result) {
-          if (result.data.length > 0) {
-            // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
-            insertImgFn(result.data[0].url)
-          } else {
-            this.$message.error("文件上传失败")
-          }
-          // result 即服务端返回的接口
-          console.log('customInsert', result)
-        }
-      };
-      // 创建编辑器
-      editor.create();
-      editor.txt.html(this.value)
-      this.editor = editor;
+      setTimeout(() => {
+        this.init()
+      })
     },
     methods: {
+      init(){
+        const editor = new wangEditor(`#wangEditorId`);
+        // 配置 onchange 回调函数，将数据同步到 vue 中
+        editor.config.onchange = (newHtml) => {
+          this.editorData = newHtml;
+          this.$emit("editorContent", newHtml);
+        };
+        editor.config.uploadImgServer = settings.apiUrl + '/file/upload'
+        editor.config.uploadFileName = 'files';
+        editor.config.uploadImgHooks = {
+          // 图片上传并返回了结果，图片插入已成功
+          success: function (xhr) {
+            console.log('success', xhr)
+          },
+          // 图片上传并返回了结果，但图片插入时出错了
+          fail: function (xhr, editor, resData) {
+            console.log('fail', resData)
+            this.$message.error("文件上传失败")
+          },
+          // 上传图片出错，一般为 http 请求的错误
+          error: function (xhr, editor, resData) {
+            console.log('error', xhr, resData)
+            this.$message.error("文件上传失败")
+          },
+          // 上传图片超时
+          timeout: function (xhr) {
+            console.log('timeout')
+          },
+          // 图片上传并返回了结果，想要自己把图片插入到编辑器中
+          // 例如服务器端返回的不是 { errno: 0, data: [...] } 这种格式，可使用 customInsert
+          customInsert: function (insertImgFn, result) {
+            if (result.data.length > 0) {
+              // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
+              insertImgFn(result.data[0].url)
+            } else {
+              this.$message.error("文件上传失败")
+            }
+            // result 即服务端返回的接口
+            console.log('customInsert', result)
+          }
+        };
+        // 创建编辑器
+        editor.create();
+        editor.txt.html(this.value)
+        this.editor = editor;
+      },
       getEditorData() {
         // 通过代码获取编辑器内容
         let data = this.editor.txt.html();
@@ -82,6 +87,7 @@
 </script>
 
 <style lang="css" scoped>
+ 
   .home {
     width: 100%;
     margin: auto;

ruoyi-ui/src/components/Editor/WEditors.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="home">
+    <div id="wangEditorId"></div>
+  </div>
+
+</template>
+
+<script>
+  // 引入 wangEditor
+  import wangEditor from "wangeditor";
+  import settings from '../../settings'
+
+  export default {
+    props: {
+      value: ''
+    },
+    data() {
+      return {
+        editor: null,
+        editorData: "",
+      };
+    },
+    mounted() {
+      setTimeout(() => {
+        this.init()
+      })
+    },
+    methods: {
+      init(){
+        const editor = new wangEditor(`#wangEditorId`);
+        // 配置 onchange 回调函数，将数据同步到 vue 中
+        editor.config.onchange = (newHtml) => {
+          this.editorData = newHtml;
+          this.$emit("editorContent", newHtml);
+        };
+        editor.config.uploadImgServer = settings.apiUrl + '/file/upload'
+        editor.config.uploadFileName = 'files';
+        editor.config.uploadImgHooks = {
+          // 图片上传并返回了结果，图片插入已成功
+          success: function (xhr) {
+            console.log('success', xhr)
+          },
+          // 图片上传并返回了结果，但图片插入时出错了
+          fail: function (xhr, editor, resData) {
+            console.log('fail', resData)
+            this.$message.error("文件上传失败")
+          },
+          // 上传图片出错，一般为 http 请求的错误
+          error: function (xhr, editor, resData) {
+            console.log('error', xhr, resData)
+            this.$message.error("文件上传失败")
+          },
+          // 上传图片超时
+          timeout: function (xhr) {
+            console.log('timeout')
+          },
+          // 图片上传并返回了结果，想要自己把图片插入到编辑器中
+          // 例如服务器端返回的不是 { errno: 0, data: [...] } 这种格式，可使用 customInsert
+          customInsert: function (insertImgFn, result) {
+            if (result.data.length > 0) {
+              // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
+              insertImgFn(result.data[0].url)
+            } else {
+              this.$message.error("文件上传失败")
+            }
+            // result 即服务端返回的接口
+            console.log('customInsert', result)
+          }
+        };
+        // 创建编辑器
+        editor.create();
+        editor.txt.html(this.value)
+        this.editor = editor;
+      },
+      getEditorData() {
+        // 通过代码获取编辑器内容
+        let data = this.editor.txt.html();
+        alert(data);
+      },
+    },
+    beforeDestroy() {
+      // 调用销毁 API 对当前编辑器实例进行销毁
+      this.editor.destroy();
+      this.editor = null;
+    },
+  };
+</script>
+
+<style lang="css" scoped>
+  /deep/ .w-e-text-container{
+    height: 600px!important;
+  }
+  .home {
+    width: 100%;
+    margin: auto;
+    position: relative;
+  }
+
+    .home h3 {
+    margin: 30px 0 15px;
+  }
+</style>

ruoyi-ui/src/settings.js

@@ -28,8 +28,7 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
+  // apiUrl: 'http://192.168.101.11:8080'
 
-  // apiUrl: 'http://36.7.89.102:8080'
-  // apiUrl: 'http://192.168.101.226:8080'
-   apiUrl: 'http://192.168.101.11:8080'
+  apiUrl: 'http://36.7.89.102:8080'
 }

ruoyi-ui/src/utils/generator/html.js

@@ -5,7 +5,7 @@ let confGlobal
 let someSpanIsNot24
 
 export function dialogWrapper(str) {
-  return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Titile">
+  return ` <el-dialog :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Titile">
     ${str}
     <div slot="footer">
       <el-button @click="close">取消</el-button>

ruoyi-ui/src/views/gallery/gallery/index.vue

@@ -106,10 +106,10 @@
     />
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :draggable="true" width="90%" append-to-body class="gallery">
+     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" :draggable="true" width="90%" append-to-body class="gallery">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col span="12">
+          <el-col span="8">
             <el-form-item label="分类" prop="categoryId">
               <treeselect
                 v-model="form.categoryId"
@@ -129,7 +129,7 @@
 <!--              </el-select>-->
 <!--            </el-form-item>-->
           </el-col>
-          <el-col span="12">
+          <el-col span="8">
             <!--            <el-form-item label="名称" prop="name">-->
             <!--              <el-input v-model="form.name" placeholder="请输入名称" :readonly="look"/>-->
             <!--            </el-form-item>-->
@@ -137,27 +137,25 @@
               <el-input v-model="form.cnName" placeholder="请输入中文名称" :readonly="look"/>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col span="12">
+          <el-col span="8">
             <el-form-item label="俗名" prop="ptName">
               <el-input v-model="form.ptName" placeholder="请输入俗名" :readonly="look"/>
             </el-form-item>
           </el-col>
-          <el-col span="12">
+        </el-row>
+
+        <el-row>
+          <el-col span="8">
             <el-form-item label="分布" prop="distribution">
               <el-input v-model="form.distribution" placeholder="请输入分布" :readonly="look"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="form.category === 'PEST'">
-          <el-col span="12">
+          <el-col span="8" v-if="form.category === 'PEST'">
             <el-form-item label="拉丁名" prop="latinName">
               <el-input v-model="form.latinName" class="latin-name" placeholder="请输入拉丁名" :readonly="look"/>
             </el-form-item>
           </el-col>
-          <el-col span="12">
+          <el-col span="8" v-if="form.category === 'PEST'">
             <el-form-item label="寄主" prop="host">
               <el-input v-model="form.host" placeholder="请输入寄主" :readonly="look"/>
             </el-form-item>
@@ -213,7 +211,7 @@
         </el-col>
         <el-table
           :data="form.imgInfos"
-          height="250"
+          height="420"
           border
           style="width: 100%"
         >
@@ -597,7 +595,9 @@
           this.form.imgInfos.push({
             url: datum.url,
             id: datum.fileId,
-            location: datum.detail.location
+            location: datum.detail.location,
+            watermarkType: 'NONE',
+            watermarkColor: 'RED',
           });
         }
       },

ruoyi-ui/src/views/gallery/img/index.vue

@@ -155,7 +155,7 @@
     />
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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="thumbId">
           <el-input v-model="form.thumbId" placeholder="请输入图片id"/>

ruoyi-ui/src/views/gallery/pic/index.vue

@@ -42,7 +42,6 @@
             size="mini"
             type="text"
             icon="el-icon-help"
-            v-hasPermi="['system:pic:query']"
             @click="handleUpdate(scope.row)"
           >查看
           </el-button>
@@ -50,7 +49,6 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['system:pic:remove']"
             @click="handleDel(scope.row)"
           >删除
           </el-button>
@@ -67,7 +65,7 @@
     />
 
     <!-- 添加或修改图来图往对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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="concat">
           <span>{{ form.concat }}</span>
@@ -88,7 +86,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>

ruoyi-ui/src/views/monitor/job/index.vue

@@ -133,7 +133,7 @@
     />
 
     <!-- 添加或修改定时任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -211,7 +211,7 @@
     </el-dialog>
 
     <!-- 任务日志详细 -->
-    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
+     <el-dialog :close-on-click-modal="false" 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">

ruoyi-ui/src/views/monitor/job/log.vue

@@ -128,7 +128,7 @@
     />
 
     <!-- 调度日志详细 -->
-    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+     <el-dialog :close-on-click-modal="false" 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">

ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -140,7 +140,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+     <el-dialog :close-on-click-modal="false" 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">

ruoyi-ui/src/views/story/index.vue

@@ -97,7 +97,7 @@
     />
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body class="story_container">
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body class="story_container">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题"/>

ruoyi-ui/src/views/system/banner/index.vue

@@ -64,7 +64,7 @@
     />
 
     <!-- 添加或修改轮播图对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="banner">
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body class="banner">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="类型" prop="category">
           <el-select v-model="form.type" placeholder="请选择分类" style="width: 100%;">

ruoyi-ui/src/views/system/comment/index.vue

@@ -78,7 +78,7 @@
     />
 
     <!-- 添加或修改评论信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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 v-model="form.name" placeholder="请输入评论人名称" readonly/>

ruoyi-ui/src/views/system/comment/picture.vue

@@ -78,7 +78,7 @@
     />
 
     <!-- 添加或修改评论信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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 v-model="form.name" placeholder="请输入评论人名称" readonly/>

ruoyi-ui/src/views/system/config/index.vue

@@ -142,7 +142,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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="请输入参数名称" />

ruoyi-ui/src/views/system/dept/index.vue

@@ -83,7 +83,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">

ruoyi-ui/src/views/system/dict/data.vue

@@ -120,7 +120,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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" />

ruoyi-ui/src/views/system/dict/index.vue

@@ -153,7 +153,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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="请输入字典名称" />

ruoyi-ui/src/views/system/menu/index.vue

@@ -87,7 +87,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">

ruoyi-ui/src/views/system/notice/index.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="app-container" style="margin: 20px">
+  <div class="app-container fwbs" style="margin: 20px">
 
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-row>
         <el-form-item label="公告类型" prop="noticeType">
-          <el-select v-model="form.noticeType" placeholder="请选择" style="width: 100%" @change="onNoticeTypeChange">
+          <el-select v-model="form.noticeType" style="width: 100%;" placeholder="请选择" @change="onNoticeTypeChange" popper-class="selects">
             <el-option
               v-for="dict in typeOptions"
               :key="dict.dictValue"
@@ -16,7 +16,7 @@
 
         <el-col :span="24">
           <el-form-item label="内容">
-            <editor v-model="form.noticeContent" :min-height="192"/>
+            <WEditor ref="editorElem" v-if="flags" @editorContent="editorContentChange" :value="form.noticeContent" id="editorElem" style="text-align:left;"></WEditor>
           </el-form-item>
         </el-col>
       </el-row>
@@ -29,12 +29,12 @@
 
 <script>
   import {listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice} from "@/api/system/notice";
-  import Editor from '@/components/Editor';
+  import WEditor from '@/components/Editor/WEditors'
 
   export default {
     name: "Notice",
     components: {
-      Editor
+      WEditor
     },
     data() {
       return {
@@ -48,6 +48,7 @@
         multiple: true,
         // 显示搜索条件
         showSearch: true,
+        flags: false,
         // 总条数
         total: 0,
         // 公告表格数据
@@ -69,7 +70,9 @@
           status: undefined
         },
         // 表单参数
-        form: {},
+        form: {
+          noticeContent: '',
+        },
         // 表单校验
         rules: {
           noticeType: [
@@ -79,11 +82,10 @@
       };
     },
     created() {
-
       this.getList((data) => {
         if (data.length > 0) {
           this.form = JSON.parse(JSON.stringify(data[0]));
-          console.log(data)
+          this.flags = true
         }
 
         let $route = this.$route;
@@ -106,6 +108,9 @@
       });
     },
     methods: {
+      editorContentChange(value) {
+        this.form.noticeContent = value;
+      },
       /** 查询公告列表 */
       getList(callback) {
         listNotice(this.queryParams).then(response => {
@@ -116,7 +121,6 @@
       onNoticeTypeChange() {
         let noticeType = this.form.noticeType;
         console.log('noticeType............' + noticeType)
-        console.log(this.noticeList)
         let changed = false;
         for (let i in this.noticeList) {
           let item = this.noticeList[i];
@@ -127,7 +131,7 @@
           }
         }
         if (!changed) {
-          this.form = {noticeType: noticeType};
+          this.form = {noticeType: noticeType,noticeContent:　''};
         }
       },
       // 公告状态字典翻译
@@ -221,3 +225,8 @@
     }
   };
 </script>
+<style lang="scss">
+  .selects{
+    z-index: 20003!important;
+  }
+</style>

ruoyi-ui/src/views/system/notice/index_backup.vue

@@ -126,7 +126,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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">

ruoyi-ui/src/views/system/post/index.vue

@@ -118,7 +118,7 @@
     />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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="请输入岗位名称" />

ruoyi-ui/src/views/system/role/index.vue

@@ -154,7 +154,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -200,7 +200,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :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" />

ruoyi-ui/src/views/system/user/index.vue

@@ -199,7 +199,7 @@
     </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -305,7 +305,7 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"

ruoyi-ui/src/views/system/user/profile/userAvatar.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <img v-bind:src="options.img" @click="editCropper()" title="点击上传头像" class="img-circle img-lg" />
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
+     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <vue-cropper

ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+     <el-dialog
       v-bind="$attrs"
       width="500px"
       :close-on-click-modal="false"

ruoyi-ui/src/views/tool/build/IconsDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="icon-dialog">
-    <el-dialog
+     <el-dialog :close-on-click-modal="false"
       v-bind="$attrs"
       width="980px"
       :modal-append-to-body="false"

ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+     <el-dialog
       v-bind="$attrs"
       :close-on-click-modal="false"
       :modal-append-to-body="false"

ruoyi-ui/src/views/tool/gen/importTable.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+   <el-dialog :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input

ruoyi-ui/src/views/tool/gen/index.vue

@@ -157,7 +157,7 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
+     <el-dialog :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"

ruoyi-ui/vue.config.js

@@ -16,7 +16,8 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为
+  // /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
@@ -34,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //target: `http://36.7.89.102:8080`,
-        target: `http://192.168.101.11:8080`,
+        target: `http://36.7.89.102:8080`,
+        // target: `http://192.168.101.11:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''