From f1b424ff1d1bb4e9690b62f9d6133b67dffdc369 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Mon, 29 Apr 2024 16:17:24 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Encoding/index.vue             |  87 +++++++++++++
 src/components/muyu/Doc/index.vue             |  21 ----
 src/components/muyu/Git/index.vue             |  21 ----
 src/store/modules/user.js                     |   4 +-
 .../auth/AuthDataSource.vue                   |   4 +-
 .../assetAuthorization/auth/AuthTable.vue     |   4 +-
 src/views/dataAssets/dataAccess/index.vue     |  20 +++
 src/views/login.vue                           |   2 +-
 src/views/register.vue                        |   2 +-
 src/views/ruleEngine/engineConfig/codeData.js |   0
 src/views/ruleEngine/engineConfig/index.vue   | 114 ++++++------------
 src/views/system/user/index.vue               |  10 +-
 12 files changed, 154 insertions(+), 135 deletions(-)
 create mode 100644 src/components/Encoding/index.vue
 delete mode 100644 src/components/muyu/Doc/index.vue
 delete mode 100644 src/components/muyu/Git/index.vue
 create mode 100644 src/views/ruleEngine/engineConfig/codeData.js

diff --git a/src/components/Encoding/index.vue b/src/components/Encoding/index.vue
new file mode 100644
index 0000000..9f9cc2b
--- /dev/null
+++ b/src/components/Encoding/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <div class="code-edit">
+      <codemirror ref="codeMirror" :value="code" :options="cmOptions" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { codemirror } from 'vue-codemirror'
+import 'codemirror/mode/clike/clike';
+// cm-setting.js
+// 组件样式
+import 'codemirror/lib/codemirror.css';
+// 主题
+import 'codemirror/theme/eclipse.css';
+// import 'codemirror/theme/monokai.css';
+
+// html代码高亮
+import 'codemirror/mode/htmlmixed/htmlmixed.js';
+
+// 语言模式
+import 'codemirror/mode/javascript/javascript.js';
+import 'codemirror/mode/css/css.js';
+import 'codemirror/mode/xml/xml.js';
+// 代码展开折叠
+import 'codemirror/addon/fold/foldcode.js';
+import 'codemirror/addon/fold/foldgutter.js';
+import 'codemirror/addon/fold/foldgutter.css';
+import 'codemirror/addon/fold/brace-fold.js';
+export default {
+  components: {
+    codemirror,
+  },
+  props: {
+    value: {
+      default: "",
+      type: String
+    },
+    readOnly: {
+      default: false,
+      type: Boolean
+    }
+  },
+  name: "Encoding",
+  data() {
+    return {
+      codemirror: null,
+      code: this.value,
+      cmOptions: {
+        autoRefresh: true, // 重点是这句，为true
+        value: '', // 初始内容
+        mode: 'text/x-java', //实现Java代码高亮
+        tabSize: 4, // tab的空格宽度
+        styleActiveLine: true, // 设置光标所在行高亮true/false
+        lineNumbers: true, //显示行号
+        contentHeight: 800,
+        theme: 'eclipse', //设置主题cobalt/monokai
+        // json: true,
+        readOnly: this.readOnly, // 设置为只读true/false;也可设置为"nocursor"失去焦点
+        lineWrapping: false,
+        foldGutter: true,
+        gutters: [
+          'CodeMirror-lint-markers', //代码错误检测
+          'CodeMirror-linenumbers',
+          'CodeMirror-foldgutter', //展开折叠
+        ],
+      },
+    }
+  },
+  created() {
+  },
+  methods: {}
+}
+</script>
+
+<style>
+
+.CodeMirror {
+  font-family: 'JetBrainsMono-Medium', monospace;
+  height: auto;
+}
+
+.CodeMirror-lines {
+  line-height: 1.5; /* 这里的1.5是示例，表示行间距是字体大小的1.5倍 */
+}
+</style>
diff --git a/src/components/muyu/Doc/index.vue b/src/components/muyu/Doc/index.vue
deleted file mode 100644
index 92d4952..0000000
--- a/src/components/muyu/Doc/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="question" @click="goto"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'MuYuDoc',
-  data() {
-    return {
-      url: 'http://doc.muyu.vip/muyu-cloud'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
diff --git a/src/components/muyu/Git/index.vue b/src/components/muyu/Git/index.vue
deleted file mode 100644
index be0f9bd..0000000
--- a/src/components/muyu/Git/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div>
-    <svg-icon icon-class="github" @click="goto"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'MuYuGit',
-  data() {
-    return {
-      url: 'https://gitee.com/y_project/MuYu-Cloud'
-    }
-  },
-  methods: {
-    goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1e3449e..56b0fd2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -75,7 +75,7 @@ const user = {
               "userId": 1,
               "deptId": 103,
               "userName": "admin",
-              "nickName": "智能车联",
+              "nickName": "数据处理",
               "email": "ry@163.com",
               "phonenumber": "15888888888",
               "sex": "1",
@@ -95,7 +95,7 @@ const user = {
                 "ancestors": "0,100,101",
                 "deptName": "研发部门",
                 "orderNum": 1,
-                "leader": "智能车联",
+                "leader": "数据处理",
                 "phone": null,
                 "email": null,
                 "status": "0",
diff --git a/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue b/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue
index 9718306..46e1504 100644
--- a/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue
+++ b/src/views/dataAssets/assetAuthorization/auth/AuthDataSource.vue
@@ -314,7 +314,7 @@ export default {
           "userId": 1,
           "deptId": 103,
           "userName": "admin",
-          "nickName": "智能车联",
+          "nickName": "数据处理",
           "email": "ry@163.com",
           "phonenumber": "15888888888",
           "isAuth": true,
@@ -331,7 +331,7 @@ export default {
           "userId": 2,
           "deptId": 105,
           "userName": "ry",
-          "nickName": "智能车联",
+          "nickName": "数据处理",
           "email": "ry@qq.com",
           "phonenumber": "15666666666",
           "dept": {
diff --git a/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue b/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue
index 797af85..fc427d8 100644
--- a/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue
+++ b/src/views/dataAssets/assetAuthorization/auth/AuthTable.vue
@@ -332,7 +332,7 @@ export default {
           "userId": 1,
           "deptId": 103,
           "userName": "admin",
-          "nickName": "智能车联",
+          "nickName": "数据处理",
           "email": "ry@163.com",
           "phonenumber": "15888888888",
           "isAuth": true,
@@ -349,7 +349,7 @@ export default {
           "userId": 2,
           "deptId": 105,
           "userName": "ry",
-          "nickName": "智能车联",
+          "nickName": "数据处理",
           "email": "ry@qq.com",
           "phonenumber": "15666666666",
           "dept": {
diff --git a/src/views/dataAssets/dataAccess/index.vue b/src/views/dataAssets/dataAccess/index.vue
index 1e0eeb1..4a7636e 100644
--- a/src/views/dataAssets/dataAccess/index.vue
+++ b/src/views/dataAssets/dataAccess/index.vue
@@ -163,6 +163,18 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据库名称" prop="userName">
+                <el-input v-model="form.userName" placeholder="请输入数据库名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据库密码" prop="password">
+                <el-input v-model="form.password" placeholder="请输入数据库密码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-card>
               <div slot="header" class="clearfix">
@@ -300,6 +312,12 @@ export default {
         databaseName: [
           {required: true, message: "数据库名称不能为空", trigger: "blur"}
         ],
+        password: [
+          {required: true, message: "数据库密码不能为空", trigger: "blur"}
+        ],
+        userName: [
+          {required: true, message: "数据库名称不能为空", trigger: "blur"}
+        ],
         connectionParam: [
           {required: true, message: "数据连接参数不能为空", trigger: "blur"}
         ],
@@ -403,6 +421,8 @@ export default {
         host: null,
         port: null,
         databaseName: null,
+        userName: null,
+        password: null,
         connectionParam: null,
         initNum: 5,
         maxNum: 20,
diff --git a/src/views/login.vue b/src/views/login.vue
index b4af5bb..20cc922 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智能车联后台管理系统</h3>
+      <h3 class="title">数据处理后台管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
diff --git a/src/views/register.vue b/src/views/register.vue
index 818ab46..7970240 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">智能车联后台管理系统</h3>
+      <h3 class="title">数据处理后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text">
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
diff --git a/src/views/ruleEngine/engineConfig/codeData.js b/src/views/ruleEngine/engineConfig/codeData.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/ruleEngine/engineConfig/index.vue b/src/views/ruleEngine/engineConfig/index.vue
index e4fc393..ad038af 100644
--- a/src/views/ruleEngine/engineConfig/index.vue
+++ b/src/views/ruleEngine/engineConfig/index.vue
@@ -1,84 +1,44 @@
 <template>
-  <div>
-    <div class="code-edit">
-      <codemirror ref="codeMirror" :value="code" :options="cmOptions" />
-    </div>
-  </div>
+  <el-col :span="22" :offset="1">
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span>公共配置</span>
+      </div>
+      <el-form ref="form" :model="ruleEngineCommonConfig" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="规则基础目录">
+              <el-input v-model="ruleEngineCommonConfig.packageName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-col>
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>作用域</span>
+        </div>
+
+      </el-card>
+    </el-col>
+  </el-col>
+
 </template>
 
 <script>
-import { codemirror } from 'vue-codemirror'
-import 'codemirror/mode/clike/clike';
-// cm-setting.js
-// 组件样式
-import 'codemirror/lib/codemirror.css';
-// 主题
-import 'codemirror/theme/eclipse.css';
-// import 'codemirror/theme/monokai.css';
 
-// html代码高亮
-import 'codemirror/mode/htmlmixed/htmlmixed.js';
-
-// 语言模式
-import 'codemirror/mode/javascript/javascript.js';
-import 'codemirror/mode/css/css.js';
-import 'codemirror/mode/xml/xml.js';
-// 代码展开折叠
-import 'codemirror/addon/fold/foldcode.js';
-import 'codemirror/addon/fold/foldgutter.js';
-import 'codemirror/addon/fold/foldgutter.css';
-import 'codemirror/addon/fold/brace-fold.js';
 export default {
-  components: {
-    codemirror,
-  },
-  props: {
-    readOnly: {
-      default: false,
-      type: Boolean
-    }
-  },
   name: "EngineConfig",
   data() {
     return {
-      codemirror: null,
-      code: 'package com.ruoyi;\n' +
-        '\n' +
-        'import org.mybatis.spring.annotation.MapperScan;\n' +
-        'import org.springframework.boot.SpringApplication;\n' +
-        'import org.springframework.boot.autoconfigure.SpringBootApplication;\n' +
-        'import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;\n' +
-        '\n' +
-        '/**\n' +
-        ' * 启动程序\n' +
-        ' *\n' +
-        ' * @author ruoyi\n' +
-        ' */\n' +
-        '@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})\n' +
-        'public class RuoYiApplication {\n' +
-        '    public static void main (String[] args) {\n' +
-        '        SpringApplication.run(RuoYiApplication.class, args);\n' +
-        '    }\n' +
-        '}\n',
-      cmOptions: {
-        autoRefresh: true, // 重点是这句，为true
-        value: '', // 初始内容
-        mode: 'text/x-java', //实现Java代码高亮
-        tabSize: 4, // tab的空格宽度
-        styleActiveLine: true, // 设置光标所在行高亮true/false
-        lineNumbers: true, //显示行号
-        contentHeight: 800,
-        theme: 'eclipse', //设置主题cobalt/monokai
-        // json: true,
-        readOnly: this.readOnly, // 设置为只读true/false;也可设置为"nocursor"失去焦点
-        lineWrapping: false,
-        foldGutter: true,
-        gutters: [
-          'CodeMirror-lint-markers', //代码错误检测
-          'CodeMirror-linenumbers',
-          'CodeMirror-foldgutter', //展开折叠
-        ],
-      },
+      code: "",
+      ruleEngineCommonConfig: {
+        packageName: "com.muyu.rule.engine",
+      }
     }
   },
   created() {
@@ -88,13 +48,7 @@ export default {
 </script>
 
 <style>
-
-.CodeMirror {
-  font-family: 'JetBrainsMono-Medium', monospace;
-  height: auto;
-}
-
-.CodeMirror-lines {
-  line-height: 1.5; /* 这里的1.5是示例，表示行间距是字体大小的1.5倍 */
+.el-col {
+  margin-top: 20px;
 }
 </style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index abe9056..f81c2ec 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -511,7 +511,7 @@ export default {
               "userId": 1,
               "deptId": 103,
               "userName": "admin",
-              "nickName": "智能车联",
+              "nickName": "数据处理",
               "email": "ry@163.com",
               "phonenumber": "15888888888",
               "sex": "1",
@@ -532,7 +532,7 @@ export default {
                 "ancestors": null,
                 "deptName": "研发部门",
                 "orderNum": null,
-                "leader": "智能车联",
+                "leader": "数据处理",
                 "phone": null,
                 "email": null,
                 "status": null,
@@ -555,7 +555,7 @@ export default {
               "userId": 2,
               "deptId": 105,
               "userName": "ry",
-              "nickName": "智能车联",
+              "nickName": "数据处理",
               "email": "ry@qq.com",
               "phonenumber": "15666666666",
               "sex": "1",
@@ -576,7 +576,7 @@ export default {
                 "ancestors": null,
                 "deptName": "测试部门",
                 "orderNum": null,
-                "leader": "智能车联",
+                "leader": "数据处理",
                 "phone": null,
                 "email": null,
                 "status": null,
@@ -605,7 +605,7 @@ export default {
         "data": [
           {
             "id": 100,
-            "label": "智能车联科技",
+            "label": "数据处理科技",
             "children": [
               {
                 "id": 101,