Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -26,6 +26,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -321,6 +322,12 @@ export default {
     },
   },
   methods: {
+    fanhui(){
+      this.$router.push({
+        /*返回产品*/
+        path: '/src/views/modulex/ModulexList',/*在引号中填写返回vue*/
+      });
+    },
     loginRole(id){
       getAction('functionx/functionx/loginrole',{id:id}).then((res)=>{
         if (res.success) {

ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue

@@ -38,6 +38,7 @@
 <!--        </a-menu>-->
 <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
 <!--      </a-dropdown>-->
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -178,6 +179,12 @@
       },
     },
     methods: {
+      fanhui(){
+        this.$router.push({
+          /*返回产品*/
+          path: '/src/views/modulex/ModulexList',/*在引号中填写返回vue*/
+        });
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

ant-design-vue-jeecg/src/views/tablex/TablexList.vue

@@ -45,6 +45,7 @@
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -251,6 +252,12 @@
       },
     },
     methods: {
+      fanhui(){
+        this.$router.push({
+          /*返回产品*/
+          path: '/src/views/modulex/ModulexList',/*在引号中填写返回vue*/
+        });
+      },
       viewVid(record) {
         this.$refs.FieldxList.showModal();
         this.$refs.FieldxList.edit(record);