Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/plugins/tab.js

@@ -1,5 +1,5 @@
-import store from '@/store'
-import router from '@/router';
+import store from "@/store";
+import router from "@/router";
 
 export default {
   // 刷新当前tab页签
@@ -8,19 +8,19 @@ export default {
     if (obj === undefined) {
       matched.forEach((m) => {
         if (m.components && m.components.default && m.components.default.name) {
-          if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
+          if (!["Layout", "ParentView"].includes(m.components.default.name)) {
             obj = { name: m.components.default.name, path: path, query: query };
           }
         }
       });
     }
-    return store.dispatch('tagsView/delCachedView', obj).then(() => {
-      const { path, query } = obj
+    return store.dispatch("tagsView/delCachedView", obj).then(() => {
+      const { path, query } = obj;
       router.replace({
-        path: '/redirect' + path,
-        query: query
-      })
-    })
+        path: "/redirect" + path,
+        query: query,
+      });
+    });
   },
   // 关闭当前tab页签，打开新页签
   closeOpenPage(obj) {
@@ -32,40 +32,60 @@ export default {
   // 关闭指定tab页签
   closePage(obj) {
     if (obj === undefined) {
-      return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
-        const latestView = visitedViews.slice(-1)[0]
-        if (latestView) {
-            return router.push(latestView.fullPath)
-        }
-        return router.push('/');
-      });
+      return store
+        .dispatch("tagsView/delView", router.currentRoute)
+        .then(({ visitedViews }) => {
+          const latestView = visitedViews.slice(-1)[0];
+          if (latestView) {
+            return router.push(latestView.fullPath);
+          }
+          return router.push("/");
+        });
     }
-    return store.dispatch('tagsView/delView', obj);
+
+    return store.dispatch("tagsView/delView", obj);
+  },
+  closePageAndPushPrev(obj) {
+    if (obj === undefined) {
+      obj = router.currentRoute;
+    }
+
+    return store.dispatch("tagsView/delView", obj).then(({ visitedViews }) => {
+      //因为首页一直会存在
+      if (visitedViews.length === 1) {
+        return router.push("/home");
+      }
+
+      router.go(-1);
+    });
   },
   // 关闭所有tab页签
   closeAllPage() {
-    return store.dispatch('tagsView/delAllViews');
+    return store.dispatch("tagsView/delAllViews");
   },
   // 关闭左侧tab页签
   closeLeftPage(obj) {
-    return store.dispatch('tagsView/delLeftTags', obj || router.currentRoute);
+    return store.dispatch("tagsView/delLeftTags", obj || router.currentRoute);
   },
   // 关闭右侧tab页签
   closeRightPage(obj) {
-    return store.dispatch('tagsView/delRightTags', obj || router.currentRoute);
+    return store.dispatch("tagsView/delRightTags", obj || router.currentRoute);
   },
   // 关闭其他tab页签
   closeOtherPage(obj) {
-    return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
+    return store.dispatch(
+      "tagsView/delOthersViews",
+      obj || router.currentRoute
+    );
   },
   // 添加tab页签
   openPage(title, url, params) {
-    var obj = { path: url, meta: { title: title } }
-    store.dispatch('tagsView/addView', obj);
+    var obj = { path: url, meta: { title: title } };
+    store.dispatch("tagsView/addView", obj);
     return router.push({ path: url, query: params });
   },
   // 修改tab页签
   updatePage(obj) {
-    return store.dispatch('tagsView/updateVisitedView', obj);
-  }
-}
+    return store.dispatch("tagsView/updateVisitedView", obj);
+  },
+};

src/views/safetycheck/taskManager/components/register.vue

@@ -153,7 +153,7 @@
     </div>
 
     <div class="dialog-footer">
-      <el-button>关闭</el-button>
+      <el-button @click="onClose">关闭</el-button>
       <el-button
         @click="onGrant"
         v-if="showGrantBtn"
@@ -320,6 +320,9 @@ export default {
         this.$message.info("没有可新增的检查内容");
       }
     },
+    onClose(){
+      this.$tab.closePageAndPushPrev();
+    },
     onDeletePoint(area, item, point) {
       if (point.isAdd === 0) {
         this.$message.warning("不可删除计划的检查内容");

src/views/system/device/index.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="app-container">
-    <layoutCom>
-      <org-tree slot="leftBar" v-model="queryParams.orgId" @defaultKey="defaultKeys" @checkChange="checkChange"
-        @click="handleNodeClick" businessTree></org-tree>
-      <el-row slot="rightBar">
+    <el-row :gutter="20">
+  <!--机构数据-->
+  <el-col :span="4" :xs="24">
+                  <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
+                    @click="clickTreeNode"></org-tree>
+      </el-col>
+     
         <el-col :span="20" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
@@ -39,14 +42,7 @@
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                 v-hasPermi="['system:device:add']">新增</el-button>
             </el-col>
-            <!--   <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-              v-hasPermi="['system:device:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-              v-hasPermi="['system:device:remove']">删除</el-button>
-          </el-col>-->
+         
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
 
@@ -89,9 +85,13 @@
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getList" />
         </el-col>
-      </el-row>
-    </layoutCom>
-
+   
+    </el-row>
+   
+  
+    
+   
+ 
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible="open" width="800px" append-to-body @close="cancel">