fix:解决冲突

This commit is contained in:
zyh
2023-03-15 16:11:44 +08:00
75 changed files with 415 additions and 1404 deletions

View File

@@ -81,7 +81,7 @@ export default {
mixins: [editRigthBox],
data () {
return {
url: '/visual/panel/fromTmpl',
url: '/visual/dashboard/fromTmpl',
rules: {
name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -230,7 +230,7 @@ export default {
this.editDashboard.tmplId = String(this.$parent.tempId)
this.templateList = this.$loadsh.cloneDeep(this.$parent.panelData)
} else {
this.$get('visual/panel', { type: 'template', pageSize: -1 }).then(response => {
this.$get('visual/dashboard', { type: 'template', pageSize: -1 }).then(response => {
if (response.code === 200) {
this.templateList = response.data.list
}