Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/settings.js

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

ruoyi-ui/src/views/system/form/index.vue

@@ -2,7 +2,9 @@
   <div class="tabForm">
     <div class="tabForm_header">
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" size="small" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
+        <el-button type="primary" size="small" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
+        <el-button type="primary" size="small" plain @click="handleQuery('sx')">刷新</el-button>
+        <el-button type="primary" size="small" plain @click="handleQuery('fh')">返回</el-button>
       </div>
     </div>
     <!-- 内容 -->
@@ -97,6 +99,7 @@
         postList: {},
         numtab: 0,
         tabldie:[],
+        xidugje: '',
         tabShoes:false,//tab 显示隐藏
         tableZbietabg:{
           table:'sys_user'
@@ -196,12 +199,15 @@
           console.log(res)
           let data = res.data
           this.queryData = data
-          console.log(this.queryData,567)
+          if(this.xidugje == 'sx'){
+            if(res.code == 200){
+              this.msgSuccess("操作成功");
+            }
+          }
         })
       },
       // tab数据
       edingelsietab(){
-        console.log(4566)
         geteditindeTab(this.tableZbietabg).then(response => {
           if(response.data.ref.length !==0){
             this.tabldie = response.data.ref
@@ -246,7 +252,14 @@
       },
       /** 搜索按钮操作 */
       handleQuery(index) {
-         console.log(index,4)
+        if(index == 'fs'){
+          this.$router.go(-1)
+          return
+        }else if(index == 'sx'){
+          this.xidugje = 'sx'
+          this.init()
+          return
+        }
          for(let item of this.queryData.showData){
            for(var i = 0 ; i < item.hrChildren.length ; i++){
              if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
@@ -290,6 +303,7 @@
            //新增
            // this.forme.table = 'obj_test'
            // this.forme.objId = -1
+           
            this.forme.fixedData = this.queryParams
            this.submitForm()
          }

ruoyi-ui/src/views/system/table/index.vue

@@ -4,7 +4,7 @@
       <!-- <p>单表</p>
       <el-divider></el-divider> -->
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" size="mini"  plain v-for="(item,index) in jeigneutwo" :key="index" @click="handleQuery(item)">{{item }}</el-button>
+        <el-button type="primary" size="mini"  plain v-for="(item,index) in jeigneutwo" :key="index" @click="handleQuery(item)">{{item}}</el-button>
       </div>
     </div>
     <!-- 内容 -->
@@ -135,7 +135,6 @@
       },
       /** 搜索按钮操作 */
       handleQuery(index) {
-         console.log(index,4)
          for(let item of this.queryData.showData){
            for(var i = 0 ; i < item.hrChildren.length ; i++){
              if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
@@ -210,7 +209,6 @@
 
       },
       init() {
-
         getTableQuery(
           this.tableZbie
         ).then(res => {
@@ -303,7 +301,7 @@
                 // if(this.xidugje =="新增"){
                 //    this.$router.go(-2)
                 // }else{
-                  this.$router.go(-1)
+                  this.$router.replace('surface')
                 // }
 
                 // this.getList();

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -777,7 +777,6 @@
           let data = response.data
           data.relationType = data.relationType + ""
           data.embedEdit = data.embedEdit?(data.embedEdit + ""): data.embedEdit
-
           getGenTable(data.relationParentId).then(res => {
             this.genList = res.data.rows;
             this.form = data;