From 72b64fcddd0d205cae820ce41cb60ca42160fd09 Mon Sep 17 00:00:00 2001
From: "2309368887@qq.com" <2309368887@qq.com>
Date: Mon, 18 Jul 2022 08:57:58 +0800
Subject: [PATCH 1/3] caidanpeiquan

---
 src/config/route.js | 54 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index f1ac6524..3fb25c3a 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -43,6 +43,7 @@ const routes = [
           "title": "控制台",
           "icon": "el-icon-monitor",
           "affix": true,
+          "perms": ["dashboard"]
         },
         "component": "home"
       },
@@ -52,7 +53,8 @@ const routes = [
         "meta": {
           "title": "驾驶舱",
           "icon": "el-icon-position",
-          "fullpage": true
+          "fullpage": true,
+          "perms": ["bigScreen"]
         },
         "component": "bigScreen"
       },
@@ -61,7 +63,8 @@ const routes = [
         "path": "/usercenter",
         "meta": {
           "title": "帐号信息",
-          "icon": "el-icon-user"
+          "icon": "el-icon-user",
+          "perms": ["userCenter"]
         },
         "component": "userCenter"
       }
@@ -114,6 +117,7 @@ const routes = [
         "meta": {
           "title": "我的事件",
           "icon": "el-icon-document-remove",
+          "perms": ["myevent"]
         },
         "component": "ecm/myevent"
       },
@@ -123,6 +127,7 @@ const routes = [
         "meta": {
           "title": "提醒配置",
           "icon": "el-icon-setting",
+          "perms": ["notify_setting"]
         },
         "component": "ecm/notify_setting"
       },
@@ -133,6 +138,7 @@ const routes = [
         "meta": {
           "title": "算法配置",
           "icon": "el-icon-setting",
+          "perms": ["algo"]
         },
         "component": "ecm/algo"
       }
@@ -153,6 +159,7 @@ const routes = [
         "meta": {
           "title": "工作流",
           "icon": "el-icon-guide",
+          "perms": ["workflow"]
         },
         "component": "wf/workflow"
       },
@@ -173,6 +180,7 @@ const routes = [
         "meta": {
           "title": "全部工单",
           "icon": "el-icon-folder",
+          "perms": ["allwork"]
          
         },
         "component": "wf/allwork"
@@ -183,7 +191,7 @@ const routes = [
         "meta": {
           "title": "我创建的",
           "icon": "el-icon-folder-add",
-         
+          "perms": ["ownerwork"]
         },
         "component": "wf/ownerwork"
       }
@@ -195,7 +203,7 @@ const routes = [
         "meta": {
           "title": "待办工单",
           "icon": "el-icon-folder-opened",
-         
+          "perms": ["duyt"]
         },
         "component": "wf/dutywork"
       },
@@ -205,7 +213,7 @@ const routes = [
         "meta": {
           "title": "我处理的",
           "icon": "el-icon-expand",
-         
+          "perms": ["worked"]
         },
         "component": "wf/worked"
       },
@@ -215,7 +223,7 @@ const routes = [
         "meta": {
           "title": "抄送我的",
           "icon": "el-icon-edit-pen",
-         
+          "perms": ["ccwork"]
         },
         "component": "wf/ccwork"
       },
@@ -249,6 +257,7 @@ const routes = [
         "meta": {
           "title": "作业列表",
           "icon": "el-icon-tickets",
+          "perms": ["operation"]
         },
         "component": "opm/operation"
       },
@@ -258,6 +267,7 @@ const routes = [
         "meta": {
           "title": "许可证分类",
           "icon": "el-icon-ticket",
+          "perms": ["oplcate"]
         },
         "component": "opm/oplcate"
       },
@@ -378,6 +388,7 @@ const routes = [
         "meta": {
           "title": "相关方列表",
           "icon": "el-icon-tickets",
+          "perms": ["rparty"]
         },
         "component": "rpm/rparty"
       },
@@ -387,6 +398,7 @@ const routes = [
         "meta": {
           "title": "相关方人员",
           "icon": "el-icon-user",
+          "perms": ["remployee"]
         },
         "component": "rpm/remployee"
       },
@@ -396,6 +408,7 @@ const routes = [
         "meta": {
           "title": "人员证书",
           "icon": "el-icon-postcard",
+          "perms": ["rcertificate"]
         },
         "component": "rpm/rcertificate"
       },
@@ -405,6 +418,7 @@ const routes = [
         "meta": {
           "title": "资料库",
           "icon": "el-icon-shopping-bag",
+          "perms": ["rfile"]
         },
         "component": "rpm/rfile"
       },
@@ -414,6 +428,7 @@ const routes = [
         "meta": {
           "title": "入厂项目",
           "icon": "el-icon-calendar",
+          "perms": ["rpj"]
         },
         "component": "rpm/rpj"
       },
@@ -445,6 +460,7 @@ const routes = [
         "meta": {
           "title": "来访项目",
           "icon": "el-icon-tickets",
+          "perms": ["visit"]
         },
         "component": "vm/visit"
       },
@@ -454,6 +470,7 @@ const routes = [
         "meta": {
           "title": "来访人员",
           "icon": "el-icon-user",
+          "perms": ["visitor"]
         },
         "component": "vm/visitor"
       },{
@@ -495,6 +512,7 @@ const routes = [
         "meta": {
           "title": "区域列表",
           "icon": "el-icon-tickets",
+          "perms": ["area"]
         },
         "component": "am/area"
       },
@@ -504,6 +522,7 @@ const routes = [
         "meta": {
           "title": "门禁通道",
           "icon": "el-icon-phone",
+          "perms": ["eqm"]
         },
         "component": "am/em1"
       },
@@ -513,6 +532,7 @@ const routes = [
         "meta": {
           "title": "视频通道",
           "icon": "el-icon-video-camera",
+          "perms": ["monitor"]
         },
         "component": "am/monitor"
       },
@@ -522,6 +542,7 @@ const routes = [
         "meta": {
           "title": "喇叭通道",
           "icon": "el-icon-mic",
+          "perms": ["audio"]
         },
         "component": "am/audio"
       },{
@@ -530,6 +551,7 @@ const routes = [
         "meta": {
           "title": "定位标签",
           "icon": "el-icon-map-location",
+          "perms": ["blt"]
         },
         "component": "am/blt"
       },
@@ -551,6 +573,7 @@ const routes = [
         "meta": {
           "title": "企业员工",
           "icon": "el-icon-user",
+          "perms": ["employee"]
         },
         "component": "hrm/employee"
       }
@@ -561,6 +584,7 @@ const routes = [
         "meta": {
           "title": "证书列表",
           "icon": "el-icon-tickets",
+          "perms": ["certificates"]
         },
         "component": "hrm/certificates"
       }
@@ -593,7 +617,8 @@ const routes = [
         "meta": {
           "title": "账户管理",
           "icon": "el-icon-user-filled",
-          "type": "menu"
+          "type": "menu",
+          "perms": ["user"]
         },
         "component": "sys/user"
       },
@@ -603,7 +628,8 @@ const routes = [
         "meta": {
           "title": "部门管理",
           "icon": "sc-icon-organization",
-          "type": "menu"
+          "type": "menu",
+          "perms": ["dept"]
         },
         "component": "sys/dept"
       },
@@ -613,7 +639,8 @@ const routes = [
         "meta": {
           "title": "岗位管理",
           "icon": "sc-icon-organization",
-          "type": "menu"
+          "type": "menu",
+          "perms": ["post"]
         },
         "component": "sys/post"
       },
@@ -623,7 +650,8 @@ const routes = [
         "meta": {
           "title": "角色管理",
           "icon": "el-icon-notebook",
-          "type": "menu"
+          "type": "menu",
+          "perms": ["role"]
         },
         "component": "sys/role"
       },
@@ -633,7 +661,8 @@ const routes = [
         "meta": {
           "title": "字典管理",
           "icon": "el-icon-document",
-          "type": "menu"
+          "type": "menu",
+          "perms": ["dict"]
         },
         "component": "sys/dict"
       },
@@ -643,7 +672,8 @@ const routes = [
         "meta": {
           "title": "计划任务",
           "icon": "el-icon-alarm-clock",
-          "type": "menu"
+          "type": "menu",
+          "perms": ["task"]
         },
         "component": "sys/task"
       }

From b3c432c35d564f05577c92e3dcf354105b402007 Mon Sep 17 00:00:00 2001
From: "2309368887@qq.com" <2309368887@qq.com>
Date: Mon, 18 Jul 2022 09:59:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/system.js          |   9 -
 src/config/route.js              |   3 +-
 src/views/sys/post.vue           | 438 ++++++++++++++++++-------------
 src/views/sys/post_role_form.vue |   7 +-
 4 files changed, 254 insertions(+), 203 deletions(-)

diff --git a/src/api/model/system.js b/src/api/model/system.js
index c1b3b76d..155fa53c 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -262,15 +262,6 @@ export default {
 				return await http.post(this.url,data);
 			}
 		},
-		/*update: {
-			name: "更新岗位",
-			req: async function(id, data){
-				return await http.put(
-					`${config.API_URL}/system/post_role/${id}/`,
-					data
-				);
-			}
-		},*/
 		delete: {
 			name: "删除岗位",
 			req: async function(id){
diff --git a/src/config/route.js b/src/config/route.js
index f83a9376..5f60b9b9 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -603,7 +603,8 @@ const routes = [
         "meta": {
           "title": "相关证书",
           "icon": "el-icon-menu",
-          "hidden": true
+          "hidden": true,
+          "perms": ["certificates"]
         },
         "component": "hrm/certificate"
       },
diff --git a/src/views/sys/post.vue b/src/views/sys/post.vue
index d32c9869..cf39ccd6 100644
--- a/src/views/sys/post.vue
+++ b/src/views/sys/post.vue
@@ -1,199 +1,259 @@
 <template>
-	<el-container>
-		<el-aside width="40%">
-			<el-container>
-				<el-header>
-					<div class="left-panel">
-						<div style="margin-right: 20px">岗位列表</div>
-						<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
-					</div>
-				</el-header>
-				<el-main class="nopadding">
-					<scTable ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow @row-click="rowClick"
-							 :hidePagination="true">
-						<!-- <el-table-column type="selection" width="50"></el-table-column> -->
-						<el-table-column label="" type="index"></el-table-column>
-						<el-table-column label="名称" prop="name" width="120"></el-table-column>
-						<el-table-column label="标识" prop="code" width="60"></el-table-column>
-						<el-table-column label="最短在岗(h)" prop="min_hour" width="100"></el-table-column>
-						<el-table-column label="最长在岗(h)" prop="max_hour" width="100"></el-table-column>
-						<el-table-column label="操作" fixed="right" align="right">
-							<template #default="scope">
-								<el-button type="warning" link size="small" @click="table_edit(scope.row)">编辑
-								</el-button>
-							</template>
-						</el-table-column>
-					</scTable>
-				</el-main>
-			</el-container>
-		</el-aside>
-		<el-container>
-			<el-header>
-				<div class="left-panel">
-					<div style="margin-right: 20px">岗位权限</div>
-					<el-button type="primary" icon="el-icon-plus" @click="addPostRole"></el-button>
-					<el-button type="danger" plain icon="el-icon-delete" @click="delPostRole"></el-button>
-				</div>
-			</el-header>
-			<el-main class="nopadding">
-				<scTable ref="table2" :apiObj="apiObj2" row-key="id" stripe :hidePagination="true">
-					<!-- <el-table-column type="selection" width="50"></el-table-column> -->
-					<el-table-column label="" type="index"></el-table-column>
-					<el-table-column label="所属岗位" prop="post" min-width="80">
-						<template #default="scope">{{scope.row.post_.name}}</template>
-					</el-table-column>
-					<el-table-column label="拥有角色" prop="role" min-width="80">
-						<template #default="scope">{{scope.row.role_.name}}</template>
-					</el-table-column>
-					<el-table-column label="权限范围" prop="data_range" min-width="80">
-						<template #default="scope">{{options[scope.row.data_range]}}</template>
-					</el-table-column>
-					<el-table-column label="操作" fixed="right" align="right">
-						<template #default="scope">
-							<el-button type="warning" link size="small" @click="postRoleEdit(scope.row)">编辑
-							</el-button>
-							<el-button type="warning" link size="small" @click="postRoleDel(scope.row)">删除
-							</el-button>
-						</template>
-					</el-table-column>
-				</scTable>
-			</el-main>
-		</el-container>
-	</el-container>
-	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
-				 @closed="dialog.save=false"></save-dialog>
-	<save-role-dialog v-if="dialog.roleSave" ref="saveRoleDialog" @success="handleSaveRoleSuccess"
-				 @closed="dialog.roleSave=false"></save-role-dialog>
-
+  <el-container>
+    <el-aside width="40%">
+      <el-container>
+        <el-header>
+          <div class="left-panel">
+            <div style="margin-right: 20px">岗位列表</div>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="add"
+            ></el-button>
+          </div>
+        </el-header>
+        <el-main class="nopadding">
+          <scTable
+            ref="table"
+            :apiObj="apiObj"
+            row-key="id"
+            stripe
+            highlightCurrentRow
+            @row-click="rowClick"
+            :hidePagination="true"
+          >
+            <!-- <el-table-column type="selection" width="50"></el-table-column> -->
+            <el-table-column label="" type="index"></el-table-column>
+            <el-table-column
+              label="名称"
+              prop="name"
+              width="120"
+            ></el-table-column>
+            <el-table-column
+              label="标识"
+              prop="code"
+              width="60"
+            ></el-table-column>
+            <el-table-column
+              label="最短在岗(h)"
+              prop="min_hour"
+              width="100"
+            ></el-table-column>
+            <el-table-column
+              label="最长在岗(h)"
+              prop="max_hour"
+              width="100"
+            ></el-table-column>
+            <el-table-column label="操作" fixed="right" align="right">
+              <template #default="scope">
+                <el-button
+                  type="warning"
+                  link
+                  size="small"
+                  @click="table_edit(scope.row)"
+                  >编辑
+                </el-button>
+              </template>
+            </el-table-column>
+          </scTable>
+        </el-main>
+      </el-container>
+    </el-aside>
+    <el-container>
+      <el-header>
+        <div class="left-panel">
+          <div style="margin-right: 20px">岗位权限</div>
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            @click="addPostRole"
+          ></el-button>
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            @click="delPostRole"
+          ></el-button>
+        </div>
+      </el-header>
+      <el-main class="nopadding">
+        <scTable
+          ref="table2"
+          :apiObj="apiObj2"
+          row-key="id"
+          stripe
+          :hidePagination="true"
+        >
+          <!-- <el-table-column type="selection" width="50"></el-table-column> -->
+          <el-table-column label="" type="index"></el-table-column>
+          <el-table-column label="所属岗位" prop="post" min-width="80">
+            <template #default="scope">{{ scope.row.post_.name }}</template>
+          </el-table-column>
+          <el-table-column label="拥有角色" prop="role" min-width="80">
+            <template #default="scope">{{ scope.row.role_.name }}</template>
+          </el-table-column>
+          <el-table-column label="权限范围" prop="data_range" min-width="80">
+            <template #default="scope">{{
+              options[scope.row.data_range]
+            }}</template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="right">
+            <template #default="scope">
+             
+              <el-button
+                type="warning"
+                link
+                size="small"
+                @click="postRoleDel(scope.row)"
+                >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </scTable>
+      </el-main>
+    </el-container>
+  </el-container>
+  <save-dialog
+    v-if="dialog.save"
+    ref="saveDialog"
+    @success="handleSaveSuccess"
+    @closed="dialog.save = false"
+  ></save-dialog>
+  <save-role-dialog
+    v-if="dialog.roleSave"
+    ref="saveRoleDialog"
+    @success="handleSaveRoleSuccess"
+    @closed="dialog.roleSave = false"
+  ></save-role-dialog>
 </template>
 
 <script>
-	import saveDialog from './post_form.vue'
-	import saveRoleDialog from './post_role_form.vue'
-	export default {
-		name: 'listSon',
-		components: {
-			saveDialog,
-			saveRoleDialog,
-		},
-		data() {
-			return {
-				apiObj: this.$API.system.post.list,
-				apiObj2: this.$API.system.postrole.list,
-				dialog: {
-					save: false,
-					roleSave: false,
-				},
-				selection: [],
-				postId:'',
-				options: {
-					10: "全部",
-					20: "自定义",
-					30: "同级及以下",
-					40: "本级及以下",
-					50: "本级",
-					60: "仅本人"
-				},
-			}
-		},
-		methods: {
-			rowClick(row) {
-				let params = {
-					post: row.id
-				};
-				this.postId = row.id;
-				this.$refs.table2.reload(params)
-			},
-			//窗口新增
-			add() {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open()
-				})
-			},
-			//窗口编辑
-			table_edit(row) {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open('edit').setData(row)
-				})
-			},
-			//批量删除
-			async batch_del() {
-				var confirmRes = await this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？`, '提示', {
-					type: 'warning',
-					confirmButtonText: '删除',
-					confirmButtonClass: 'el-button--danger'
-				}).catch(() => {
-				})
+import saveDialog from "./post_form.vue";
+import saveRoleDialog from "./post_role_form.vue";
+export default {
+  name: "listSon",
+  components: {
+    saveDialog,
+    saveRoleDialog,
+  },
+  data() {
+    return {
+      apiObj: this.$API.system.post.list,
+      apiObj2: this.$API.system.postrole.list,
+      dialog: {
+        save: false,
+        roleSave: false,
+      },
+      selection: [],
+      postId: "",
+      options: {
+        10: "全部",
+        20: "自定义",
+        30: "同级及以下",
+        40: "本级及以下",
+        50: "本级",
+        60: "仅本人",
+      },
+    };
+  },
+  methods: {
+    rowClick(row) {
+      let params = {
+        post: row.id,
+      };
+      this.apiObj2 = this.$API.system.postrole.list;
+      this.postId = row.id;
+      this.$refs.table2.reload(params);
+    },
+    //窗口新增
+    add() {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open();
+      });
+    },
+    //窗口编辑
+    table_edit(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("edit").setData(row);
+      });
+    },
+    //批量删除
+    async batch_del() {
+      var confirmRes = await this.$confirm(
+        `确定删除选中的 ${this.selection.length} 项吗？`,
+        "提示",
+        {
+          type: "warning",
+          confirmButtonText: "删除",
+          confirmButtonClass: "el-button--danger",
+        }
+      ).catch(() => {});
 
-				if (!confirmRes) {
-					return false
-				}
+      if (!confirmRes) {
+        return false;
+      }
 
-				var ids = this.selection.map(v => v.id)
-				this.$refs.table.removeKeys(ids)
-				this.$message.success("操作成功")
+      var ids = this.selection.map((v) => v.id);
+      this.$refs.table.removeKeys(ids);
+      this.$message.success("操作成功");
+    },
+    //新增岗位后更新数据
+    handleSaveSuccess(data, mode) {
+      //为了减少网络请求，直接变更表格内存数据
+      if (mode == "add") {
+        this.$refs.table.unshiftRow(data);
+      } else if (mode == "edit") {
+        this.$refs.table.updateKey(data);
+      }
 
-			},
-			//新增岗位后更新数据
-			handleSaveSuccess(data, mode) {
-				//为了减少网络请求，直接变更表格内存数据
-				if (mode == 'add') {
-					this.$refs.table.unshiftRow(data)
-				} else if (mode == 'edit') {
-					this.$refs.table.updateKey(data)
-				}
-
-				//当然也可以暴力的直接刷新表格
-				// this.$refs.table.refresh()
-			},
-			//新增岗位关系后更新数据
-			handleSaveRoleSuccess() {
-				this.$refs.table2.refresh()
-			},
-			addPostRole(){
-				this.dialog.roleSave = true;
-				this.$nextTick(() => {
-					this.$refs.saveRoleDialog.open("add").setData({postId:this.postId})
-				})
-			},
-			postRoleEdit(row){
-				this.dialog.roleSave = true;
-				this.$nextTick(() => {
-					this.$refs.saveRoleDialog.open("edit").setData(row)
-				})
-			},
-			delPostRole(){
-
-			},
-			closed(){
-				this.dialog.save = false;
-				this.dialog.roleSave = false;
-				this.postId = '';
-				this.$refs.table2.refresh();
-			},
-			postRoleDel(row){
-				this.$confirm(`确定删除选中的岗位关系吗？`, '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.$API.system.postrole.delete.req(row.id).then(res=>{
-						if(res.err_msg){
-							this.$message.error(res.err_msg)
-						}else{
-							const loading = this.$loading();
-							this.$refs.table2.refresh();
-							loading.close();
-							this.$message.success("操作成功")
-						}
-					})
-
-				}).catch(() => {
-
-				})
-			},
-		}
-	}
+      //当然也可以暴力的直接刷新表格
+      // this.$refs.table.refresh()
+    },
+    //新增岗位关系后更新数据
+    handleSaveRoleSuccess() {
+      this.$refs.table2.refresh();
+    },
+    addPostRole() {
+      this.dialog.roleSave = true;
+      this.$nextTick(() => {
+        this.$refs.saveRoleDialog.open("add").setData({ postId: this.postId });
+      });
+    },
+    postRoleEdit(row) {
+      this.dialog.roleSave = true;
+      this.$nextTick(() => {
+        this.$refs.saveRoleDialog.open("edit").setData(row);
+      });
+    },
+    delPostRole() {},
+    closed() {
+      this.dialog.save = false;
+      this.dialog.roleSave = false;
+      this.postId = "";
+      this.$refs.table2.refresh();
+    },
+    postRoleDel(row) {
+      this.$confirm(`确定删除选中的岗位关系吗？`, "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          this.$API.system.postrole.delete.req(row.id).then((res) => {
+            if (res.err_msg) {
+              this.$message.error(res.err_msg);
+            } else {
+              const loading = this.$loading();
+              this.$refs.table2.refresh();
+              loading.close();
+              this.$message.success("操作成功");
+            }
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style>
diff --git a/src/views/sys/post_role_form.vue b/src/views/sys/post_role_form.vue
index 5de6bf59..bd51bf62 100644
--- a/src/views/sys/post_role_form.vue
+++ b/src/views/sys/post_role_form.vue
@@ -133,6 +133,7 @@ export default {
 	  },
     //表单提交方法
     async submit() {
+		
       var valid = await this.$refs.form.validate().catch(() => {});
       if (!valid) {
         return false;
@@ -140,11 +141,9 @@ export default {
       this.isSaveing = true;
       try {
         let res;
-        if (this.mode === "add") {
+        
           res = await this.$API.system.postrole.create.req(this.form);
-        } else if (this.mode === "edit") {
-          res = await this.$API.system.postrole.update.req(this.form.id, this.form);
-        }
+        
         this.isSaveing = false;
         this.$emit("success", this.form, this.mode);
         this.visible = false;

From 21434b4ef80e179924838c7ab712fbafa410dd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 18 Jul 2022 11:16:32 +0800
Subject: [PATCH 3/3] v auth

---
 src/components/scTable/index.vue |  2 +-
 src/utils/permission.js          |  3 +++
 src/views/am/audio.vue           | 34 ++++++++++++++++++++++----------
 src/views/am/monitor.vue         | 15 ++++++--------
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index ab45a7f8..e640a97c 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -310,7 +310,7 @@ export default {
         this.$emit("dataChange", res, this.tableData);
       } catch (error) {
         this.loading = false;
-        if(error.response.data){
+        if(error.response && error.response.data){
           this.emptyText = error.response.data.err_msg;
         }else{
           this.emptyText = error.statusText || "数据格式错误";
diff --git a/src/utils/permission.js b/src/utils/permission.js
index a8dd63e7..8b75d1b0 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -2,6 +2,9 @@ import tool from '@/utils/tool';
 
 export function permission(data) {
 	let permissions = tool.data.get("PERMISSIONS");
+	if (permissions.indexOf('superuser')>-1){
+		return true
+	}
 	if(!permissions){
 		return false;
 	}
diff --git a/src/views/am/audio.vue b/src/views/am/audio.vue
index 2429ef40..71e552b7 100644
--- a/src/views/am/audio.vue
+++ b/src/views/am/audio.vue
@@ -2,34 +2,37 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-refresh" @click="syncData"
+        <el-button type="primary" icon="el-icon-refresh" @click="syncData" :syncLoading="syncLoading"
           >同步</el-button
         >
       </div>
       <div class="right-panel">
-        <el-input
-          v-model="search.keyword"
+        <!-- <el-input
+          v-model="query.code"
           placeholder="编号"
           clearable
-          @click="upsearch"
+          @click="handleQuery"
         ></el-input>
         <el-button
           type="primary"
           icon="el-icon-search"
-          @click="upsearch"
-        ></el-button>
+          @click="handleQuery"
+        ></el-button> -->
       </div>
     </el-header>
     <el-main class="nopadding">
       <scTable
         ref="table"
         :apiObj="apiObj"
+        :pageStr="pageStr"
+        :pageSizeStr="pageSizeStr"
+        :parseData="parseData"
         row-key="id"
         @selection-change="selectionChange"
         stripe
         @resetQuery="resetQuery"
       >
-        <el-table-column type="selection" width="50"></el-table-column>
+        <!-- <el-table-column type="selection" width="50"></el-table-column> -->
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column
           label="喇叭名称"
@@ -46,14 +49,14 @@
         <el-table-column
           label="设备sn"
           prop="sn"
-          min-width="90"
+          min-width="150"
         ></el-table-column>
         <el-table-column label="ip" prop="extra" min-width="90">
           <template #default="scope">
             <span v-if="scope.row.extra">{{ scope.row.extra.ip }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="extra" min-width="90">
+        <el-table-column label="在线状态" prop="extra" min-width="90">
           <template #default="scope">
             <span v-if="scope.row.extra">{{ scope.row.extra.online }}</span>
           </template>
@@ -105,6 +108,15 @@ export default {
     return {
       syncLoading: false,
       apiObj: this.$API.am.tdevice.speaker,
+      pageStr: "page",
+      pageSizeStr: "pageSize",
+      parseData: (res) => {
+        return {
+          data: res, //分析无分页的数据字段结构
+          rows: res.rows, //分析行数据字段结构
+          total: res.total, //分析总数字段结构
+        };
+      },
       dialogSave: false,
       limitedVisible: false,
       query: {},
@@ -128,7 +140,9 @@ export default {
     },
 
     //搜索
-    upsearch() {},
+    handleQuery() {
+      this.$refs.table.refresh();
+    },
 
     resetQuery() {
       this.query = {};
diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue
index a0461164..44b1b84f 100644
--- a/src/views/am/monitor.vue
+++ b/src/views/am/monitor.vue
@@ -11,17 +11,17 @@
         >
       </div>
       <div class="right-panel">
-        <el-input
-          v-model="search.keyword"
+        <!-- <el-input
+          v-model="query.channelCode"
           placeholder="编号"
           clearable
-          @click="upsearch"
+          @click="handleQuery"
         ></el-input>
         <el-button
           type="primary"
           icon="el-icon-search"
-          @click="upsearch"
-        ></el-button>
+          @click="handleQuery"
+        ></el-button> -->
       </div>
     </el-header>
     <el-main class="nopadding">
@@ -151,9 +151,6 @@ export default {
       syncLoading: false,
       query: {},
       selection: [],
-      search: {
-        keyword: null,
-      },
       channelId: "",
       params: {
         json: {
@@ -246,7 +243,7 @@ export default {
     },
 
     //搜索
-    upsearch() {},
+    handleQuery() {this.$refs.table.refresh();},
 
     resetQuery() {
       this.query = {};