更新

ruoyi-ui/src/router/index.js

@@ -1,205 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-Vue.use(Router)
-
-/* Layout */
-import Layout from '@/layout'
-import ParentView from '@/components/ParentView';
-
-/**
- * Note: 路由配置项
- *
- * hidden: true                   // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
- * alwaysShow: true               // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- *                                // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
- *                                // 若你想不管路由下面的 children 声明的个数都显示你的根路由
- *                                // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
- * redirect: noRedirect           // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name'             // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
- * meta : {
-    noCache: true                // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'               // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'             // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false            // 如果设置为false，则不会在breadcrumb面包屑中显示
-  }
- */
-
-// 公共路由
-export const constantRoutes = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: (resolve) => require(['@/views/redirect'], resolve)
-      }
-    ]
-  },
-  {
-    path: '/login',
-    component: (resolve) => require(['@/views/login'], resolve),
-    hidden: true
-  },
-  {
-    path: '/404',
-    component: (resolve) => require(['@/views/error/404'], resolve),
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: (resolve) => require(['@/views/error/401'], resolve),
-    hidden: true
-  },
-  {
-    path: '',
-    component: Layout,
-    redirect: 'index',
-    meta: { title: '首页', icon: '', noCache: true, affix: true },
-    children: [
-      {
-        path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
-        name: '首页',
-        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-      },
-      {
-        path: 'index1',
-        name: '流程工作台',
-        hidden: false,
-        alwaysShow: true,
-        meta: { title: '流程工作台', icon: 'spot', noCache: true },
-        children: [{
-          path: 'index1',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '待我审批',
-          meta: { title: '待我审批', icon: '', noCache: false},
-        },{
-          path: 'index2',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '已办理',
-          meta: { title: '已办理', icon: '', noCache: false},
-        },{
-          path: 'index3',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '已延时',
-          meta: { title: '已延时', icon: '', noCache: false},
-        },{
-          path: 'index4',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '我的流程',
-          meta: { title: '我的流程', icon: '', noCache: false},
-        }]
-      },{
-        path: 'index2',
-        name: '工作协助',
-        hidden: false,
-        alwaysShow: true,
-        meta: { title: '工作协助', icon: 'spot', noCache: true },
-        children: [{
-          path: 'index1',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '批注',
-          meta: { title: '批注', icon: '', noCache: false},
-        },{
-          path: 'index2',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '微邮',
-          meta: { title: '微邮', icon: '', noCache: false},
-        }]
-      },{
-        path: 'index3',
-        name: '交办事项',
-        hidden: false,
-        alwaysShow: true,
-        meta: { title: '交办事项', icon: 'spot', noCache: true },
-        children: [{
-          path: 'index1',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '待我处理',
-          meta: { title: '待我处理', icon: '', noCache: false},
-        },{
-          path: 'index2',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '我的安排',
-          meta: { title: '我的安排', icon: '', noCache: false },
-        },{
-          path: 'index3',
-          hidden: false,
-          component: (resolve) => require(['@/views/index'], resolve),
-          name: '历史事务',
-          meta: { title: '历史事务', icon: '', noCache: false},
-        }]
-      }
-    ]
-  },
-  {
-    path: '/user',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [
-      {
-        path: 'profile',
-        component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
-      }
-    ]
-  },
-  {
-    path: '/dict',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'type/data/:dictId(\\d+)',
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
-        name: 'Data',
-        meta: { title: '字典数据', icon: '' }
-      }
-    ]
-  },
-  {
-    path: '/job',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'log',
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
-        name: 'JobLog',
-        meta: { title: '调度日志' }
-      }
-    ]
-  },
-  {
-    path: '/gen',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'edit/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置' }
-      }
-    ]
-  }
-]
-
-export default new Router({
-  mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
-})

ruoyi-ui/src/views/system/role/fz-index.vue

@@ -33,8 +33,7 @@
           </div>
         </div>
         <div class="searList">
-          <div class="searItem searItemLeft" element-loading-text="拼命加载中" v-loading.fullscreen.lock="fullscreenLoading"
-            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.4)" v-for="item in roleList"
+          <div class="searItem searItemLeft" v-for="item in roleList"
             @click="searBtnFn(item)" :class="{'active': item.id == roleId}" :key="item.id">
             <span>
               {{item.roleName}}
@@ -131,7 +130,6 @@
     data() {
       return {
         modifyStatus: false,
-        fullscreenLoading: false,
         searIndex: '',
         data: [],
         defaultProps: {
@@ -272,7 +270,8 @@
             _this.qxList(e)
           });
           return
-        }
+        }
+        this.menusList = {}
         listMenus(e.id,this.roleId).then(res => {
           let data = res.data
           this.menusList = data
@@ -450,12 +449,9 @@
       /** 修改按钮操作 */
       handleUpdate() {
         this.reset();
-        this.fullscreenLoading = true
         const roleMenu = this.getRoleMenuTreeselect(this.roleId);
         roleMenu.then(res => {
-          // let checkedKeys = res.checkedKeys
           this.deptOptions = res.data
-          this.fullscreenLoading = false
         });
       },
       /** 选择角色权限范围触发 */

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

@@ -21,15 +21,15 @@
       <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" style="color: red;" align="center" />
         <template v-for="(item, index) in tabData">
-          <el-table-column :label="item.columnComment"  align="center" :prop="item.columnName" :key="index" >
-            <template slot-scope="scope">
+          <el-table-column :label="item.columnComment" align="center" :prop="item.columnName" :key="index">
+            <template slot-scope="scope">
               <img class="img_icon" v-if="item.htmlType=='imageUpload' && scope.row[scope.column.property]" @click="imgBtn(JSON.parse(scope.row[scope.column.property])[0].url)"
                 :src="JSON.parse(scope.row[scope.column.property])[0].url" alt="">
-              <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
-              <span  :style="scope.row.list_class" v-else-if="item.columnName == 'status' " >{{ scope.row[scope.column.property] }}</span>
-              <div v-else>
-                <span v-if="item.fkInfo">{{scope.row[scope.column.property].value}}</span>
-                <span v-else>{{scope.row[scope.column.property]}}</span>
+              <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
+              <span :style="scope.row.list_class" v-else-if="item.columnName == 'status' ">{{ scope.row[scope.column.property] }}</span>
+              <div v-else>
+                <span v-if="item.fkInfo">{{scope.row[scope.column.property].value}}</span>
+                <span v-else>{{scope.row[scope.column.property]}}</span>
               </div>
             </template>
           </el-table-column>
@@ -59,7 +59,7 @@
     name: "index",
     data() {
       return {
-        pir_imgs: '', // 图片链接
+        pir_imgs: '', // 图片链接
         // jue:'color: red;',
         tabData: [],
         multiple: true,
@@ -174,7 +174,8 @@
           })
         }
       },
-      headerBtn(item) {
+      headerBtn(item) {
+        const _this = this
         switch (item) {
           case 'A':
             {
@@ -197,13 +198,20 @@
                 this.msgInfo('请勾选一条信息')
                 return
               }
-              delMenu({
-                table: this.tabName,
-                idList: this.ids
-              }).then(res => {
-                this.msgSuccess('删除成功')
-                this.getList()
+              this.$confirm('是否确认删除岗位编号为"' + this.ids + '"的数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+              }).then(function() {
+                return delMenu({
+                  table: _this.tabName,
+                  idList: _this.ids
+                });
+              }).then(() => {
+                _this.getList();
+                _this.msgSuccess("删除成功");
               })
+
               return
             }
           case 'Q':
@@ -342,7 +350,7 @@
     // }
 
     .el-collapse {
-      border-top: 0;
+      border-top: 0;
 
     }
   }

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

@@ -339,9 +339,8 @@
         this.$refs["queryForm"].validate(valid => {
           if (valid) {
             addbjectSave(this.forme).then(response => {
-              this.msgSuccess("保存成功");
-              this.open = false;
-              console.log(this.xidugje)
+              this.msgSuccess("保存成功");
+              // this.open = false;
               this.$router.go(-1)
             });
           }