KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改]修改两个组件的父名称

Browse Source
This commit is contained in:
zer0Black
2021-03-11 09:53:44 +08:00
parent 042d25053f
commit 35eb1449d4
135 changed files with 164 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/system/DataLogList.vue
+1 -1
View File
@@ -62,7 +62,7 @@
<script>
import DataLogModal from './modules/DataLogModal'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import JEllipsis from "@/components/jero/JEllipsis";
export default {
name: 'DataLogList',
jero-web/src/views/system/DepartList2.vue
+1 -1
View File
@@ -121,7 +121,7 @@
},
data() {
return {
description: 'jeecg 生成SysDepart代码管理页面',
description: 'jero 生成SysDepart代码管理页面',
// 查询条件
queryParam: {},
//数据集
jero-web/src/views/system/LogList.vue
+1 -1
View File
@@ -75,7 +75,7 @@
<script>
import { filterObj } from '@/utils/util';
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
export default {
name: "LogList",
jero-web/src/views/system/NewPermissionList.vue
+1 -1
View File
@@ -84,7 +84,7 @@
import { getSystemMenuList, getSystemSubmenu, getSystemSubmenuBatch } from '@/api/api'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PermissionDataRuleList from './PermissionDataRuleList'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
const columns = [
{
jero-web/src/views/system/PermissionList.vue
+1 -1
View File
@@ -84,7 +84,7 @@
import { getPermissionList } from '@/api/api'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PermissionDataRuleList from './PermissionDataRuleList'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
const columns = [
{
jero-web/src/views/system/QuartzJobList.vue
+1 -1
View File
@@ -112,7 +112,7 @@
import QuartzJobModal from './modules/QuartzJobModal'
import { getAction } from '@/api/manage'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import JEllipsis from "@/components/jero/JEllipsis";
export default {
name: "QuartzJobList",
jero-web/src/views/system/RoleList.vue
+1 -1
View File
@@ -101,7 +101,7 @@
import RoleModal from './modules/RoleModal'
import UserRoleModal from './modules/UserRoleModal'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jero/JDate'
export default {
name: "RoleList",
jero-web/src/views/system/SysCheckRuleList.vue
+1 -1
View File
@@ -108,7 +108,7 @@
</template>
<script>
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysCheckRuleModal from './modules/SysCheckRuleModal'
import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
jero-web/src/views/system/SysDataSourceList.vue
+1 -1
View File
@@ -100,7 +100,7 @@
</template>
<script>
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysDataSourceModal from './modules/SysDataSourceModal'
jero-web/src/views/system/UserList.vue
+2 -2
View File
@@ -179,9 +179,9 @@
import {putAction,getFileAccessHttpUrl} from '@/api/manage';
import {frozenBatch} from '@/api/api'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JInput from '@/components/jeecg/JInput'
import JInput from '@/components/jero/JInput'
import UserRecycleBinModal from './modules/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JSuperQuery from '@/components/jero/JSuperQuery'
export default {
name: "UserList",
jero-web/src/views/system/modules/DeptRoleUserModal.vue
+1 -1
View File
@@ -50,7 +50,7 @@
<script>
import {httpAction, getAction} from '@/api/manage'
import JEllipsis from '@/components/jeecg/JEllipsis'
import JEllipsis from '@/components/jero/JEllipsis'
import {initDictOptions} from '@/components/dict/JDictSelectUtil'
export default {
jero-web/src/views/system/modules/QuartzJobModal.vue
+1 -1
View File
@@ -56,7 +56,7 @@
<script>
import { httpAction } from '@/api/manage'
import JCron from "@/components/jeecg/JCron";
import JCron from "@/components/jero/JCron";
import pick from 'lodash.pick'
// import moment from "moment"
jero-web/src/views/system/modules/SysAnnouncementModal.vue
+2 -2
View File
@@ -138,8 +138,8 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
import JDate from '@/components/jeecg/JDate'
import JEditor from '@/components/jeecg/JEditor'
import JDate from '@/components/jero/JDate'
import JEditor from '@/components/jero/JEditor'
import SelectUserListModal from "./SelectUserListModal";
import moment from 'moment'
jero-web/src/views/system/modules/SysCategoryModal.vue
+11 -11
View File
@@ -21,11 +21,11 @@
pidValue="0">
</j-tree-select>
</a-form-item>
<a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="[ 'name', validatorRules.name]" placeholder="请输入分类名称"></a-input>
</a-form-item>
<!--<a-form-item label="类型编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="[ 'code', validatorRules.code]" placeholder="请输入类型编码"></a-input>
</a-form-item>-->
@@ -36,8 +36,8 @@
编码值前缀需和父节点保持一致,比如父级节点编码是A01则当前编码必须以A01开头
</span>
</a-form-item>-->
</a-form>
</a-spin>
</a-modal>
@@ -47,11 +47,11 @@
import { httpAction,getAction } from '@/api/manage'
import pick from 'lodash.pick'
import JTreeSelect from '@/components/jeecg/JTreeSelect'
import JTreeSelect from '@/components/jero/JTreeSelect'
export default {
name: "SysCategoryModal",
components: {
components: {
JTreeSelect
},
data () {
@@ -90,7 +90,7 @@
expandedRowKeys:[],
pidField:"pid",
subExpandedKeys:[]
}
},
created () {
@@ -140,7 +140,7 @@
that.close();
})
}
})
},
handleCancel () {
@@ -187,8 +187,8 @@
}
})
},
}
}
</script>
jero-web/src/views/system/modules/SysCheckRuleModal.vue
+1 -1
View File
@@ -82,7 +82,7 @@
import { httpAction } from '@/api/manage'
import { validateDuplicateValue, alwaysResolve, failedSymbol } from '@/utils/util'
import { FormTypes } from '@/utils/JEditableTableUtil'
import JEditableTable from '@comp/jeecg/JEditableTable'
import JEditableTable from '@comp/jero/JEditableTable'
export default {
name: 'SysCheckRuleModal',
jero-web/src/views/system/modules/SysDataSourceModal.vue
+4 -4
View File
@@ -146,17 +146,17 @@
},
dbUrlMap: {
// MySQL 数据库
'1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
'1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
//MySQL5.7+ 数据库
'4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' },
'4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' },
// Oracle
'2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
// SQLServer 数据库
'3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' },
// SQLServer 数据库
'5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useSSL=false' },
'5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useSSL=false' },
// SQLServer 数据库
'6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jeecg-boot' }
'6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jero-boot' }
}
}
},
jero-web/src/views/system/modules/SysUserAgentModal.vue
+2 -2
View File
@@ -68,8 +68,8 @@
<script>
import pick from 'lodash.pick'
import { httpAction, getAction } from '@/api/manage'
import JDate from '@/components/jeecg/JDate.vue';
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDate from '@/components/jero/JDate.vue';
import JSelectUserByDep from '@/components/jerobiz/JSelectUserByDep'
export default {
name: "SysUserAgentModal",
jero-web/src/views/system/modules/TenantForm.vue
+2 -2
View File
@@ -47,8 +47,8 @@
import { httpAction, getAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JFormContainer from '@/components/jero/JFormContainer'
import JDate from '@/components/jero/JDate'
import JDictSelectTag from "@/components/dict/JDictSelectTag"
export default {
jero-web/src/views/system/modules/UserModal.vue
+2 -2
View File
@@ -168,13 +168,13 @@
import Vue from 'vue'
// 引入搜索部门弹出框的组件
import departWindow from './DepartWindow'
import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
import JSelectPosition from '@/components/jerobiz/JSelectPosition'
import { ACCESS_TOKEN } from "@/store/mutation-types"
import { getAction } from '@/api/manage'
import {addUser,editUser,queryUserRole,queryall } from '@/api/api'
import { disabledAuthFilter } from "@/utils/authFilter"
import {duplicateCheck } from '@/api/api'
import JImageUpload from '../../../components/jeecg/JImageUpload'
import JImageUpload from '../../../components/jero/JImageUpload'
export default {
name: "UserModal",