导航栏修改,上级节点修改

史敦盼
Commit ee150460 authored Apr 08, 2024 by 史敦盼
Showing with 115 additions and 15 deletions
src/router/index.js
src/views/Main/components/TagsView/index.vue
src/views/busi-assets-list/index.vue
src/views/meta-model-list/index.vue
src/views/redirect/index.vue
--- a/src/router/index.js
+++ b/src/router/index.js
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import Home from '@/views/Home.vue'
+import Main from '@/views/Main'
 Vue.use(VueRouter)
@@ -25,13 +25,25 @@ export const routes = [
    // component: Home
  },
  {
+    path: '/redirect',
+    component: Main,
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        component: () => import('@/views/redirect/index')
+      }
+    ]
+  },
+  {
    path: '/main',
    name: 'main',
    // route level code-splitting
    // this generates a separate chunk (about.[hash].js) for this route
    // which is lazy-loaded when the route is visited.
-    component: () =>
+    component: Main,
-      import(/* webpackChunkName: "about" */ '../views/Main/index.vue'),
+    meta : {
+      title: '首页'
+    },
    children: [
      {
        path: '/main/archiEleList', //架构元素管理

--- a/src/views/Main/components/TagsView/index.vue
+++ b/src/views/Main/components/TagsView/index.vue
@@ -267,7 +267,7 @@ export default {
      @mixin tagActive() {
        color: $color-primary;
        background: url('../../../../assets/main/tag_bg.png') no-repeat center;
-        background-size: cover;
+        background-size: 100% 100%;
        &::before {
          content: '';
          // background: #fff;

--- a/src/views/busi-assets-list/index.vue
+++ b/src/views/busi-assets-list/index.vue
@@ -333,15 +333,24 @@
            </el-radio-group>
          </el-form-item>
          <el-form-item label="上级节点:" prop="let2">
-            <el-select
+            <el-cascader
+              v-model="cascaderValue"
+              :options="treeSelectData"
+              filterable
+              :props="{
+                children: 'children',
+                label: 'assetName',
+                value: 'assetId',
+                checkStrictly: true
+              }"
+              @change="handleChange"></el-cascader>
+            <!-- <el-select
              class="treeSelectClass"
              clearable
              :disabled="is_add_edit == 'view' ? true : disabled1"
              placeholder="请选择"
              v-model="ruleForm.let2"
            >
-              <!-- <el-option v-for="item in shangJiJieDianSelect" :key="item.assetId" :label="item.assetName" :value="item.assetId"></el-option> -->
              <el-option :value="selectValue" :label="selectLabel">
                <el-tree
                  ref="treeSelect"
@@ -358,7 +367,7 @@
                >
                </el-tree>
              </el-option>
-            </el-select>
+            </el-select> -->
          </el-form-item>
          <div class="dialog_form_item3 m-b-20 flex-c">
            <div class="dialog_form_item_title">图标设置:</div>
@@ -451,7 +460,7 @@
    </el-dialog>
    <el-dialog
-      title="模版下载"
+      title="模板下载"
      :visible.sync="templateDialog"
      :center="false"
      :close-on-click-modal="false"
@@ -460,8 +469,18 @@
      <el-form :model="ruleForm2" ref="form2" :rules="rules2" style="">
        <div class="form_item_container">
          <el-form-item label="上级节点:" prop="let1">
-            <el-select clearable placeholder="请选择" v-model="ruleForm2.let1">
+            <el-cascader
-              <!-- <el-option v-for="item in shangJiJieDianSelect" :key="item.assetId" :label="item.assetName" :value="item.assetId"></el-option> -->
+              v-model="cascaderValue2"
+              :options="treeSelectData"
+              filterable
+              :props="{
+                children: 'children',
+                label: 'assetName',
+                value: 'assetId',
+                checkStrictly: true
+              }"
+              @change="handleChange2"></el-cascader>
+            <!-- <el-select clearable placeholder="请选择" v-model="ruleForm2.let1">
              <el-option :value="selectValue2" :label="selectLabel2">
                <el-tree
                  ref="treeSelect2"
@@ -478,7 +497,7 @@
                >
                </el-tree>
              </el-option>
-            </el-select>
+            </el-select> -->
          </el-form-item>
          <el-form-item label="所属元素:" prop="let2">
            <el-select
@@ -615,6 +634,8 @@ export default {
      selectGraphShape: '',
      chooseSvgVisible: false,
      assetsStatusOptions: [],
+      cascaderValue: [],
+      cascaderValue2: []
    }
  },
  created() {
@@ -872,6 +893,7 @@ export default {
        this.ruleForm2.let2 = null
        this.selectValue2 = ''
        this.selectLabel2 = ''
+        this.cascaderValue2 = []
      })
    },
    addItem() {
@@ -896,6 +918,7 @@ export default {
        this.selectLabel = ''
        this.selectValue = ''
        this.selectCode = ''
+        this.cascaderValue = []
      })
    },
    viewItem(row) {
@@ -1006,6 +1029,36 @@ export default {
        this.ruleForm.dynamicForm_ = fieldsValue_
      }
    },
+    handleChange(value) {
+      // console.log('data', data)
+      // 当选中值变化时，更新绑定的对象
+      let selectedObject = {}
+      if (value && value.length) {
+        // 假设我们根据id来查询对象
+        selectedObject = this.findObjectById(this.treeSelectData, value[0]);
+      } else {
+        selectedObject = null;
+      }
+      this.selectValue = selectedObject.assetId
+      this.selectLabel = selectedObject.assetName
+      this.selectCode = selectedObject.assetCode
+      this.ruleForm.let2 = selectedObject.assetName
+      // console.log('selectedObject', this.selectedObject, value)
+    },
+    findObjectById(items, id) {
+      for (let i = 0; i < items.length; i++) {
+        if (items[i].assetId === id) {
+          return items[i];
+        }
+        if (items[i].children) {
+          const found = this.findObjectById(items[i].children, id);
+          if (found) {
+            return found;
+          }
+        }
+      }
+      return null;
+    },
    handleCheckChange(data, tree) {
      //上级节点下拉树的勾选
      this.selectValue = data.assetId
@@ -1015,6 +1068,22 @@ export default {
      this.$refs.treeSelect.setCheckedKeys([]) // 删除所有选中节点
      this.$refs.treeSelect.setCheckedNodes([data])
    },
+    handleChange2(value) {
+      // 当选中值变化时，更新绑定的对象
+      let selectedObject = {}
+      if (value && value.length) {
+        // 假设我们根据id来查询对象
+        selectedObject = this.findObjectById(this.treeSelectData, value[0]);
+      } else {
+        selectedObject = null;
+      }
+      this.selectValue2 = selectedObject.assetId
+      this.selectLabel2 = selectedObject.assetName
+      this.ruleForm.let1 = selectedObject.assetName
+      this.$nextTick(() => {
+        this.$refs.form2.resetFields()
+      })
+    },
    handleCheckChange2(data, tree) {
      //模版下载的上级节点的下拉树的勾选
      this.selectValue2 = data.assetId

--- a/src/views/meta-model-list/index.vue
+++ b/src/views/meta-model-list/index.vue
@@ -108,7 +108,8 @@ import {
 	delete_yuan_mo_xing_list,
 	query_yuan_mo_xing_details,
 	getDrawioLeftCommonGraph,
-	getDrawioLeftStandardGraph
+	getDrawioLeftStandardGraph,
+  getJsonToXml
 } from '@/api/index.js';
 import { MessageBox, Message } from 'element-ui';
 import $ from 'jquery';
@@ -150,6 +151,12 @@ export default {
 	mounted(){
 		this.get_list1();
 		this.get_list2();
+    // getJsonToXml({eleRelaId: 2548}).then(res => {
+    //   if(res.code === 200) {
+    //     console.log(res.data)
+    //     localStorage.setItem('jsonToGraph',JSON.stringify(res.data))
+    //   }
+    // })
 	},
 	methods: {
 		tabs_click_func(data) {
@@ -370,7 +377,7 @@ export default {
 		padding: 60px 15px 60px 15px;
 	}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 	.greenButton{
 		background-color: #0D867F;
 		color: #fff;
@@ -453,7 +460,7 @@ export default {
 		align-items: center;
 		margin-top: 10px;
 		margin-bottom: 20px;
+    margin-left: 16px;
 	}
 	.card_item{
 		display: inline-block;

--- a/src/views/redirect/index.vue
+++ b/src/views/redirect/index.vue
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>