合并

src/components/SideBar.vue

@@ -9,7 +9,11 @@
       <el-menu-item index="/user">用户管理</el-menu-item>
       <el-menu-item index="/views/certificate/index">凭证管理</el-menu-item>
       <el-menu-item index="/views/account/register">账号管理</el-menu-item>
+<<<<<<< HEAD
       <el-menu-item index="/views/duty/duty">责任认定</el-menu-item>
+=======
+      <el-menu-item index="/views/audit/behavior">行为审计</el-menu-item>
+>>>>>>> 6da7048b56a7ef2226d4ddabdcca57de0671bb83
       <el-submenu index="">
         <template #title>
           权限管理

src/router.js

@@ -37,6 +37,11 @@ export default new Router({
           name: 'register',
           component: () => import('./views/account/register.vue'),
         },
+        {
+          path: '/views/audit/behavior',
+          name: 'behavior',
+          component: () => import('./views/audit/behavior .vue'),
+        },
         {
           path: '/group',
           name: 'group',

src/views/audit/behavior .vue

@@ -0,0 +1,19 @@
+<template lang="html">
+  <div id="behavior ">
+    <p>behavior</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'behavior ',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/role/resources.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div id="resources">
     <el-row class="register">
       <el-col :span="24" class="btn">
@@ -13,47 +13,31 @@
         <el-col :span="2" class="searchBtn"><el-button icon="el-icon-search"></el-button></el-col>
       </el-col>
       <el-col :span="24" class="list" style="padding:0 2rem;">
-        <el-collapse v-model="activeNames">
-          <el-collapse-item v-for="(data, index) in tableData" :key="index" :name="`${index}`" style="margin-bottom:1rem;">
-            <template #title>
-              <span style="padding-left:1.5rem;font-size:1rem;">{{ data.name }}</span>
+        <el-table :data="tableData" style="width: 100%" border stripe>
+          <el-table-column prop="name" align="center" label="群组名称"> </el-table-column>
+          <el-table-column prop="charge" align="center" label="状态">
+            <template v-slot="scoped">
+              {{ scoped.row.state === '0' ? '停用' : '启用' }}
             </template>
-            <el-row style="padding:0.5rem;">
-              <el-popover v-for="(item, itemIndex) in data.children" :key="itemIndex" placement="bottom" trigger="click" @hide="form = {}">
-                <el-row type="flex" align="middle" justify="center">
-                  <el-col :span="8">
-                    <el-button size="mini" type="success" @click="handleEdit">修改</el-button>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-button size="mini" :type="`${item.state === '0' ? 'danger' : 'success'}`" @click="changeState(index, itemIndex)">
-                      {{ item.state === '0' ? '停用' : '启用' }}
-                    </el-button>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-form :model="form">
-                    <el-row>
-                      <el-col :span="24">
-                        <el-form-item label="资源名称">
-                          <el-input v-model="form.name" clearable></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </el-form>
-                </el-row>
-                <el-button
-                  slot="reference"
-                  size="mini"
-                  :type="`${item.state === '0' ? 'success' : ''}`"
-                  style="margin-right:1rem; margin-bottom:0.5rem;"
-                  @click="openDialog(index, itemIndex)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </el-popover>
-            </el-row>
-          </el-collapse-item>
-        </el-collapse>
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template v-slot="scoped">
+              <el-row type="flex" justify="center">
+                <el-col :span="6">
+                  <el-button size="mini" type="primary" @click="openDialog(scoped.$index, 'update')">修改</el-button>
+                </el-col>
+                <el-col :span="6">
+                  <el-button size="mini" :type="`${scoped.row.state === '0' ? 'danger' : 'success'}`" @click="changeState(scoped.$index)">
+                    {{ scoped.row.state === '0' ? '停用' : '启用' }}
+                  </el-button>
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-col class="paging">
+          <el-pagination background layout="prev, pager, next" :total="1000"></el-pagination>
+        </el-col>
       </el-col>
     </el-row>
     <el-dialog title="资源编辑" :visible.sync="dialog">
@@ -90,18 +74,14 @@ export default {
     input: '',
     textarea: '',
     tableData: [
-      {
-        name: '文档',
-        children: [{ name: '文档1', state: '0' }, { name: '文档2', state: '1' }],
-      },
-      {
-        name: '应用',
-        children: [{ name: '应用1', state: '0' }, { name: '应用2', state: '0' }, { name: '应用3', state: '0' }],
-      },
-      {
-        name: '数据',
-        children: [{ name: '数据1', state: '0' }, { name: '数据2', state: '0' }, { name: '数据3', state: '0' }],
-      },
+      { name: '文档1', state: '0' },
+      { name: '文档2', state: '1' },
+      { name: '应用1', state: '0' },
+      { name: '应用2', state: '0' },
+      { name: '应用3', state: '0' },
+      { name: '数据1', state: '0' },
+      { name: '数据2', state: '0' },
+      { name: '数据3', state: '0' },
     ],
     personList: [],
     value: '',
@@ -140,17 +120,17 @@ export default {
       this.form = {};
       this.dialog = false;
     },
-    openDialog(index, itemIndex) {
-      let data = JSON.parse(JSON.stringify(this.tableData[index].children[itemIndex]));
+    openDialog(index) {
+      let data = JSON.parse(JSON.stringify(this.tableData[index]));
       data[`index`] = index;
-      data[`itemIndex`] = itemIndex;
       this.$set(this, `form`, data);
+      this.dialog = true;
     },
-    changeState(index, itemIndex) {
-      let data = this.tableData[index].children[itemIndex];
+    changeState(index) {
+      let data = this.tableData[index];
       data.state = data.state === '0' ? '1' : '0';
       this.$set(this.form, `state`, data.state);
-      this.$set(this.tableData[index].children[itemIndex], `state`, data.state);
+      this.$set(this.tableData[index], `state`, data.state);
     },
   },
 };