fix(): 增加代码规范,修改为数据处理标题

master
DongZeLiang 2024-04-29 16:17:24 +08:00
parent a9318a0e27
commit f1b424ff1d
12 changed files with 154 additions and 135 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -75,7 +75,7 @@ const user = {
"userId": 1, "userId": 1,
"deptId": 103, "deptId": 103,
"userName": "admin", "userName": "admin",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@163.com", "email": "ry@163.com",
"phonenumber": "15888888888", "phonenumber": "15888888888",
"sex": "1", "sex": "1",
@ -95,7 +95,7 @@ const user = {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "研发部门", "deptName": "研发部门",
"orderNum": 1, "orderNum": 1,
"leader": "智能车联", "leader": "数据处理",
"phone": null, "phone": null,
"email": null, "email": null,
"status": "0", "status": "0",

View File

@ -314,7 +314,7 @@ export default {
"userId": 1, "userId": 1,
"deptId": 103, "deptId": 103,
"userName": "admin", "userName": "admin",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@163.com", "email": "ry@163.com",
"phonenumber": "15888888888", "phonenumber": "15888888888",
"isAuth": true, "isAuth": true,
@ -331,7 +331,7 @@ export default {
"userId": 2, "userId": 2,
"deptId": 105, "deptId": 105,
"userName": "ry", "userName": "ry",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@qq.com", "email": "ry@qq.com",
"phonenumber": "15666666666", "phonenumber": "15666666666",
"dept": { "dept": {

View File

@ -332,7 +332,7 @@ export default {
"userId": 1, "userId": 1,
"deptId": 103, "deptId": 103,
"userName": "admin", "userName": "admin",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@163.com", "email": "ry@163.com",
"phonenumber": "15888888888", "phonenumber": "15888888888",
"isAuth": true, "isAuth": true,
@ -349,7 +349,7 @@ export default {
"userId": 2, "userId": 2,
"deptId": 105, "deptId": 105,
"userName": "ry", "userName": "ry",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@qq.com", "email": "ry@qq.com",
"phonenumber": "15666666666", "phonenumber": "15666666666",
"dept": { "dept": {

View File

@ -163,6 +163,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </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-row>
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
@ -300,6 +312,12 @@ export default {
databaseName: [ databaseName: [
{required: true, message: "数据库名称不能为空", trigger: "blur"} {required: true, message: "数据库名称不能为空", trigger: "blur"}
], ],
password: [
{required: true, message: "数据库密码不能为空", trigger: "blur"}
],
userName: [
{required: true, message: "数据库名称不能为空", trigger: "blur"}
],
connectionParam: [ connectionParam: [
{required: true, message: "数据连接参数不能为空", trigger: "blur"} {required: true, message: "数据连接参数不能为空", trigger: "blur"}
], ],
@ -403,6 +421,8 @@ export default {
host: null, host: null,
port: null, port: null,
databaseName: null, databaseName: null,
userName: null,
password: null,
connectionParam: null, connectionParam: null,
initNum: 5, initNum: 5,
maxNum: 20, maxNum: 20,

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="login"> <div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <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-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="register"> <div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"> <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-form-item prop="username">
<el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text"> <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"/> <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>

View File

@ -1,84 +1,44 @@
<template> <template>
<div> <el-col :span="22" :offset="1">
<div class="code-edit"> <el-card>
<codemirror ref="codeMirror" :value="code" :options="cmOptions" /> <div slot="header" class="clearfix">
<span>公共配置</span>
</div> </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> </div>
</el-card>
</el-col>
</el-col>
</template> </template>
<script> <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 { export default {
components: {
codemirror,
},
props: {
readOnly: {
default: false,
type: Boolean
}
},
name: "EngineConfig", name: "EngineConfig",
data() { data() {
return { return {
codemirror: null, code: "",
code: 'package com.ruoyi;\n' + ruleEngineCommonConfig: {
'\n' + packageName: "com.muyu.rule.engine",
'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', //
],
},
} }
}, },
created() { created() {
@ -88,13 +48,7 @@ export default {
</script> </script>
<style> <style>
.el-col {
.CodeMirror { margin-top: 20px;
font-family: 'JetBrainsMono-Medium', monospace;
height: auto;
}
.CodeMirror-lines {
line-height: 1.5; /* 这里的1.5是示例表示行间距是字体大小的1.5倍 */
} }
</style> </style>

View File

@ -511,7 +511,7 @@ export default {
"userId": 1, "userId": 1,
"deptId": 103, "deptId": 103,
"userName": "admin", "userName": "admin",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@163.com", "email": "ry@163.com",
"phonenumber": "15888888888", "phonenumber": "15888888888",
"sex": "1", "sex": "1",
@ -532,7 +532,7 @@ export default {
"ancestors": null, "ancestors": null,
"deptName": "研发部门", "deptName": "研发部门",
"orderNum": null, "orderNum": null,
"leader": "智能车联", "leader": "数据处理",
"phone": null, "phone": null,
"email": null, "email": null,
"status": null, "status": null,
@ -555,7 +555,7 @@ export default {
"userId": 2, "userId": 2,
"deptId": 105, "deptId": 105,
"userName": "ry", "userName": "ry",
"nickName": "智能车联", "nickName": "数据处理",
"email": "ry@qq.com", "email": "ry@qq.com",
"phonenumber": "15666666666", "phonenumber": "15666666666",
"sex": "1", "sex": "1",
@ -576,7 +576,7 @@ export default {
"ancestors": null, "ancestors": null,
"deptName": "测试部门", "deptName": "测试部门",
"orderNum": null, "orderNum": null,
"leader": "智能车联", "leader": "数据处理",
"phone": null, "phone": null,
"email": null, "email": null,
"status": null, "status": null,
@ -605,7 +605,7 @@ export default {
"data": [ "data": [
{ {
"id": 100, "id": 100,
"label": "智能车联科技", "label": "数据处理科技",
"children": [ "children": [
{ {
"id": 101, "id": 101,