yrik 4 gadi atpakaļ
vecāks
revīzija
306a368fd6

+ 9 - 0
ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -4,6 +4,7 @@
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu
                 :default-active="activeMenu"
+				:default-openeds="srtw"
                 :collapse="isCollapse"
                 :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg"
                 :text-color="settings.sideTheme === 'theme-dark' ? variables.menuText : 'rgba(0,0,0,.65)'"
@@ -11,6 +12,7 @@
                 :active-text-color="settings.theme"
                 :collapse-transition="false"
                 mode="vertical"
+				
             >
                 <sidebar-item
                     v-for="(route, index) in handleSide"
@@ -30,6 +32,13 @@ import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
 
 export default {
+	data() {
+	  return {
+	    indexs: 1,
+	    srtw: [0],
+	    showde:true
+	  }
+	},
     components: { SidebarItem, Logo },
     mounted() {
       console.log(this.sidebarRouters,this.sidebar,this.settings)

+ 1 - 1
ruoyi-ui/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
   title: '潜山市云数据中心',
-  urls: `http://192.168.101.10:8090`,
+  urls: `http://192.168.101.10:7090`,
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 10 - 6
ruoyi-ui/src/views/system/form/index.vue

@@ -43,8 +43,8 @@
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-form>
-           <!-- <el-button type="primary" size="small" plain v-for="(item,indexss) in jeigneutwo" :key="item + indexss"
-             @click="handleQueryju(item)">{{item}}</el-button> -->
+           <el-button type="primary" size="small" plain v-for="(item,indexss) in jeigneutwo" :key="item + indexss"
+             @click="handleQueryju(item)">{{item}}</el-button>
           </div>
 
           <el-table v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
@@ -165,7 +165,8 @@
         jeigneutwo: [],
         single: true,
         multiple: true,
-        tabName:''
+        tabName:'',
+        oieufr:''
       };
     },
     filters:{
@@ -195,6 +196,7 @@
       this.forme.table = this.$route.query.tables
       this.forme.objId = this.$route.query.id
       this.formy.id = this.$route.query.id
+      this.oieufr = this.$route.query.id
       this.tableZbietabg.table = this.$route.query.tables
       this.objParams.table = this.$route.query.tables
       this.objParams.fixedData.id = this.$route.query.id
@@ -536,23 +538,24 @@
          //删除
          this.handleDeletetwo(this.deledlid)
        }  else if(index == '新增'){
-           this.routerFn(-1, this.tabName)
+           this.routerFn(-1, this.tabName,this.oieufr)
        }else if(index == '修改'){
          if (this.single) {
            this.msgInfo('请勾选一条信息')
            return
          }
          const id = this.ids.join(',')
-         this.routerFn(id, this.tabName)
+         this.routerFn(id, this.tabName,this.oieufr)
        }
      },
-     routerFn(id, tables) {
+     routerFn(id, tables,tabfe) {
        if (this.queryDatatao.viewType == 'crud') {
          this.$router.push({
            path: 'table',
            query: {
              id,
              tables,
+             tabfe
            },
          })
        } else if (this.queryDatatao.viewType == 'headTab') {
@@ -561,6 +564,7 @@
            query: {
              id,
              tables,
+             tabfe
            },
          })
        }

+ 16 - 3
ruoyi-ui/src/views/system/table/index.vue

@@ -88,7 +88,9 @@
         jeigneutwo:[],
         xidugje:0,
         tijeq:0,
-        imgShoew:0
+        imgShoew:0,
+        tablees:-1,
+        juegkae:''
       };
     },
     mounted() {
@@ -102,7 +104,14 @@
       this.tableZbie.fixedData.id = this.$route.query.id
       this.formy.id = this.$route.query.id
       this.deledlid.table = this.$route.query.tables
-      this.deledlid.idList.push(this.$route.query.id)
+      this.deledlid.idList.push(this.$route.query.id)
+      if(this.$route.query.tabfe){
+       this.tablees = this.$route.query.tabfe
+       this.juegkae = this.$route.query.tables + '_id'
+
+       console.log(this.juegkae)
+      }
+      console.log(this.forme.fixedData)
       this.init()
       // this.tablsie()
     },
@@ -164,7 +173,8 @@
           this.antiSubmission()
         } else if (index == '保存') {
           // 修改
-          this.forme.fixedData = this.queryParams
+          this.forme.fixedData = this.queryParams
+          this.forme.fixedData[this.juegkae] =  this.tablees
           this.submitForm()
         } else if (index == '新增') {
           //新增
@@ -283,6 +293,9 @@
       submitForm: function() {
         this.$refs["queryForm"].validate(valid => {
           if (valid) {
+            // if(this.tablees !== -1){
+           console.log(this.forme)
+            // }
             addbjectSave(this.forme).then(response => {
               this.msgSuccess("保存成功");
               // this.open = false;