From df9a1f38f9d035790a45bd28900c24dd0403080a 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, 20 Jun 2022 18:21:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9system.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/system.js        |  27 +++++
 src/views/ecm/event.vue        | 187 ++++++++++++++++++---------------
 src/views/ecm/event_detail.vue |   0
 src/views/ecm/event_form.vue   | 102 ++++++++++++++++++
 4 files changed, 232 insertions(+), 84 deletions(-)
 delete mode 100644 src/views/ecm/event_detail.vue
 create mode 100644 src/views/ecm/event_form.vue

diff --git a/src/api/model/system.js b/src/api/model/system.js
index 0c5d16c1..b6cec3b0 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -184,4 +184,31 @@ export default {
 			}
 		}
 	},
+	post:{
+        list: {
+			name: "获取",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/system/post/`,
+					data
+				);
+			}
+		},
+		create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/system/post/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id, data){
+				return await http.delete(
+					`${config.API_URL}/system/post/${id}/`,
+					data);
+			}
+		},
+    },
 }
diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index e09b0f44..38f1b7ea 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -1,6 +1,6 @@
 <template>
-	<el-container>
-		<!-- <el-header>
+  <el-container>
+    <!-- <el-header>
 			<div class="left-panel">
 				<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
 				<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
@@ -13,90 +13,109 @@
 				</div>
 			</div>
 		</el-header> -->
-		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" fit stripe @resetQuery="resetQuery">
-				<el-table-column label="#" type="index" width="50"></el-table-column>
-				<el-table-column label="事件种类" prop="cate_name"></el-table-column>
-				<el-table-column label="发生区域" prop="area_name">
-				</el-table-column>
-                <el-table-column label="人员类型" prop="peope_type">
-                    <template #default="scope">
-                        <span v-if="scope.row.peope_type=='employee'">企业员工</span>
-                        <span v-if="scope.row.peope_type=='remployee'">相关方</span>
-                        <span v-if="scope.row.peope_type=='visitor'">访客</span>
-                    </template>
-                </el-table-column>
-				<el-table-column label="当事人" prop="people_name"></el-table-column>
-				<el-table-column label="发生时间" prop="create_time"></el-table-column>
-                <el-table-column label="是否已处理">
-                    <template #default="scope">
-                        <el-icon v-if="scope.row.handle_user" color="green"><CircleCheckFilled /></el-icon>
-                        <el-icon v-else color="red"><CircleCloseFilled /></el-icon>
-                    </template>
-                </el-table-column>
-				<el-table-column label="操作" fixed="right" align="right">
-					<template #default="scope">
-						<el-button-group>
-							<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-							<!-- <el-button text type="warning" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button> -->
-							<!-- <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        row-key="id"
+        fit
+        stripe
+        @resetQuery="resetQuery"
+      >
+        <el-table-column label="#" type="index" width="50"></el-table-column>
+        <el-table-column label="事件种类" prop="cate_name"></el-table-column>
+        <el-table-column label="发生区域" prop="area_name"> </el-table-column>
+        <el-table-column label="人员类型" prop="peope_type">
+          <template #default="scope">
+            <span v-if="scope.row.peope_type == 'employee'">企业员工</span>
+            <span v-if="scope.row.peope_type == 'remployee'">相关方</span>
+            <span v-if="scope.row.peope_type == 'visitor'">访客</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当事人" prop="people_name"></el-table-column>
+        <el-table-column label="发生时间" prop="create_time"></el-table-column>
+        <el-table-column label="是否已处理">
+          <template #default="scope">
+            <el-icon v-if="scope.row.handle_user" color="green"
+              ><CircleCheckFilled
+            /></el-icon>
+            <el-icon v-else color="red"><CircleCloseFilled /></el-icon>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="right">
+          <template #default="scope">
+            <el-button-group>
+              <el-button
+                text
+                type="primary"
+                size="small"
+                @click="table_show(scope.row, scope.$index)"
+                >查看/处理</el-button
+              >
+              <!-- <el-button text type="warning" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button> -->
+              <!-- <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 								<template #reference>
 									<el-button text type="danger" size="small">删除</el-button>
 								</template>
 							</el-popconfirm> -->
-						</el-button-group>
-					</template>
-				</el-table-column>
-
-			</scTable>
-		</el-main>
-	</el-container>
-    </template>
+            </el-button-group>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+    <save-dialog
+    v-if="dialog.save"
+    ref="saveDialog"
+    @success="handleSaveSuccess"
+    @closed="dialog.save = false"
+  ></save-dialog>
+</template>
     <script>
-    import { CircleCheckFilled, CircleCloseFilled } from '@element-plus/icons-vue'
-	export default {
-		name: 'event',
-		components: {
-            CircleCheckFilled,
-            CircleCloseFilled
-		},
-		data() {
-			return {
-				dialog: {
-					save: false,
-					permission: false
-				},
-				apiObj: this.$API.ecm.event.list,
-				query: {},
-				selection: [],
-				search: {
-					keyword: null
-				}
-			}
-		},
-		methods: {
-			//查看
-			table_show(row){
-				this.dialog.save = true
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open('show').setData(row)
-				})
-			},
-			//搜索
-			upsearch(){
-
-			},
-			//本地更新数据
-			handleSaveSuccess(data, mode){
-				if(mode=='add'){
-					this.$refs.table.refresh()
-				}else if(mode=='edit'){
-					this.$refs.table.refresh()
-				}
-			},
-			resetQuery(){
-				this.query = {}
-			}
-		}
-	}
-    </script>
\ No newline at end of file
+import saveDialog from "./event_form.vue";
+import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue";
+export default {
+  name: "event",
+  components: {
+    CircleCheckFilled,
+    CircleCloseFilled,
+    saveDialog,
+  },
+  data() {
+    return {
+      dialog: {
+        save: false,
+        permission: false,
+      },
+      apiObj: this.$API.ecm.event.list,
+      query: {},
+      selection: [],
+      search: {
+        keyword: null,
+      },
+    };
+  },
+  methods: {
+    //查看
+    table_show(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("show").setData(row);
+      });
+    },
+    //搜索
+    upsearch() {},
+    //本地更新数据
+    handleSaveSuccess(data, mode) {
+      if (mode == "add") {
+        this.$refs.table.refresh();
+      } else if (mode == "edit") {
+        this.$refs.table.refresh();
+      }
+    },
+    resetQuery() {
+      this.query = {};
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/ecm/event_detail.vue b/src/views/ecm/event_detail.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/ecm/event_form.vue b/src/views/ecm/event_form.vue
new file mode 100644
index 00000000..ecaefd54
--- /dev/null
+++ b/src/views/ecm/event_form.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-drawer
+    :title="titleMap[mode]"
+    v-model="visible"
+    :size="1000"
+    destroy-on-close
+    @closed="$emit('closed')"
+  >
+    <el-container v-loading="loading">
+      <el-main style="padding: 0 20px 20px 20px">
+      </el-main>
+      <el-footer>
+        <el-button type="primary" :loading="isSaveing" @click="submit"
+          >提交</el-button
+        >
+        <el-button @click="visible = false">取消</el-button>
+      </el-footer>
+    </el-container>
+  </el-drawer>
+</template>
+
+<script>
+export default {
+  emits: ["success", "closed"],
+  data() {
+    return {
+      loading: false,
+      mode: "add",
+      titleMap: {
+        add: "新增",
+        edit: "编辑",
+        show: "查看/处理",
+      },
+      form: {},
+      rules: {},
+      visible: false,
+      isSaveing: false,
+      selectionFilters: [],
+      setFiltersVisible: false,
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    //显示
+    open(mode = "add") {
+      this.mode = mode;
+      this.visible = true;
+      return this;
+    },
+    //表单提交方法
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          try {
+            var res;
+            if (this.mode == "add") {
+              res = await this.$API.rpm.rparty.create.req(this.form);
+            } else if (this.mode == "edit") {
+              res = await this.$API.rpm.rparty.update.req(
+                this.form.id,
+                this.form
+              );
+            }
+            this.isSaveing = false;
+            this.$emit("success", this.form, this.mode);
+            this.visible = false;
+            this.$message.success("操作成功");
+            return res;
+          } catch (err) {
+            //可以处理校验错误
+            this.isSaveing = false;
+            return err;
+          }
+        }
+      });
+    },
+    //表单注入数据
+    setData(data) {
+      // this.loading = true
+      // const params = {
+      // 	id: data.id
+      // }
+      // setTimeout(async ()=>{
+      // 	var res = await this.$API.system.table.info.get(params)
+      // 	this.loading = false
+      // 	this.form = res.data
+      // },400)
+      Object.assign(this.form, data);
+    },
+    //设置过滤项
+    setFilters(filters) {
+      this.selectionFilters = filters;
+      this.setFiltersVisible = true;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

From 773eeaa0dda8157e51eb2f7bac21ea5f35515921 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 7 Jul 2022 14:07:32 +0800
Subject: [PATCH 2/3] mapcontroller&userdetail

---
 public/img/left_arrow.png     |  Bin 0 -> 250 bytes
 public/img/v_track.png        |  Bin 0 -> 283 bytes
 public/img/v_view.png         |  Bin 0 -> 276 bytes
 src/api/model/hrm.js          |    8 +
 src/api/model/system.js       |    4 +-
 src/api/model/third.js        |   31 +
 src/views/bigScreen/index.vue | 1493 ++++++++++++++++++++++++++++-----
 src/views/hrm/ep_form.vue     |   13 +-
 src/views/sys/user_form.vue   |    8 +-
 9 files changed, 1337 insertions(+), 220 deletions(-)
 create mode 100644 public/img/left_arrow.png
 create mode 100644 public/img/v_track.png
 create mode 100644 public/img/v_view.png

diff --git a/public/img/left_arrow.png b/public/img/left_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3957dd1e4b39e49bc91cfdc9e82db3c3ff039376
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000jF000pP1^@s60t)t_0002NNkl<ZI8UXM
zu?~Vj5JYDVBqk(cY-}hl6lX!A82`Y|!bTe@EwmxAkne}J0?8Q^&h6jq&g?GXP?>1W
zI(Tvnn@AGP;N2lS6Z8kcsUYxRPM+WfFlrk9gx9j#E69Vw*q*W%-bi8yzoc;2XYB({
zC0_V-SdelgsJ>;=!dmonUQI4kyaEh|1W5>(RptPNg5Yup)CRV#ObId{1HIG!r*os?
z=GmIpDQ(-c)1GY+rwi+fINx?x#ObSSE6qQ@01ekS+-lbS%m4rY07*qoM6N<$f`!Xz
A6951J

literal 0
HcmV?d00001

diff --git a/public/img/v_track.png b/public/img/v_track.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1b80150bcc4fecca1bc275dfc1279f96ed489e5
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Yk*IPE0F$AF$kJld<bZeSV@py
zFoS@CfkQxiLVkV2g!v2hA2@&E{)6`)n#8Ug1ggmQba4!kkn}y+DAuGP;Ck@*I@gJ8
zt#|(azanDutY=rmf;**AFVbX%E@(|KF^O2h8CJ>{p{dxMncmQxYEa6X_FdY9S3lt|
zlc)2F64MtC-pqO}a?_>sTZP}G?a!oMsk?iMm8^JLD=NBdb&FZ&{-^98_&GyYrwG>o
Pt!D6a^>bP0l+XkKZ*!0z

literal 0
HcmV?d00001

diff --git a/public/img/v_view.png b/public/img/v_view.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1e424edc5fd6f8658cfbe32de89d5c5f8218a9a
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eSlAhE0F$A0dU^^D+_3ZNJ)@i
zFoS@CfxSaOLP34QgasSUU%3C^{fGHeKOF?h7kIijhDb>E9`qJ!HsE1BsNVBKqIrYS
zcl+!ZPp#}-Uqfa-_pINh?)+{UzyFK1dlkCb*jK4!H+WAg$lAN!Rrb;qhWQO4th1~h
zoC`2pu$pOgDTl1XRHnSmyKYVqn56TdDASYUa)P@3*)O4e4HjK;mCS!Xv)`&Y@X8u!
OH-o3EpUXO@geCwn*@|QU

literal 0
HcmV?d00001

diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 714bba48..f3d0d18c 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -12,6 +12,14 @@ export default {
 				);
 			}
 		},
+		item: {
+			name: "获取企业员工",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/hrm/employee/${id}/`,
+				);
+			}
+		},
 		create: {
 			name: "新增员工",
 			req: async function(data){
diff --git a/src/api/model/system.js b/src/api/model/system.js
index b8eff89a..8225a7c9 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -341,8 +341,8 @@ export default {
 		list: {
 			url: `${config.API_URL}/system/user_post/`,
 			name: "用户/岗位关系",
-			req: async function(params){
-				return await http.get(this.url, params);
+			req: async function(data){
+				return await http.get(this.url, data);
 			}
 		},
 		create: {
diff --git a/src/api/model/third.js b/src/api/model/third.js
index 0ee19e60..05831b4b 100644
--- a/src/api/model/third.js
+++ b/src/api/model/third.js
@@ -14,4 +14,35 @@ export default {
 		},
 		
 	},
+	blt:{
+		all:{
+			name: "全部在线标签列表信息",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/third/tdevice/blt/all/`,
+					data
+				);
+			}
+		},
+		countBind:{
+			name: "统计绑定定位卡人/设备数",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/third/tdevice/blt/count_bind/`,
+					data
+				);
+			}
+		},
+		countNow:{
+			name: "统计在厂终端数",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/third/tdevice/blt/count_now/`,
+					data
+				);
+			}
+		}
+
+	},
+
 }
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index ec424bd6..600de877 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -2,7 +2,7 @@
 	<div class="screen-main">
 		<!--头部展示-->
 		<div class="screen-header">
-			<div class="header-left-bg">驾驶舱</div>
+			<div class="header-left-bg">曲阳金隅智慧安全</div>
 			<div class="header-right-action">
 				<div class="right-action-clock">
 					<span class="action-time">2022-06-22</span>
@@ -54,7 +54,7 @@
 						</div>
 					</div>
 					<div class="drop-content" v-if="showUserSelect">
-						<div @click="changeDropIndex('1')" class="drop-content-item"
+						<!--<div @click="changeDropIndex('1')" class="drop-content-item"
 							 :class="{'active':dropIndex==='1'}">全部
 						</div>
 						<div @click="changeDropIndex('2')" class="drop-content-item"
@@ -66,12 +66,12 @@
 						</div>
 						<div @click="changeDropIndex('4')" class="drop-content-item"
 							 :class="{'active':dropIndex==='4'}">访客
-						</div>
+						</div>-->
 						<el-tree
 							ref="group"
 							id="bigScreenTree"
 							node-key="id"
-							:data="group"
+							:data="postList"
 							show-checkbox
 							:current-node-key="''"
 							:highlight-current="true"
@@ -105,14 +105,21 @@
 		<div class="screen-cockpit">
 			<div class="cockpit-count">
 				<div class="divider"></div>
-				<div class="simple-title">数据统计</div>
+				<div class="simple-title">
+					<span>数据统计</span>
+					<div class="countTypeWrap">
+						<span :class="{'activeCount':countIndex==='1'}" @click="countINdexChange('1')">有卡</span>
+						<el-divider direction="vertical"></el-divider>
+						<span :class="{'activeCount':countIndex==='2'}" @click="countINdexChange('2')">在厂</span>
+					</div>
+				</div>
 				<div class="count-list">
 					<div class="count-list-item">
 						<div class="item-img item-img2"></div>
 						<div class="item-info">
 							<div title="员工" class="normal">内部员工</div>
 							<div class="bottom">
-								<span class="large">76</span>&nbsp;<span class="normal">人</span>
+								<span class="large">{{userCount.count_employee}}</span>&nbsp;<span class="normal">人</span>
 							</div>
 						</div>
 					</div>
@@ -120,7 +127,7 @@
 						<div class="item-img item-img1"></div>
 						<div class="item-info">
 							<div title="外来人员" class="normal">访客</div>
-							<div class="bottom"><span class="large">0</span>&nbsp;<span class="normal">人</span>
+							<div class="bottom"><span class="large">{{userCount.count_visitor}}</span>&nbsp;<span class="normal">人</span>
 							</div>
 						</div>
 					</div>
@@ -129,7 +136,7 @@
 						<div class="item-info">
 							<div title="承包商" class="normal">相关方</div>
 							<div class="bottom">
-								<span class="large">0</span>&nbsp;<span class="normal">人</span>
+								<span class="large">{{userCount.count_remployee}}</span>&nbsp;<span class="normal">人</span>
 							</div>
 						</div>
 					</div>
@@ -138,9 +145,9 @@
 			<div class="cockpit-alarm">
 				<div class="divider"></div>
 				<div class="simple-title" @click="warningDetail= true">
-					<span>告警实时展示</span>
+					<span>报警实时展示</span>
 					<div class="simple-btn-bg alarm-bell danger">
-						<span>{{warningList.length}}</span>&nbsp;报警
+						<span>{{warningData.total}}</span>&nbsp;报警
 					</div>
 				</div>
 				<div class="alarm-content">
@@ -168,7 +175,7 @@
 				</div>
 				<div class="alarm-detail-info left_arrow" v-if="warningDetail">
 					<div class="simple-title">
-						<div><span>告警数据</span></div>
+						<div><span>报警数据</span></div>
 						<div class="action-group">
 							<span class="detail-text-btn">查看详情</span>
 							<span class="icon-close" @click="warningDetail=false"></span>
@@ -228,7 +235,7 @@
 						</div>
 						<div class="content-body">
 							<!--warningList-->
-							<div class="alarm-item" v-for="(item) in warningList" :key="item.id">
+							<div class="alarm-item" v-for="(item) in warningData.list" :key="item.id">
 								<div class="item-type">未处理</div>
 								<div class="item-content" @click="warningItemShow(item)">
 									<div class="item-content-top"><span class="time">{{item.create_time}}</span><span
@@ -236,7 +243,7 @@
 									<div class="item-content-middle mt6">
 										<div class="alarm-info">{{item.voice_msg}}</div>
 									</div>
-								</div >
+								</div>
 							</div>
 							<!--<div class="alarm-item">
 								<div class="item-type">越界报警</div>
@@ -297,10 +304,12 @@
 						</div>
 						<div class="content-footer" style="">
 							<el-pagination
-								:page-size="20"
-								:pager-count="11"
+								:page-size="warningData.params.page_size"
+								:pager-count="5"
+								v-model:currentPage="warningData.params.page"
 								layout="prev, pager, next"
-								:total="100" />
+								:total="warningData.total"
+								@current-change="handleCurrentChange"/>
 						</div>
 						<div class="el-loading-mask" style="background-color: transparent; display: none;">
 							<div class="el-loading-spinner"><i class="el-icon-loading"></i><!----></div>
@@ -311,23 +320,41 @@
 			<div class="cockpit-info">
 				<div class="divider"></div>
 				<div class="simple-title">
-					<div class="header-tab"><span class="tab-item tab-item-active">区域信息情况</span><span class="tab-item">部门信息情况</span>
+					<div class="header-tab">
+						<span class="tab-item">区域信息情况</span>
+						<!--<span class="tab-item" :class="{'tab-item-active':LBType==='2'}" @click="cockpitChange('2')">部门信息情况</span>-->
 					</div>
 					<div class="simple-btn-bg alarm-btn">需充电卡片0人</div>
 				</div>
+				<div class="info-body">
+					<el-table :data="areaList" style="width: 100%" highlight-current-row class="bigScreenTable">
+						<el-table-column label="区域" prop="name"></el-table-column>
+						<el-table-column label="当前人数" prop="count_people"></el-table-column>
+					</el-table>
+					<!--<el-tree
+						ref="group"
+						id="bigScreenTree"
+						node-key="id"
+						:data="group"
+						:current-node-key="''"
+						:highlight-current="true"
+						:expand-on-click-node="false"
+						@node-click="groupClick"
+					></el-tree>-->
+				</div>
 
 			</div>
 		</div>
 		<!--切换-->
-		<div class="screen-tab">
+		<!--<div class="screen-tab">
 			<div class="screen-tab-content">
 				<div class="tab-menu tab-menu-item tab-menu-active"><span class="tab-menu-text">驾驶舱</span></div>
 				<div class="tab-menu tab-menu-item"><span class="tab-menu-text">监控</span></div>
-				<!--<div class="tab-menu tab-menu-item"><span class="tab-menu-text">追踪</span></div>
+				&lt;!&ndash;<div class="tab-menu tab-menu-item"><span class="tab-menu-text">追踪</span></div>
 				<div class="tab-menu tab-menu-item"><span class="tab-menu-text">最终位置</span></div>
-				<div class="tab-menu tab-menu-item"><span class="tab-menu-text">疏散演练</span></div>-->
+				<div class="tab-menu tab-menu-item"><span class="tab-menu-text">疏散演练</span></div>&ndash;&gt;
 			</div>
-		</div>
+		</div>-->
 		<!--地图-->
 		<div id='mapContainer'></div>
 		<!--视频弹窗-->
@@ -337,6 +364,274 @@
                 <div class="v_title">1111111</div>
                 <div class="v_masker"></div>
             </div>-->
+		<!--部门信息-->
+		<div class="screen-job" v-if="screenJob">
+			<div class="simple-title">
+				<div>查看作业详情</div>
+				<div class="simple-btn" @click="closeScreenJob">关闭</div>
+			</div>
+			<div class="job-content">
+				<div class="job-basic">
+					<div class="job-item">
+						<span class="job-item-name">作业证名称：</span>
+						<span class="job-item-info">动火作业</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业证编号：</span>
+						<span class="job-item-info">111111111</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业证等级：</span>
+						<span class="job-item-info">特级</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">申请单位：</span>
+						<span class="job-item-info">金隅</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">申请人：</span>
+						<span class="job-item-info">金隅工人</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">开始时间：</span>
+						<span class="job-item-info">2022-07-01 10:00:00</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">结束时间：</span>
+						<span class="job-item-info">2022-07-02 00:00:00</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业内容：</span>
+						<span class="job-item-info">设备检修</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业人员：</span>
+						<span class="job-item-info">张江,李斯</span>
+					</div>
+				</div>
+				<div class="simple-title">
+					<div>安全措施</div>
+				</div>
+				<div class="job-list">
+					<div class="custom-table">
+						<div class="custom-table-head">
+							<div class="table-head-item w50">序号</div>
+							<div class="table-head-item grow">安全措施</div>
+							<div class="table-head-item w80">确认人</div>
+						</div>
+						<div class="custom-table-body">
+							<div class="table-body-item">
+								<div class="body-item-label w50">1</div>
+								<div class="body-item-label grow">佩戴安全帽，穿安全衣，系安全绳</div>
+								<div class="body-item-label w80">chen</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!--人员列表-->
+		<div class="screen-user" v-if="screenUser">
+			<div class="simple-title">
+				<div>人员信息</div>
+				<div class="simple-btn" @click="screenUser=false">关闭</div>
+			</div>
+			<div class="h100" style="">
+				<div class="person-info-header">
+					<div class="header-basic">
+						<div class="basic-img">
+							<div style="width: 100%; height: 100%;">
+								<img :src="screenUserItem.photo" height="100%" width="100%">
+							</div>
+						</div>
+						<div class="basic-info">
+							<div class="info-item">
+								<span class="info-item-name">姓名：</span>
+								<span class="info-item-info">{{screenUserItem.name}}</span>
+							</div>
+							<div class="info-item">
+								<span class="info-item-name">类型：</span>
+								<span class="info-item-info" v-if="screenUserItem.type==='employee'">内部员工</span>
+								<span class="info-item-info" v-else>访客</span>
+							</div>
+							<div class="info-item">
+								<span class="info-item-name">定位卡：</span>
+								<span class="info-item-info">{{screenUserItem.id}}</span>
+							</div>
+							<div class="info-item">
+								<span class="info-item-name">部门：</span>
+								<span class="info-item-info">{{screenUserItem.belong_dept_name}}</span>
+							</div>
+							<div class="info-item">
+								<span class="info-item-name">岗位：</span>
+								<span class="info-item-info">{{screenUserItem.post_name}}</span>
+							</div>
+						</div>
+						<div class="simple-btn basic-btn" @click="showUserDetail">查看详情</div>
+					</div>
+				</div>
+				<div class="basic-btn-group">
+					<div class="danger-btn-bg btn-item" @click="userTrack">
+						<span class="trackImg"></span>
+						<span>跟踪</span>
+					</div>
+					<div class="simple-btn-bg btn-item">
+						<span class="viewImg"></span>
+						<span>轨迹</span>
+					</div>
+				</div>
+				<div class="screen-per-list">
+					<el-table
+						:data="userList"
+						style="width: 100%"
+						:row-key="row =>{ return row.id }"
+						highlight-current-row
+						class="bigScreenTable"
+						@row-click="userRowClick"
+					>
+						<el-table-column label="姓名">
+							<template #default="scope">
+								<span v-if="scope.row.my_info.employee_">{{scope.row.my_info.employee_.name}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="部门">
+							<template #default="scope">
+								<span
+									v-if="scope.row.my_info.employee_">{{scope.row.my_info.employee_.belong_dept_name}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="岗位">
+							<template #default="scope">
+								<span v-if="scope.row.my_info.employee_">{{scope.row.my_info.employee_.post_name}}</span>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+				<!--人员选详细信息-->
+				<div class="person-cert right_arrow" v-if="screenUserDetail">
+					<div class="simple-title">
+						<div>人员信息</div>
+						<div class="icon-close" @click="screenUserDetail=false"></div>
+					</div>
+					<div class="basic-head">
+						<div class="header-tab">
+							<span class="tab-item tab-item-active">基本信息</span>
+							<!--<span class="tab-item">资质证件</span>-->
+						</div>
+					</div>
+					<div class="basic-info">
+						<div class="info-item">
+							<span class="info-item-name">姓名：</span>
+							<span class="info-item-info">{{screenUserItemDetail.name}}</span>
+						</div>
+						<div class="info-item">
+							<span class="info-item-name">姓别：</span>
+							<span class="info-item-info">{{screenUserItemDetail.gender}}</span>
+						</div>
+
+						<div class="info-item">
+							<span class="info-item-name">定位卡号：</span>
+							<span class="info-item-info">202106180008</span>
+						</div>
+						<div class="info-item">
+							<span class="info-item-name">部门：</span>
+							<span class="info-item-info" v-if="screenUserItemDetail.belong_dept_">{{screenUserItemDetail.belong_dept_.name}}</span>
+						</div>
+						<div class="info-item">
+							<span class="info-item-name">岗位：</span>
+							<span class="info-item-info" v-if="screenUserItemDetail.post_">{{screenUserItemDetail.post_.name}}</span>
+						</div>
+						<div class="info-item">
+							<span class="info-item-name">证件类型：</span>
+							<span class="info-item-info">中华人民共和国居民身份证</span>
+						</div>
+						<div class="info-item">
+							<span class="info-item-name">证件号码：</span>
+							<span class="info-item-info">{{screenUserItemDetail.id_number}}</span>
+						</div>
+						<div class="info-item">
+							<span class="info-item-name">联系电话：</span>
+							<span class="info-item-info">{{screenUserItemDetail.phone}}</span>
+						</div>
+					</div>
+					<div class="basic-cert" style="display: none;">
+						<div class="el-empty">
+							<div class="el-empty__image" style="width: 160px;">
+								<img src="/img/nodata.png" ondragstart="return false"></div>
+							<div class="el-empty__description"><p></p></div>
+						</div>
+					</div>
+					<div class="el-loading-mask" style="background-color: transparent; display: none;">
+						<div class="el-loading-spinner"><i class="el-icon-loading"></i></div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="screen-job" v-if="screenJob">
+			<div class="simple-title">
+				<div>查看作业详情</div>
+				<div class="simple-btn" @click="closeScreenJob">关闭</div>
+			</div>
+			<div class="job-content">
+				<div class="job-basic">
+					<div class="job-item">
+						<span class="job-item-name">作业证名称：</span>
+						<span class="job-item-info">动火作业</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业证编号：</span>
+						<span class="job-item-info">111111111</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业证等级：</span>
+						<span class="job-item-info">特级</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">申请单位：</span>
+						<span class="job-item-info">金隅</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">申请人：</span>
+						<span class="job-item-info">金隅工人</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">开始时间：</span>
+						<span class="job-item-info">2022-07-01 10:00:00</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">结束时间：</span>
+						<span class="job-item-info">2022-07-02 00:00:00</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业内容：</span>
+						<span class="job-item-info">设备检修</span>
+					</div>
+					<div class="job-item">
+						<span class="job-item-name">作业人员：</span>
+						<span class="job-item-info">张江,李斯</span>
+					</div>
+				</div>
+				<div class="simple-title">
+					<div>安全措施</div>
+				</div>
+				<div class="job-list">
+					<div class="custom-table">
+						<div class="custom-table-head">
+							<div class="table-head-item w50">序号</div>
+							<div class="table-head-item grow">安全措施</div>
+							<div class="table-head-item w80">确认人</div>
+						</div>
+						<div class="custom-table-body">
+							<div class="table-body-item">
+								<div class="body-item-label w50">1</div>
+								<div class="body-item-label grow">佩戴安全帽，穿安全衣，系安全绳</div>
+								<div class="body-item-label w80">chen</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
 		<!--危险作业-->
 		<div class="screen-job" v-if="screenJob">
 			<div class="simple-title">
@@ -413,7 +708,8 @@
 				<div class="risk-basic">
 					<div class="risk-item"><span class="risk-item-name">风险区域名称：</span><span class="risk-item-info">重大风险区域</span>
 					</div>
-					<div class="risk-item"><span class="risk-item-name">风险等级：</span><span class="risk-item-info">重大风险</span>
+					<div class="risk-item"><span class="risk-item-name">风险等级：</span><span
+						class="risk-item-info">重大风险</span>
 					</div>
 					<div class="risk-item"><span class="risk-item-name">创建人：</span><span
 						class="risk-item-info">李英</span></div>
@@ -443,7 +739,8 @@
 				<div class="risk-basic">
 					<div class="risk-item">
 						<span class="risk-item-name">报警区域：</span>
-						<span class="risk-item-info" v-if="screenWarningItem.area_">{{screenWarningItem.area_.name}}</span>
+						<span class="risk-item-info"
+							  v-if="screenWarningItem.area_">{{screenWarningItem.area_.name}}</span>
 					</div>
 					<div class="risk-item" v-if="screenWarningItem.employee_!==null">
 						<span class="risk-item-name">触发人：</span>
@@ -455,7 +752,8 @@
 					</div>
 					<div class="risk-item">
 						<span class="risk-item-name">触发事件：</span>
-						<span class="risk-item-info" v-for="ite in screenWarningItem.cates_" :key="ite">{{ite.name}}</span>
+						<span class="risk-item-info" v-for="ite in screenWarningItem.cates_"
+							  :key="ite">{{ite.name}}</span>
 					</div>
 					<div class="risk-item">
 						<span class="risk-item-name">触发时间：</span>
@@ -501,11 +799,14 @@
 </template>
 <script>
 	import {genTree} from "@/utils/verificate";
+
 	export default {
 		data() {
 			return {
 				domMarkerLayer: null,
-				boxMarkerLayer: null,//风险区域
+				userMaskerLayer: null,
+				jobDomMarkerLayer: null,
+				riskMarkerLayer: null,//风险区域
 				pointMarkerLayer: null,//点位图层
 				polygonMaskerLayer: null,//危险作业
 				cameraMaskerLayer: null,//摄像头
@@ -514,29 +815,47 @@
 				manMaskerLayer: null,//人员
 				flyManager: null,
 				dropIndex: '1',
+				countIndex: '2',
 				markList: [false, false, false, false, false, false, false],
 				autoRun: false,
 				screenJob: false,
+				screenUser: false,
 				screenRisk: false,
 				screenWarning: false,
+				screenUserDetail: false,
 				warningTypeShow: false,
 				showUserSelect: false,
 				warningDetail: false,
 				filterCtrlFocus: true,
+				warningListTotal:0,
+				warningData:{
+					list:[],
+					total:0,
+					params:{
+						page:1,
+						page_size:10
+					}
+				},
 				Vchannels: [],//摄像头列表
 				warningList: [],//报警事件列表
 				speakerList: [],//喇叭列表
 				userList: [],//人员列表
 				deptList: [],//部门列表
-				userCount:{
-					employee:0,//内部员工
-					visitor:0,//访客
-					parties:0//相关方
+				postList: [],//岗位列表
+				dangerList: [],//岗位列表
+				areaList: [],//区域列表/风险区域列表
+				//数据统计
+				userCount: {
+					total: 0,
+					count_employee: 0,//内部员工
+					count_remployee: 0,//访客
+					count_visitor: 0//相关方
 				},
 				screenJobItem: {},//危险作业信息
 				screenRiskItem: {},//风险区域信息
 				screenWarningItem: {},//风险区域信息
 				screenUserItem: {},//人员信息
+				screenUserItemDetail: {},//人员信息
 				url: '',
 				params: {
 					json: {
@@ -548,27 +867,24 @@
 					},
 					code: 'video_realtime'
 				},
-				/*groupsProps: {
-					multiple: true,
-					emitPath: false,
-					checkStrictly: true,
-				},*/
 				group: [],
 				groupsProps: {
 					value: "id",
+					label: "name",
 					multiple: true,
 					checkStrictly: true,
 				},
-				filters:{
-					type:'',
-					dept:'',
-					keyword:'',
+				filters: {
+					type: '',
+					dept: '',
+					keyword: '',
 				},
-				warningId:'',
-				warningForm:{
-					handle_desc:'',
-					mark:'1',
+				warningId: '',
+				warningForm: {
+					handle_desc: '',
+					mark: '1',
 				},
+				LBType: '1',
 			}
 		},
 		created() {
@@ -611,25 +927,44 @@
 			});
 			window.map.openMapById('0000');
 			window.map.on('loadComplete', e => {
-				this.domMarkerLayers();
-				this.boxMaskerLayers();//风险区域
-				this.pointMaskerLayers();
+				this.riskMaskerLayers();//风险区域
+				this.userMaskerLayers();//人员
 				this.cameraMaskerLayers();//摄像头
+				this.domMarkerLayers();//监控视频
 				this.polygonMarkerLayers();//危险作业
-				this.speakersMaskerLayers();//laba
+				this.speakersMaskerLayers();//喇叭
+				this.jobDomMarkerLayers();//危险作业图片
+				// let compassControl = new jsmap.JSMapGestureController(map);
+				let compassControl = new jsmap.JSCompassControl({
+					position: jsmap.JSControlPosition.LEFT_TOP,
+					offset: {
+						x: 450,
+						y: 70
+					}
+				});
+				window.map.addControl(compassControl);
+				let zoomControl = new jsmap.JSZoomControl({
+					position: jsmap.JSControlPosition.LEFT_TOP,
+					offset: {
+						x: 480,
+						y: 60
+					}
+				});
+				window.map.addControl(zoomControl);
+				// this.pointMaskerLayers();//点
 			});
 			window.map.on('mapClickNode', event => {
-				debugger;
 				let item = event;
+				let that = this;
 				let type = event.nodeType.toString();
-				console.log(type==='Symbol(icontextmaker)');
+				console.log(type === 'Symbol(icontextmaker)');
 				if (item.markers.length > 0) {
-					if(type==='Symbol(boxmarker)'){
+					if (type === 'Symbol(boxmarker)') {
 						this.screenJob = false;
 						this.screenWarning = false;
 						this.screenRisk = true;
 						//风险区域
-					}else if(type==='Symbol(icontextmaker)'){
+					} else if (type === 'Symbol(icontextmaker)') {
 						//摄像头和人员
 						if (document.getElementById(item.markers[0].id) === null) {
 							if (item.markers[0].image === "/img/camera.svg") {
@@ -654,7 +989,7 @@
 										console.log(node);
 									}
 								});
-								window.map.addMarker(domMarker);
+								this.domMarkerLayer.addMarker(domMarker);
 								var otest = document.getElementById(item.markers[0].id);
 								// 创建一个新dom,并设置icon，绑定点击事件
 								let newEle = document.createElement("div");
@@ -676,7 +1011,6 @@
 								otest.appendChild(newEle2);
 								newEle2.onclick = () => {
 									this.$API.am.video.item.req(this.params).then(res => {
-										debugger;
 										console.log(res);
 										this.url = res.url;
 										if (flvjs.isSupported()) {
@@ -695,12 +1029,14 @@
 									let nodeMark = document.getElementById(item.markers[0].id);
 									nodeMark.remove();
 								}
-							}else{
+							} else {
 								//人员
+								that.screenUserItem = item.properties.get("employee");
+								that.screenUser = true;
 							}
 						}
 
-					}else if(type==='Symbol(polygonmarker)'){
+					} else if (type === 'Symbol(polygonmarker)') {
 						//危险作业
 						this.screenRisk = false;
 						this.screenWarning = false;
@@ -716,89 +1052,190 @@
 									<div class="v_masker" style="width: 327px;height: 183px;background: url(.//public/img/v_mask.png) no-repeat;background-size: 100% 100%;" @click="playVideo()"></div>
 									<div id="`+event.markers[0].id+`"></div>
 			* */
-			this.getGroup();
 			//左侧数据统计
-			this.getVchannels();//数据统计
-			this.getWarnings();//报警统计
-			this.getAreas();//区域
-			this.getDepts();//部门
+			this.getManCount();//人员统计$$
+			this.getWarnings();//报警统计$$
+			this.getAreas();//区域/风险区域$$
+			this.getGroup();//部门$$
 			//右上展示数据
-			this.getVchannels();//摄像头
-			this.getDangers();//危险作业
-			this.getRisks();//风险区域
-			this.getSpeakers();//喇叭
-			this.getCars();//车辆
-			this.getMen();//人员
+			this.getVchannels();//摄像头$$
+			this.getDangers();//危险作业$$
+			// this.getRisks();//风险区域$$
+			this.getSpeakers();//喇叭$$
+			this.getAllMen();//人员
+			this.getAllPost();//岗位
+			setInterval(function () {
+				/*this.getManCount();//人员统计$$
+				this.getWarnings();//报警统计$$
+				this.getAreas();//区域*/
+			},3000)
 		},
 		methods: {
-			warningTypeSelected() {
-				debugger;
-				this.warningTypeShow = false;
-				//获取新数据
+			//岗位
+			getAllPost(){
+				this.$API.system.post.list.req({page:0}).then(res=>{
+					let arr = [];
+					let children = genTree(res);
+					for(let i=0;i<4;i++){
+						let obj=new Object();
+						if(i===0){
+							obj.id='';
+							obj.name = '全部';
+							obj.label = '全部';
+						}else if(i===1){
+							obj.id='';
+							obj.name = '内部员工';
+							obj.label = '内部员工';
+							obj.children = children;
+						}else if(i===2){
+							obj.id='';
+							obj.name = '相关方';
+							obj.label = '相关方';
+						}else if(i===3){
+							obj.id='';
+							obj.name = '访客';
+							obj.label = '访客';
+						}
+						arr.push(obj)
+					}
+					this.postList =arr;
+					console.log(arr)
+				})
 			},
+			//人员统计
+			getManCount() {
+				let that = this;
+				if(that.countIndex==='2'){
+					that.$API.third.blt.countNow.req().then(res => {
+						if (res.err_msg) {
+						} else {
+							that.userCount = {...res};
+						}
+					})
+				}else{
+					that.$API.third.blt.countBind.req().then(res => {
+						if (res.err_msg) {
+						} else {
+							that.userCount = {...res};
+						}
+					})
+				}
+			},
+			//有卡/在线切换
+			countINdexChange(index) {
+				this.countIndex = index;
+				this.getManCount();
+			},
+			//获取喇叭列表
 			getSpeakers() {
+				let that = this;
+				that.$API.am.tdevice.speaker.req().then(res => {
+					if (res.err_msg) {
+						that.$message.error(res.err_msg);
+					} else {
+						that.speakerList = res.rows;
+					}
+				});
 			},
+			//获取危险作业
 			getDangers() {
-			},
-			getCars() {
-			},
-			getRisks() {
-			},
-			getMen() {
-			},
-			getDepts() {
-			},
-			getAreas() {
-			},
-			getWarnings() {
-				this.$API.ecm.event.list.req().then(res=>{
-					if(res.err_msg){}else{
-						this.warningList = res.results.filter(item=>{return item.handle_user===null});
+				let that = this;
+				that.$API.opm.operation.list.req().then(res => {
+					if (res.err_msg) {
+
+					} else {
+						that.dangerList = res.results;
 					}
 				})
 			},
+			//区域列表/获取风险区域
+			getAreas() {
+				let that = this;
+				that.$API.am.area.list.req().then(res => {
+					if (res.err_msg) {
+					} else {
+						that.areaList = res.results;
+					}
+				})
+			},
+			//获取人员列表（全部在线标签列表信息）
+			getAllMen() {
+				this.$API.third.blt.all.req().then(res => {
+					if (res.err_msg) {
+					} else {
+						this.userList = res.filter(item => {
+							return item.my_info.employee
+						});
+						console.log(this.userList)
+					}
+				})
+			},
+			handleCurrentChange(){
+				this.getWarnings();
+			},
+			//获取报警列表
+			getWarnings() {
+				this.$API.ecm.event.list.req(this.warningData.params).then(res => {
+					if (res.err_msg) {
+					} else {
+						debugger;
+						this.warningData.list = res.results.filter(item => {
+							return item.handle_user === null;
+						});
+						this.warningData.total = this.warningData.list.length;
+					}
+				})
+			},
+			//警报类型查询
+			warningTypeSelected() {
+				this.warningTypeShow = false;
+				//获取新数据
+			},
 			//加载部门数据
 			getGroup() {
-				this.$API.system.dept.list.req({page: 0}).then(res=>{
-					debugger;
-					if(res.err_msg){}else{
+				this.$API.system.dept.list.req({page: 0}).then(res => {
+					if (res.err_msg) {
+					} else {
 						this.group = genTree(res);
-						let obj = new Object();
+						console.log(this.group);
 					}
 				});
 			},
+			//选择部门
 			groupClick(data) {
 				console.log(data);
 			},
-			userFilter(){
+			//获取人员详细信息
+			showUserDetail() {
+				this.screenUserDetail = true;
+				this.$API.hrm.employee.item.req(this.screenUserItem.id).then(res=>{
+					console.log(res);
+					this.screenUserItemDetail = res;
+				})
+			},
+			//人员类型选择
+			userFilter() {
+				let that = this;
 				this.showUserSelect = false;
+				this.screenUser = true;
+				that.screenUserItem.name=this.userList[0].my_info.employee_.name;
+				that.screenUserItem.type=this.userList[0].my_info.employee_.type;
+				that.screenUserItem.id=this.userList[0].my_info.employee_.id;
+				that.screenUserItem.photo=this.userList[0].my_info.employee_.photo?this.userList[0].my_info.employee_.photo:'';
+				that.screenUserItem.post_name=this.userList[0].my_info.employee_.post_name?this.userList[0].my_info.employee_.post_name:'';
+				that.screenUserItem.belong_dept_name=this.userList[0].my_info.employee_.belong_dept_name?this.userList[0].my_info.employee_.belong_dept_name:'';
 			},
-			domMarkerLayers() {//风险区域
-				this.domMarkerLayer = new jsmap.JSDomMarkerLayer({
-					minimumLevel: 3,
-					maxmumLevel: 22,
-					show: true
-				});
-				window.map.addLayer(this.domMarkerLayer);
-			},
-			boxMaskerLayers() {//风险区域
-				this.boxMarkerLayer = new jsmap.JSBoxMarkerLayer({
+			//风险区域layer
+			riskMaskerLayers() {
+				this.riskMarkerLayer = new jsmap.JSBoxMarkerLayer({
 					minimumLevel: 3,
 					maxmumLevel: 22,
 					show: false
 				});
-				window.map.addLayer(this.boxMarkerLayer);
-				this.showBoxMarkers();
-			},
-			pointMaskerLayers() {//点
-				this.pointMarkerLayer = new jsmap.JSPointMarkerLayer({
-					minimumLevel: 3,
-					maxmumLevel: 22,
-					show: false
-				});
-				window.map.addLayer(this.pointMarkerLayer);
-				this.showPointMarkers();
+				window.map.addLayer(this.riskMarkerLayer);
+				this.showRiskMarkers();
 			},
+			//摄像头layer
 			cameraMaskerLayers() {//图标文字
 				this.cameraMaskerLayer = new jsmap.JSIconTextMarkerLayer({
 					minimumLevel: 3,
@@ -808,6 +1245,34 @@
 				window.map.addLayer(this.cameraMaskerLayer);
 				this.showCameraMarkers();
 			},
+			//监控视频播放
+			domMarkerLayers() {
+				this.domMarkerLayer = new jsmap.JSDomMarkerLayer({
+					minimumLevel: 3,
+					maxmumLevel: 22,
+					show: true
+				});
+				window.map.addLayer(this.domMarkerLayer);
+			},
+			jobDomMarkerLayers() {
+				this.jobDomMarkerLayer = new jsmap.JSDomMarkerLayer({
+					minimumLevel: 3,
+					maxmumLevel: 22,
+					show: false
+				});
+				window.map.addLayer(this.jobDomMarkerLayer);
+				this.showJobDomMarkers();
+			},
+			//员工标记layer
+			userMaskerLayers() {//图标文字
+				this.userMaskerLayer = new jsmap.JSIconTextMarkerLayer({
+					minimumLevel: 3,
+					maxmumLevel: 22,
+					show: false
+				});
+				window.map.addLayer(this.userMaskerLayer);
+			},
+			//喇叭layer
 			speakersMaskerLayers() {//消防物资
 				this.materialsMaskerLayer = new jsmap.JSIconTextMarkerLayer({
 					minimumLevel: 3,
@@ -817,6 +1282,7 @@
 				window.map.addLayer(this.materialsMaskerLayer);
 				this.showSpeakersMarkers();
 			},
+			//危险作业Layer
 			polygonMarkerLayers() {//危险作业
 				this.polygonMaskerLayer = new jsmap.JSPolygonMarkerLayer({
 					minimumLevel: 3,
@@ -827,7 +1293,7 @@
 				this.showPolygonMarkers();
 			},
 			//风险区域
-			showBoxMarkers() {
+			showRiskMarkers() {
 				var boxMarker = new jsmap.JSBoxMarker({
 					id: 'box',
 					position: [
@@ -849,7 +1315,7 @@
 						// console.log(marker);
 					}
 				});
-				this.boxMarkerLayer.addMarker(boxMarker);
+				this.riskMarkerLayer.addMarker(boxMarker);
 				var boxMarker1 = new jsmap.JSBoxMarker({
 					id: 'box',
 					position: [
@@ -871,9 +1337,9 @@
 						// console.log(marker);
 					}
 				});
-				this.boxMarkerLayer.addMarker(boxMarker1);
+				this.riskMarkerLayer.addMarker(boxMarker1);
 			},
-			showPointMarkers() {
+			/*showPointMarkers() {
 				let pointMarker = new jsmap.JSPointMarker({
 					id: 'point1',
 					color: '#00FF00',  //填充颜色
@@ -892,7 +1358,7 @@
 					}//回调事件
 				});
 				this.pointMarkerLayer.addMarker(pointMarker);
-			},
+			},*/
 			//摄像头
 			showCameraMarkers() {
 				let that = this;
@@ -906,9 +1372,9 @@
 						image: "/img/camera.svg",
 						text: '摄像头',
 						font: '10px sans-serif',
-						fontColor: '#fff645',
-						imageHeight: 16,
-						imageWidth: 16,
+						fontColor: '#ffffff',
+						imageHeight: 25,
+						imageWidth: 25,
 						backgroundColor: 'rgba(0,0,0,0.3)',
 						backgroundRadius: 1,
 						backgroundStrokeColor: 'rgba(0,0,0,0.3)',
@@ -916,10 +1382,10 @@
 						iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
 						allowPicking: true,
 						displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
-						nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 2),
+						nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
 						show: true,
 						callback: (marker) => {
-							debugger;
+							// iconTextMarker.jump();标注跳动
 							console.log(marker);
 						}
 					});
@@ -927,6 +1393,192 @@
 				})
 
 			},
+			//人员
+			showUserMarkers() {
+				let that = this;
+				let iconTextMarker = null,iconTextMarker1 = null;
+				debugger;
+				if(that.userList.length>0){
+					let employee_ = that.userList[0].my_info.employee_;
+					iconTextMarker = new jsmap.JSIconTextMarker({
+						id: that.userList[0].my_info.code,
+						position: {x: 114.6315404372349, y: 38.813557855009435, z: 0},  //坐标
+						floorId: 1,  //楼层id,默认为1（地面）
+						image: "/img/user.png",
+						text: employee_.name,
+						font: '10px sans-serif',
+						fontColor: '#ffffff',
+						imageHeight: 25,
+						imageWidth: 25,
+						backgroundColor: 'rgba(0,0,0,0.3)',
+						backgroundRadius: 1,
+						backgroundStrokeColor: 'rgba(0,0,0,0.3)',
+						backgroundStrokeWidth: 1,
+						iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
+						allowPicking: true,
+						displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+						nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
+						show: true,
+						properties: {
+							employee: employee_
+						},
+						callback: (marker) => {
+							return employee_
+						}
+					});
+					that.userMaskerLayer.addMarker(iconTextMarker);
+					debugger;
+					let employee_1 = that.userList[1].my_info.employee_;
+					iconTextMarker1 = new jsmap.JSIconTextMarker({
+						id: that.userList[1].my_info.code,
+						position: {x: 114.62923138539462, y: 38.8133418942642, z: 0},  //坐标
+						floorId: 1,  //楼层id,默认为1（地面）
+						image: "/img/user.png",
+						text: employee_1.name,
+						font: '10px sans-serif',
+						fontColor: '#ffffff',
+						imageHeight: 25,
+						imageWidth: 25,
+						backgroundColor: 'rgba(0,0,0,0.3)',
+						backgroundRadius: 1,
+						backgroundStrokeColor: 'rgba(0,0,0,0.3)',
+						backgroundStrokeWidth: 1,
+						iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
+						allowPicking: true,
+						displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+						nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
+						show: true,
+						properties: {
+							employee: employee_1
+						},
+						callback: (marker) => {
+							return employee_1
+						}
+					});
+					that.userMaskerLayer.addMarker(iconTextMarker1);
+				}else{
+					setTimeout(function () {
+						let employee_ = that.userList[0].my_info.employee_;
+						iconTextMarker = new jsmap.JSIconTextMarker({
+							id: that.userList[0].my_info.code,
+							position: {x: 114.6315404372349, y: 38.813557855009435, z: 0},  //坐标
+							floorId: 1,  //楼层id,默认为1（地面）
+							image: "/img/user.png",
+							text: employee_.name,
+							font: '10px sans-serif',
+							fontColor: '#ffffff',
+							imageHeight: 25,
+							imageWidth: 25,
+							backgroundColor: 'rgba(0,0,0,0.3)',
+							backgroundRadius: 1,
+							backgroundStrokeColor: 'rgba(0,0,0,0.3)',
+							backgroundStrokeWidth: 1,
+							iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
+							allowPicking: true,
+							displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+							nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
+							show: true,
+							properties: {
+								employee: employee_
+							},
+							callback: (marker) => {
+								return employee_
+							}
+						});
+						that.userMaskerLayer.addMarker(iconTextMarker);
+
+						let employee_1 = that.userList[1].my_info.employee_;
+						iconTextMarker1 = new jsmap.JSIconTextMarker({
+							id: that.userList[1].my_info.code,
+							position: {x: 114.62923138539462, y: 38.8133418942642, z: 0},  //坐标
+							floorId: 1,  //楼层id,默认为1（地面）
+							image: "/img/user.png",
+							text: employee_1.name,
+							font: '10px sans-serif',
+							fontColor: '#ffffff',
+							imageHeight: 25,
+							imageWidth: 25,
+							backgroundColor: 'rgba(0,0,0,0.3)',
+							backgroundRadius: 1,
+							backgroundStrokeColor: 'rgba(0,0,0,0.3)',
+							backgroundStrokeWidth: 1,
+							iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
+							allowPicking: true,
+							displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+							nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
+							show: true,
+							properties: {
+								employee: employee_1
+							},
+							callback: (marker) => {
+								return employee_1
+							}
+						});
+						that.userMaskerLayer.addMarker(iconTextMarker1);
+					},3000)
+				}
+				/*that.userList.forEach(item => {
+					if (item.my_info.code) {
+						let employee_ = item.my_info.employee_;
+						//{114.62923138539462,38.8133418942642}
+						iconTextMarker = new jsmap.JSIconTextMarker({
+							id: item.my_info.code,
+							position: {x: 114.6315404372349, y: 38.813557855009435, z: 0},  //坐标
+							floorId: 1,  //楼层id,默认为1（地面）
+							image: "/img/user.png",
+							text: employee_.name,
+							font: '10px sans-serif',
+							fontColor: '#ffffff',
+							imageHeight: 25,
+							imageWidth: 25,
+							backgroundColor: 'rgba(0,0,0,0.3)',
+							backgroundRadius: 1,
+							backgroundStrokeColor: 'rgba(0,0,0,0.3)',
+							backgroundStrokeWidth: 1,
+							iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
+							allowPicking: true,
+							displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+							nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
+							show: true,
+							properties: {
+								employee: employee_
+							},
+							callback: (marker) => {
+								return employee_
+							}
+						});
+						that.userMaskerLayer.addMarker(iconTextMarker);
+						iconTextMarker1 = new jsmap.JSIconTextMarker({
+							id: item.my_info.code,
+							position: {x: 114.62923138539462, y: 38.8133418942642, z: 0},  //坐标
+							floorId: 1,  //楼层id,默认为1（地面）
+							image: "/img/user.png",
+							text: employee_.name,
+							font: '10px sans-serif',
+							fontColor: '#ffffff',
+							imageHeight: 25,
+							imageWidth: 25,
+							backgroundColor: 'rgba(0,0,0,0.3)',
+							backgroundRadius: 1,
+							backgroundStrokeColor: 'rgba(0,0,0,0.3)',
+							backgroundStrokeWidth: 1,
+							iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
+							allowPicking: true,
+							displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+							nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
+							show: true,
+							properties: {
+								employee: employee_
+							},
+							callback: (marker) => {
+								return employee_
+							}
+						});
+						that.userMaskerLayer.addMarker(iconTextMarker1);
+					}
+
+				})*/
+			},
 			//危险作业
 			showPolygonMarkers() {
 				let polygonMarker = new jsmap.JSPolygonMarker({
@@ -953,6 +1605,28 @@
 				});
 				this.polygonMaskerLayer.addMarker(polygonMarker);
 			},
+			showJobDomMarkers() {
+				let domMarker = new jsmap.JSDomMarker({
+					id:  'polygonmark',
+					position: new jsmap.JSPoint(114.63168864138028, 38.81254802029822, 0),
+					floorId: 1,
+					depthTest: true,
+					content: `<div style="display: block;position:absolute;z-index: 10;top: 0;background: rgba(24,36,51,.7);padding: 0 16px 16px;box-sizing: border-box" id="vchannelWrap"><div style="background-image: url('/img/speaker.png');width: 60px;height: 80px;"></div></div>`,
+					offset: jsmap.JSControlPosition.RIGHT_CENTER,
+					displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
+					marginOffset: {
+						x: 0,
+						y: 0
+					},
+					properties: {
+						type: 0,
+					},
+					callback: (node) => {
+						console.log(node);
+					}
+				});
+				this.jobDomMarkerLayer.addMarker(domMarker);
+			},
 			//喇叭
 			showSpeakersMarkers() {
 				let materialMarker = new jsmap.JSIconTextMarker({
@@ -962,9 +1636,9 @@
 					image: "/img/speaker.png",
 					text: '喇叭1',
 					font: '10px sans-serif',
-					fontColor: '#fff645',
-					imageHeight: 16,
-					imageWidth: 16,
+					fontColor: '#ffffff',
+					imageHeight: 25,
+					imageWidth: 25,
 					// fontStrokeColor: '#1f0fdd',
 					fontStrokeWidth: 1,
 					backgroundColor: 'rgba(0,0,0,0.3)',
@@ -974,12 +1648,12 @@
 					iconTextType: jsmap.JSIconTextType.TOPTEXT_BOTTOMICON,
 					allowPicking: false,
 					displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
-					nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 2),
+					nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
 					show: true
 				});
 				this.materialsMaskerLayer.addMarker(materialMarker);
 			},
-
+			//显示人员类型选项
 			userSelect() {
 				this.showUserSelect = !this.showUserSelect
 			},
@@ -1008,76 +1682,82 @@
 				}
 
 			},
+			//暂停旋转
 			mapPause() {
 				// this.flyManager.destroy();
 				this.flyManager.pauseFly();
 			},
+			//多选框展开收起
 			filterCtrlFocusChange() {
 				this.filterCtrlFocus = !this.filterCtrlFocus
 			},
+			//页面maker的展示控制
 			markerClick(index) {
 				let arr = [];
-				this.markList[index] = !this.markList[index];
+				let that = this;
+				that.markList[index] = !that.markList[index];
 				if (index === 0) {
-					if (this.markList[0]) {
-						arr = this.markList.map(value => {
+					if (that.markList[0]) {
+						arr = that.markList.map(value => {
 							return true
 						})
 					} else {
-						arr = this.markList.map(value => {
+						arr = that.markList.map(value => {
 							return false
 						})
 					}
-					this.markList = arr;
+					that.markList = arr;
 				} else {
-					let list = this.markList.slice(1, 7);
+					let list = that.markList.slice(1, 7);
 					if (list.indexOf(true) > -1 && list.indexOf(false) < 0) {
-						this.markList[0] = true;
+						that.markList[0] = true;
 					} else {
-						this.markList[0] = false;
+						that.markList[0] = false;
 					}
 				}
-				debugger;
-
-				if (this.markList[1]) {
+				if (that.markList[1]) {
 					window.map.showBuildingMarker = true;
 				} else {
 					window.map.showBuildingMarker = false;
 				}
-				if (this.markList[2]) {
-					this.cameraMaskerLayer.show = true;
+				if (that.markList[2]) {
+					that.cameraMaskerLayer.show = true;
 				} else {
-					this.cameraMaskerLayer.show = false;
+					that.cameraMaskerLayer.show = false;
 				}
-				if (this.markList[3]) {
-					this.materialsMaskerLayer.show = true;
+				if (that.markList[3]) {
+					that.materialsMaskerLayer.show = true;
 				} else {
-					this.materialsMaskerLayer.show = false;
+					that.materialsMaskerLayer.show = false;
 				}
-				if (this.markList[4]) {
-					this.polygonMaskerLayer.show = true;
+				if (that.markList[4]) {
+					that.jobDomMarkerLayer.show = true;
+					that.polygonMaskerLayer.show = true;
 				} else {
-					this.polygonMaskerLayer.show = false;
+					that.jobDomMarkerLayer.show = false;
+					that.polygonMaskerLayer.show = false;
 				}
-				if (this.markList[5]) {
-					this.boxMarkerLayer.show = true;
+				if (that.markList[5]) {
+					that.riskMarkerLayer.show = true;
 				} else {
-					this.boxMarkerLayer.show = false;
+					that.riskMarkerLayer.show = false;
 				}
-				if (this.markList[6]) {
-					// this.boxMarkerLayer.show = true;
+				if (that.markList[6]) {
+					that.$API.third.blt.all.req().then(res => {
+						if (res.err_msg) {
+						} else {
+							that.userMaskerLayer.show = true;
+							that.userList = res.filter(item=>{
+								return item.my_info.code
+							});
+							// this.showUserMarkers();
+							that.showUserMarkers();
+						}
+					})
 				} else {
-					// this.boxMarkerLayer.show = false;
+					that.userMaskerLayer.show = false;
 				}
 			},
-			//选择人员分类
-			changeDropIndex(index) {
-				let that = this;
-				that.dropIndex = index;
-				setTimeout(function () {
-					that.showUserSelect = false;
-				}, 300)
-			},
 			//获取摄像头列表
 			getVchannels() {
 				this.$API.am.video.list.req(this.params).then(res => {
@@ -1088,37 +1768,78 @@
 					}
 				});
 			},
-			warningItemShow(item){
+			//报警详情
+			warningItemShow(item) {
 				this.screenJob = false;
 				this.screenRisk = false;
 				this.screenWarningItem = item;
 				this.warningId = item.id;
 				console.log(item);
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.screenWarning = true;
 				});
-
 			},
-			closeScreenJob(){
+			//关闭危险作业
+			closeScreenJob() {
 				this.screenJob = false;
 			},
-			closeScreenRisk(){
+			//关闭风险区域
+			closeScreenRisk() {
 				this.screenRisk = false;
 			},
-			closeScreenWarning(){
+			//光比报警页面
+			closeScreenWarning() {
 				this.screenWarning = false;
 			},
-			handleWarning(){
-				this.warningForm.mark = parseInt(this.warningForm.mark);
-				this.$API.ecm.req(this.warningId,this.warningForm).then(res=>{
-					if(res.err_msg){
+			//报警处理
+			handleWarning() {
+				let that = this;
+				that.warningForm.mark = parseInt(that.warningForm.mark);
+				that.$API.ecm.event.handle.req(that.warningId, that.warningForm).then(res => {
+					if (res.err_msg) {
 
-					}else{
-						this.screenWarning = false;
-						this.getWarnings();
+					} else {
+						that.screenWarning = false;
+						that.getWarnings();
 					}
 				})
 			},
+			//员工列表点击
+			userRowClick(row){
+				debugger;
+				console.log(row);
+				let that = this;
+				that.screenUserItem.name=row.my_info.employee_.name;
+				that.screenUserItem.type=row.my_info.employee_.type;
+				that.screenUserItem.id=row.my_info.employee_.id;
+				that.screenUserItem.photo=row.my_info.employee_.photo?row.my_info.employee_.photo:'';
+				that.screenUserItem.post_name=row.my_info.employee_.post_name?row.my_info.employee_.post_name:'';
+				that.screenUserItem.belong_dept_name=row.my_info.employee_.belong_dept_name?row.my_info.employee_.belong_dept_name:'';
+			},
+			userTrack(){
+
+			},
+			//区域/部门切换
+			cockpitChange(index) {
+				this.LBType = index;
+			},
+			/*pointMaskerLayers() {//点
+				this.pointMarkerLayer = new jsmap.JSPointMarkerLayer({
+					minimumLevel: 3,
+					maxmumLevel: 22,
+					show: false
+				});
+				window.map.addLayer(this.pointMarkerLayer);
+				this.showPointMarkers();
+			},*/
+			//选择人员分类
+			changeDropIndex(index) {
+				let that = this;
+				that.dropIndex = index;
+				setTimeout(function () {
+					that.showUserSelect = false;
+				}, 300)
+			},
 		},
 		unmounted() {
 			window.map.destroy();
@@ -1128,35 +1849,46 @@
 </script>
 
 <style lang="scss">
-	.handleWarningBtn,.handleWarningBtn:active,
-	.handleWarningBtn:focus,.handleWarningBtn:hover{
+	.handleWarningBtn, .handleWarningBtn:active,
+	.handleWarningBtn:focus, .handleWarningBtn:hover {
 		cursor: pointer;
 		border: 1px solid #30ffdd;
 		color: #ffffff;
 		background: rgba(48, 255, 220, 0.35);
 	}
-	.el-radio.el-radio--small .el-radio__label{
+
+	.el-radio.el-radio--small .el-radio__label {
 		color: #ffffff;
 	}
-	.el-radio__input.is-checked .el-radio__inner{
-		border-color:#30ffdd;
+
+	.el-radio__input.is-checked .el-radio__inner {
+		border-color: #30ffdd;
 		background: #30ffdd;
 	}
-	.el-radio__input.is-checked+.el-radio__label{
-		color:#30ffdd;
+
+	.el-radio__input.is-checked + .el-radio__label {
+		color: #30ffdd;
 	}
-	#bigScreenTree{
-		background: none!important;
+
+	.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+		background: rgba(48, 255, 220, 0);
 	}
-	#bigScreenTree .el-tree-node__content{
+
+	#bigScreenTree {
+		background: none !important;
+	}
+
+	#bigScreenTree .el-tree-node__content {
 		color: #ffffff;
 		/*background-color:rgba(255,255,255,.1);*/
 	}
-	#bigScreenTree .el-tree-node__content:hover{
-		background-color:rgba(255,255,255,.1)
+
+	#bigScreenTree .el-tree-node__content:hover {
+		background-color: rgba(255, 255, 255, .1)
 	}
-	#bigScreenTree .el-tree-node:focus>.el-tree-node__content{
-		background-color:rgba(255,255,255,.1)
+
+	#bigScreenTree .el-tree-node:focus > .el-tree-node__content {
+		background-color: rgba(255, 255, 255, .1)
 	}
 
 	.v_title :before {
@@ -1182,6 +1914,114 @@
 	}
 
 	.screen-main {
+		width: 100%;
+		height: 100%;
+
+		.screen-per-list {
+			height: calc(100% - 270px);
+		}
+
+		.danger-btn-bg {
+			display: inline-block;
+			height: 32px;
+			line-height: 32px;
+			border-radius: 16px;
+			color: #fff;
+			font-size: 14px;
+			padding: 0 18px;
+			border: 1px solid #ffc679;
+			background: #dd8000;
+			box-shadow: inset 0 0 8px #fda732;
+			cursor: pointer;
+		}
+
+		.danger-btn-bg:hover {
+			box-shadow: 0 0 8px #fda732, inset 0 0 8px #fda732;
+		}
+
+		.h100 {
+			height: 100%;
+		}
+
+		.person-info-header {
+			position: relative;
+
+			.basic-btn {
+				position: absolute;
+				right: 0;
+				top: 0;
+			}
+
+			.header-basic {
+				margin-bottom: 8px;
+				display: flex;
+				justify-content: space-between;
+
+				.basic-img {
+					width: 104px;
+					height: 144px;
+				}
+
+				.basic-info {
+					width: calc(100% - 130px);
+
+					.info-item {
+						font-size: 14px;
+						margin-bottom: 6px;
+						display: flex;
+
+						.info-item-name {
+							color: #fff;
+							font-weight: 400;
+							flex-shrink: 0;
+						}
+
+						.info-item-info {
+							color: #fff;
+							font-weight: 500;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+				}
+			}
+		}
+
+		.basic-btn-group {
+			margin: 12px 0;
+			display: flex;
+			justify-content: space-between;
+
+			.btn-item {
+				width: 48%;
+				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.trackImg {
+					width: 16px;
+					height: 16px;
+					margin-right: 4px;
+					background-image: url("/public/img/v_track.png");
+				}
+
+				.viewImg {
+					width: 16px;
+					height: 16px;
+					margin-right: 4px;
+					background-image: url("/public/img/v_view.png");
+				}
+
+				img {
+					width: 16px;
+					height: 16px;
+					margin-right: 4px;
+				}
+			}
+		}
+
 		.screen-header {
 			width: 100% !important;
 			height: 84px !important;
@@ -1391,23 +2231,27 @@
 			height: fit-content;
 			max-height: calc(100% - 180px);
 			padding: 0 16px 16px;
-			background: rgba(24,36,51,.7);
+			background: rgba(24, 36, 51, .7);
 			position: absolute;
 			top: 170px;
 			right: 18px;
 			z-index: 9999;
 			overflow-y: scroll;
 			transition: all .5s linear;
+
 			.risk-content {
 				height: calc(100% - 44px);
+
 				.risk-item {
 					font-size: 14px;
 					margin-bottom: 12px;
 					display: flex;
+
 					.risk-item-name {
-						color: hsla(0,0%,100%,.8);
+						color: hsla(0, 0%, 100%, .8);
 						font-weight: 400;
 					}
+
 					.risk-item-info {
 						color: #fff;
 						font-weight: 500;
@@ -1418,42 +2262,49 @@
 				}
 			}
 		}
+
 		.screen-job {
 			width: 390px;
-
 			padding: 0 16px 16px;
-			background: rgba(24,36,51,.7);
+			background: rgba(24, 36, 51, .7);
 			position: absolute;
 			top: 170px;
 			right: 18px;
 			z-index: 1;
 			transition: all .5s linear;
+
 			.job-content {
 				height: calc(100% - 44px);
 				overflow-y: auto;
-				.job-basic{
+
+				.job-basic {
 					.job-item {
 						font-size: 14px;
 						margin-bottom: 12px;
 						display: flex;
+
 						.job-item-name {
-							color: hsla(0,0%,100%,.8);
+							color: hsla(0, 0%, 100%, .8);
 							font-weight: 400;
 							flex-shrink: 0;
 							width: 90px;
 							text-align: right;
 						}
+
 						.job-item-info {
 							color: #fff;
 							font-weight: 500;
 						}
 					}
 				}
-				.job-list{
+
+				.job-list {
 					.custom-table {
 						height: 100%;
+
 						.custom-table-head {
 							display: flex;
+
 							.table-head-item {
 								padding: 0 4px;
 								color: #fff;
@@ -1467,10 +2318,13 @@
 								text-align: left;
 							}
 						}
+
 						.custom-table-body {
 							max-height: calc(50vh - 100px);
+
 							.table-body-item {
 								display: flex;
+
 								.body-item-label {
 									padding: 0 4px;
 									color: #fff;
@@ -1489,6 +2343,88 @@
 				}
 			}
 		}
+
+		.screen-user {
+			width: 390px;
+			padding: 0 16px 16px;
+			background: rgba(24, 36, 51, .7);
+			position: absolute;
+			top: 170px;
+			right: 18px;
+			z-index: 1;
+			transition: all .5s linear;
+
+			.job-content {
+				height: calc(100% - 44px);
+				overflow-y: auto;
+
+				.job-basic {
+					.job-item {
+						font-size: 14px;
+						margin-bottom: 12px;
+						display: flex;
+
+						.job-item-name {
+							color: hsla(0, 0%, 100%, .8);
+							font-weight: 400;
+							flex-shrink: 0;
+							width: 90px;
+							text-align: right;
+						}
+
+						.job-item-info {
+							color: #fff;
+							font-weight: 500;
+						}
+					}
+				}
+
+				.job-list {
+					.custom-table {
+						height: 100%;
+
+						.custom-table-head {
+							display: flex;
+
+							.table-head-item {
+								padding: 0 4px;
+								color: #fff;
+								font-size: 14px;
+								font-weight: 700;
+								height: 34px;
+								line-height: 34px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								text-align: left;
+							}
+						}
+
+						.custom-table-body {
+							max-height: calc(50vh - 100px);
+
+							.table-body-item {
+								display: flex;
+
+								.body-item-label {
+									padding: 0 4px;
+									color: #fff;
+									font-size: 13px;
+									font-weight: 400;
+									height: 34px;
+									line-height: 34px;
+									white-space: nowrap;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									text-align: left;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
 		.simple-title {
 			line-height: 22px;
 			font-size: 16px;
@@ -1501,6 +2437,7 @@
 			align-items: center;
 			justify-content: space-between;
 		}
+
 		.simple-title:before {
 			content: "";
 			display: inline-block;
@@ -1511,6 +2448,7 @@
 			height: 16px;
 			border: 1px solid #31fe27;
 		}
+
 		.simple-btn {
 			display: inline-block;
 			height: 32px;
@@ -1523,10 +2461,73 @@
 			border: 1px solid #32fde3;
 			cursor: pointer;
 		}
+
 		.grow {
 			flex-grow: 1;
 		}
+
+		.common-basic-info {
+		}
+
+		.person-cert {
+			right: 410px;
+			top: 0;
+			width: 390px;
+			max-height: 630px;
+			border-radius: 4px;
+			padding: 0 20px 20px;
+			position: absolute;
+			background: rgba(24, 36, 51, .7);
+
+			.basic-head {
+				position: relative;
+				margin-bottom: 16px;
+
+				.header-tab {
+					width: 160px;
+				}
+			}
+
+			.basic-info {
+				min-height: 400px;
+
+				.info-item {
+					font-size: 14px;
+					height: 30px;
+					display: flex;
+					align-items: center;
+				}
+
+				.info-item-name {
+					color: #fff;
+					font-weight: 400;
+					flex-shrink: 0;
+				}
+
+				.info-item-info {
+					color: #fff;
+					font-weight: 500;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+
+		.right_arrow:before {
+			content: "";
+			display: inline-block;
+			position: absolute;
+			right: -15px;
+			top: 14px;
+			width: 15px;
+			height: 17px;
+			transform: rotate(180deg);
+			background: url(/public/img/left_arrow.png) no-repeat;
+			background-size: 100% 100%;
+		}
 	}
+
 	.el-dialog__wrapper {
 		position: fixed;
 		top: 0;
@@ -1535,11 +2536,13 @@
 		left: 0;
 		overflow: auto;
 		margin: 0;
+
 		.el-dialog {
 			top: 50%;
-			margin-top: 0!important;
+			margin-top: 0 !important;
 			transform: translateY(-50%);
-			background: rgba(24,36,51,.7);
+			background: rgba(24, 36, 51, .7);
+
 			.el-dialog__header {
 				padding: 0;
 				height: 44px;
@@ -1547,15 +2550,18 @@
 				background-size: 250px 70px;
 				text-align: center;
 			}
+
 			.el-dialog__title {
 				color: #fff;
 				font-size: 15px;
 			}
+
 			.el-dialog__headerbtn {
 				top: 14px;
 			}
 		}
 	}
+
 	.screen-cockpit {
 		.cockpit-count {
 			.count-list {
@@ -1629,6 +2635,31 @@
 					}
 				}
 			}
+
+			.simple-title {
+				.countTypeWrap {
+					font-size: 14px;
+
+					span {
+						cursor: pointer;
+					}
+
+					.activeCount {
+						display: inline-block;
+						height: 32px;
+						line-height: 32px;
+						border-radius: 16px;
+						color: #fff;
+						font-size: 14px;
+						padding: 0 18px;
+						border: 1px solid #32fde3;
+						background: #007767;
+						box-shadow: inset 0 0 8px #5aecf0;
+						cursor: pointer;
+					}
+
+				}
+			}
 		}
 
 		.cockpit-alarm {
@@ -1785,7 +2816,7 @@
 					background: rgba(24, 36, 51, .8);
 					border-radius: 4px;
 					transition: .5s;
-
+					z-index: 10;
 					.drop-content-item {
 						color: #fff;
 						position: relative;
@@ -2008,7 +3039,7 @@
 				position: absolute;
 				left: 0;
 				bottom: -2px;
-				height: 8px;
+				height: 5px;
 				width: 100%;
 				background: linear-gradient(90deg, rgba(48, 255, 221, 0), rgba(48, 255, 221, .8) 50%, rgba(48, 255, 221, 0));
 			}
@@ -2220,6 +3251,7 @@
 					padding: 2px 5px;
 					color: #ffffff;
 					font-weight: 700;
+
 					button {
 						border: none;
 						padding: 0 6px;
@@ -2230,16 +3262,19 @@
 						line-height: 28px;
 						vertical-align: top;
 						box-sizing: border-box;
-						background: rgba(255,255,255,0)!important;
+						background: rgba(255, 255, 255, 0) !important;
 					}
-					.btn-prev{
-						background: rgba(255,255,255,0)!important;
+
+					.btn-prev {
+						background: rgba(255, 255, 255, 0) !important;
 					}
+
 					.el-pager {
 						vertical-align: top;
 						margin: 0;
 						display: inline-block;
-						background: rgba(255,255,255,0)!important;
+						background: rgba(255, 255, 255, 0) !important;
+
 						li {
 							vertical-align: top;
 							margin: 0;
@@ -2251,9 +3286,10 @@
 							line-height: 28px;
 							box-sizing: border-box;
 							text-align: center;
-							background: rgba(255,255,255,0)!important;
+							background: rgba(255, 255, 255, 0) !important;
 						}
 					}
+
 					.btn-next {
 						padding-left: 12px;
 						cursor: pointer;
@@ -2313,6 +3349,7 @@
 		-webkit-font-smoothing: antialiased;
 		-moz-osx-font-smoothing: grayscale;
 	}
+
 	.el-dialog__headerbtn {
 		position: absolute;
 		top: 20px;
@@ -2324,17 +3361,61 @@
 		cursor: pointer;
 		font-size: 16px;
 	}
-	.item-textarea{
+
+	.item-textarea {
 		width: 250px;
 	}
-	.item-textarea>.el-textarea__inner{
+
+	.item-textarea > .el-textarea__inner {
 		resize: none;
 		width: 100%;
 		height: 70px;
 		margin-top: 8px;
 		outline: none;
 		color: #fff;
-		background: hsla(0,0%,100%,.26);
-		border: 1px solid hsla(0,0%,100%,.5);
+		background: hsla(0, 0%, 100%, .26);
+		border: 1px solid hsla(0, 0%, 100%, .5);
+	}
+
+	#mapContainer {
+		width: 100%;
+		height: 100%;
+	}
+
+	#bigScreenUserTable {
+		color: #ffffff;
+	}
+
+	.bigScreenTable.el-table {
+		background-color: rgba(255, 255, 255, 0);
+		color: #ffffff;
+	}
+
+	.bigScreenTable.el-table thead {
+		color: rgba(255, 255, 255, 1);
+	}
+
+	.bigScreenTable.el-table tr {
+		background-color: rgba(255, 255, 255, 0);
+	}
+
+	.bigScreenTable.el-table .el-table__body-wrapper {
+		background-color: rgba(255, 255, 255, 0);
+	}
+
+	.bigScreenTable.el-table th.el-table__cell {
+		background-color: rgba(255, 255, 255, 0);
+	}
+
+	.bigScreenTable.el-table td.el-table__cell, .bigScreenTable.el-table th.el-table__cell.is-leaf {
+		border-bottom: none;
+	}
+
+	.bigScreenTable.el-table .el-table__body tr:hover > td.el-table__cell {
+		background-color: rgba(255, 255, 255, 0);
+	}
+
+	.bigScreenTable.el-table .el-table__body tr.current-row > td.el-table__cell {
+		background-color: rgba(255, 255, 255, .1);
 	}
 </style>
diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue
index 31deb275..84d3851e 100644
--- a/src/views/hrm/ep_form.vue
+++ b/src/views/hrm/ep_form.vue
@@ -41,9 +41,9 @@
 						<el-col :md="12" :sm="24">
 							<el-form-item label="所属部门">
 								<el-cascader
-									v-model="form.dept"
+									v-model="form.belong_dept"
 									:options="group"
-									:props="deptsProps"
+									:props="groupsProps"
 									clearable
 									style="width: 100%;">
 								</el-cascader>
@@ -190,18 +190,12 @@
                         }*/
 					],
 				},
-				addForm: {
-					name: "",
-					sort: "",
-					user: "",
-					post: "",
-					dept: [],
-				},
 				groupsProps: {
 					// value: "id",
 					multiple: false,
 					emitPath: false,
 					checkStrictly: true,
+					expandTrigger: 'hover',
 				},
 				group: [],
 				postOptions: [],
@@ -248,7 +242,6 @@
 				this.$refs.dialogForm.validate((valid) => {
 					if (valid) {
 						this.isSaveing = true;
-						// this.addForm.dept = this.addForm.dept[1];
 						if (this.mode === 'add') {
 							this.$API.hrm.employee.create.req(this.form)
 								.then(res => {
diff --git a/src/views/sys/user_form.vue b/src/views/sys/user_form.vue
index a9cadd0d..c4c92d8c 100644
--- a/src/views/sys/user_form.vue
+++ b/src/views/sys/user_form.vue
@@ -135,7 +135,7 @@
 		mounted() {
 			this.getPosts();
 			this.getGroup();
-			this.getUserPostList();
+
 		},
 		methods: {
 			getPosts(){
@@ -162,6 +162,7 @@
 			setData(data) {
 				debugger;
 				Object.assign(this.form, data);
+				this.getUserPostList();
 			},
 			closeDrawer() {
 				this.visible = false;
@@ -181,7 +182,10 @@
 			/////
 			//用户岗位关系列表
 			getUserPostList(){
-				this.$API.system.userPost.list.req().then(res=>{
+				debugger;
+				console.log(this.form.id);
+				let obj = {user:this.form.id};
+				this.$API.system.userPost.list.req(obj).then(res=>{
 					if(res.err_msg){
 						this.$message.error(res.err_msg)
 					}else{

From a66e64cf7f86e1e28afefc9b6d7fcbb772d3531e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 7 Jul 2022 14:24:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=9F=BA=E6=9C=ACok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js            |   2 +-
 src/views/wf/configuration.vue |   2 +-
 src/views/wf/field.vue         |  30 +-
 src/views/wf/state.vue         | 943 ++++++++++++++++++++-------------
 src/views/wf/transform.vue     |  64 ++-
 5 files changed, 616 insertions(+), 425 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 14b4f10b..6adcde0b 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -168,7 +168,7 @@ const routes = [
         "name": "configuration",
         "path": "/wf/configuration",
         "meta": {
-          "title": "工单",
+          "title": "工作流配置",
           "icon": "el-icon-menu",
           "hidden": true
         },
diff --git a/src/views/wf/configuration.vue b/src/views/wf/configuration.vue
index d588d34f..df35ddef 100644
--- a/src/views/wf/configuration.vue
+++ b/src/views/wf/configuration.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-container>
-		<el-tabs style="width: 100%" type="border-card" v-model="activeName" @tab-click="handleClick">
+		<el-tabs style="width: 100%; height:100%" type="border-card" v-model="activeName" @tab-click="handleClick">
 			<el-tab-pane label="自定义字段" name="customField">
 				<field v-if="activeName==='customField'"></field>
 			</el-tab-pane>
diff --git a/src/views/wf/field.vue b/src/views/wf/field.vue
index 24872024..5949a26b 100644
--- a/src/views/wf/field.vue
+++ b/src/views/wf/field.vue
@@ -6,7 +6,7 @@
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow>
+			<scTable ref="table" :data="list" row-key="id" stripe highlightCurrentRow hidePagination>
 				<el-table-column type="index" width="50"/>
 				<el-table-column label="字段标识" prop="field_key"></el-table-column>
 				<el-table-column label="字段名称" prop="field_name"></el-table-column>
@@ -121,9 +121,8 @@
 		name: "field",
 		data() {
 			return {
-				apiObj: this.$API.wf.field.list,
 				id: sessionStorage.getItem('jinYuWorkflowId'),
-				list: null,
+				list: [],
 				type: "add",
 				titleMap: {
 					add: '新增',
@@ -193,28 +192,6 @@
 			}
 		},
 		mounted() {
-			this.list = [
-				{
-					id: "5001",
-					name: "scEcharts",
-					subtitle: "重新封装的Echarts，暴露源对象",
-					state: "1",
-					type: "数据",
-					progress: 70,
-					user: "sss",
-					time: "2010-10-10"
-				},
-				{
-					id: "5002",
-					name: "scEditor",
-					subtitle: "Tinymce封装的富文本编辑器",
-					state: "2",
-					type: "表单",
-					progress: 40,
-					user: "sss",
-					time: "2010-10-10"
-				}
-			];
 			this.getList();
 		},
 		methods: {
@@ -271,8 +248,7 @@
 				this.addForm = Object.assign({}, row);
 			},
 			async getList() {
-				let res = await this.$API.wf.getCustomfields.get(this.id);
-				console.log(res);
+				let res = await this.$API.wf.workflow.customfields.req(this.id);
 				this.list = res;
 			},
 		},
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index 3043cac7..04f5ceaf 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -1,381 +1,590 @@
 <template>
-	<el-container>
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
-			</div>
-		</el-header>
-		<el-main class="nopadding">
-			<el-table ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow>
-				<el-table-column type="index" width="50"/>
-				<el-table-column label="名称" prop="name"></el-table-column>
-				<el-table-column label="是否隐藏">
-					<template #default="scope">
-						<span v-if="scope.row.is_hidde">是</span>
-						<span v-else>否</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="顺序ID" prop="sort"></el-table-column>
-				<el-table-column label="类型">
-					<template #default="scope">
-						<el-tag effect="plain" v-if="scope.row.type==0">
-							普通类型
-						</el-tag>
-						<el-tag effect="plain" v-if="scope.row.type==1">
-							初始状态
-						</el-tag>
-						<el-tag effect="plain" v-if="scope.row.type==2">
-							结束状态
-						</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="参与人类型">
-					<template #default="scope">{{ options_[scope.row.participant_type] }}</template>
-				</el-table-column>
-				<el-table-column label="创建时间" prop="create_time"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="right" width="120">
-					<template #default="scope">
-						<el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-						<el-popconfirm title="确定删除吗？">
-							<template #reference>
-								<el-button type="text" size="small">删除</el-button>
-							</template>
-						</el-popconfirm>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-dialog
-				v-model="dialogVisible"
-				:title="titleMap[type]"
-			>
-				<el-form
-					ref="Form"
-					:model="addForm"
-					label-width="100px"
-					label-position="right"
-					:rules="rule"
-				>
-					<el-form-item label="名称" prop="name">
-						<el-input v-model="addForm.name" placeholder="名称"/>
-					</el-form-item>
-					<el-form-item
-						label="是否隐藏"
-						prop="is_hidden"
-						label-width="120px"
-					>
-						<el-switch v-model="addForm.is_hidden"></el-switch>
-					</el-form-item>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd"
+        ></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :data="list"
+        row-key="id"
+        stripe
+        highlightCurrentRow
+        hidePagination
+      >
+        <el-table-column label="ID" prop="id"></el-table-column>
+        <el-table-column label="名称" prop="name"></el-table-column>
+        <el-table-column label="是否隐藏">
+          <template #default="scope">
+            <span v-if="scope.row.is_hidde">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="顺序ID" prop="sort"></el-table-column>
+        <el-table-column label="类型">
+          <template #default="scope">
+            <el-tag effect="plain" v-if="scope.row.type == 0">
+              普通类型
+            </el-tag>
+            <el-tag effect="plain" v-if="scope.row.type == 1">
+              初始状态
+            </el-tag>
+            <el-tag effect="plain" v-if="scope.row.type == 2">
+              结束状态
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="参与人类型">
+          <template #default="scope">{{
+            options_[scope.row.participant_type]
+          }}</template>
+        </el-table-column>
+		<el-table-column label="分配方式">
+          <template #default="scope">{{
+            options2_[scope.row.distribute_type]
+          }}</template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="create_time"></el-table-column>
+        <el-table-column label="操作" fixed="right" align="right" width="120">
+          <template #default="scope">
+            <el-button type="text" size="small" @click="handleEdit(scope.row)"
+              >编辑</el-button
+            >
+            <el-popconfirm title="确定删除吗？">
+              <template #reference>
+                <el-button type="text" size="small">删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </scTable>
+      <el-dialog v-model="dialogVisible" :title="titleMap[type]">
+        <el-form
+          ref="Form"
+          :model="addForm"
+          label-width="100px"
+          label-position="right"
+        >
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="addForm.name" placeholder="名称" />
+          </el-form-item>
+          <el-form-item label="是否隐藏" prop="is_hidden" label-width="120px">
+            <el-switch v-model="addForm.is_hidden"></el-switch>
+          </el-form-item>
 
-					<el-form-item label="状态顺序" prop="sort">
-						<el-input v-model="addForm.sort" type="number" placeholder="状态顺序"/>
-					</el-form-item>
-					<el-form-item label="状态类型" prop="type">
-						<el-select style="width: 100%" v-model="addForm.type" placeholder="请选择">
-							<el-option
-								v-for="item in options"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item
-						label="允许撤回"
-						prop="enable_retreat"
-						label-width="120px"
-					>
-						<el-switch v-model="addForm.enable_retreat"></el-switch>
-					</el-form-item>
-					<el-form-item label="参与者类型" prop="participant_type">
-						<el-select style="width: 100%" v-model="addForm.participant_type" placeholder="请选择"
-								   @change="typeChange">
-							<el-option
-								v-for="item in typeoptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="参与者" prop="participant" v-if="addForm.participant_type==1">
-						<el-select style="width: 100%" v-model="participant" placeholder="请选择参与者">
-							<el-option v-for="item in staffs" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="参与者" prop="participant" v-if="addForm.participant_type==2">
-						<el-select style="width: 100%" v-model="participants" multiple placeholder="请选择参与者">
-							<el-option v-for="item in staffs" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="参与者" prop="participant" v-if="addForm.participant_type==7">
-						<el-select style="width: 100%" v-model="participant" placeholder="请选择字段">
-							<el-option v-for="item in fieldList" :key="item.id" :label="item.field_name"
-									   :value="item.field_key">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="分配方式" prop="participant" v-if="addForm.participant_type==2">
-						<el-select style="width: 100%" v-model="addForm.distribute_type" placeholder="请选择分配方式">
-							<el-option label="主动接单" value="1"></el-option>
-							<el-option label="直接处理" value="2"></el-option>
-							<el-option label="随机分配" value="3"></el-option>
-							<el-option label="全部处理" value="4"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="角色" prop="participant" v-if="addForm.participant_type==4">
-						<el-select style="width: 100%" v-model="participants" multiple placeholder="请选择角色">
-							<el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="过滤策略" prop="participant" v-if="addForm.participant_type==4">
-						<el-select style="width: 100%" v-model="addForm.filter_policy" placeholder="请选择过滤策略">
-							<el-option label="无" value="0"></el-option>
-							<el-option label="和工单同属以及上级部门" value="1"></el-option>
-							<el-option label="和创建人同属以及上级部门" value="2"></el-option>
-							<el-option label="和上步处理人同属以及上级部门" value="3"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="代码选择" prop="participant" v-if="addForm.participant_type==9">
+          <el-form-item label="状态顺序" prop="sort">
+            <el-input
+              v-model="addForm.sort"
+              type="number"
+              placeholder="状态顺序"
+            />
+          </el-form-item>
+          <el-form-item label="状态类型" prop="type">
+            <el-select
+              style="width: 100%"
+              v-model="addForm.type"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="允许撤回"
+            prop="enable_retreat"
+            label-width="120px"
+          >
+            <el-switch v-model="addForm.enable_retreat"></el-switch>
+          </el-form-item>
+          <el-form-item label="参与者类型" prop="participant_type">
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant_type"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in typeoptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="参与者"
+            prop="participant"
+            v-if="addForm.participant_type == 1"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              placeholder="请选择参与者"
+            >
+              <el-option
+                v-for="item in staffs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="参与者"
+            prop="participant"
+            v-if="addForm.participant_type == 2"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              multiple
+              placeholder="请选择参与者"
+            >
+              <el-option
+                v-for="item in staffs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="参与者"
+            prop="participant"
+            v-if="addForm.participant_type == 7"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              placeholder="请选择字段"
+            >
+              <el-option
+                v-for="item in fieldList"
+                :key="item.id"
+                :label="item.field_name"
+                :value="item.field_key"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="分配方式"
+            prop="participant"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.distribute_type"
+              placeholder="请选择分配方式"
+            >
+			<el-option
+                v-for="item in dis_type_options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="角色"
+            prop="participant"
+            v-if="addForm.participant_type == 4"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              multiple
+              placeholder="请选择角色"
+            >
+              <el-option
+                v-for="item in roles"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="岗位"
+            prop="participant"
+            v-if="addForm.participant_type == 10"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              multiple
+              placeholder="请选择岗位"
+            >
+              <el-option
+                v-for="item in roles"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="过滤策略"
+            prop="participant"
+            v-if="
+              addForm.participant_type == 4 || addForm.participant_type == 0
+            "
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.filter_policy"
+              placeholder="请选择过滤策略"
+            >
+              <el-option label="无" value="0"></el-option>
+              <el-option label="和工单同属以及上级部门" value="1"></el-option>
+              <el-option label="和创建人同属以及上级部门" value="2"></el-option>
+              <el-option
+                label="和上步处理人同属以及上级部门"
+                value="3"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="代码选择" prop="participant" v-if="addForm.participant_type==9">
 						<el-select style="width: 100%" v-model="participants" placeholder="请选择代码">
 							<el-option v-for="item in codes" :key="item.func" :label="item.name" :value="item.func">
 							</el-option>
 						</el-select>
-					</el-form-item>
-					<el-form-item label="抄送给" prop="participant">
-						<el-select style="width: 100%" v-model="addForm.participant_cc" multiple placeholder="请选择抄送给谁">
-							<el-option v-for="item in staffs" :key="item.id" :label="item.name" :value="item.id">
+					</el-form-item> -->
+          <el-form-item
+            label="代码名"
+            prop="participant"
+            v-if="addForm.participant_type == 9"
+          >
+            <!-- <el-select style="width: 100%" v-model="participants" placeholder="请选择代码">
+							<el-option v-for="item in codes" :key="item.func" :label="item.name" :value="item.func">
 							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="字段状态">
-						<el-button @click="addWordStateChange">添加修改</el-button>
-						<el-row v-for="(item,$index) in stateChange" :key="item+$index" style="margin-top: 2px">
-							<el-col :span="11">
-								<el-select style="width: 100%" v-model="item.name" placeholder="请选择字段">
-									<el-option v-for="item in fieldList" :key="item.id" :label="item.field_name"
-											   :value="item.field_key">
-									</el-option>
-								</el-select>
-							</el-col>
-							<el-col :span="1" style="height: 1px;"></el-col>
-							<el-col :span="8">
-								<el-select style="width: 100%" v-model="item.value" placeholder="请选择状态">
-									<el-option
-										v-for="item in state_fields"
-										:label="item.label"
-										:value="item.value"
-										:key="item.value"
-									></el-option>
-								</el-select>
-							</el-col>
-							<el-col :span="2" style="text-align: center" v-if="$index!==0">
-								<i
-									class="el-icon-remove-outline"
-									style="color: red;font-size: 16px;"
-									@click.prevent="removeStateChange($index)"
-								></i>
-							</el-col>
-						</el-row>
-					</el-form-item>
-				</el-form>
-				<div style="text-align: right">
-					<el-button type="danger" @click="dialogVisible = false">取消</el-button>
-					<el-button type="primary" @click="submitHandle('Form')">确认</el-button>
-				</div>
-			</el-dialog>
-		</el-main>
-	</el-container>
-
+						</el-select> -->
+            <el-input v-model="addForm.participant" placeholder="方法名" />
+          </el-form-item>
+          <el-form-item label="抄送给" prop="participant">
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant_cc"
+              multiple
+              placeholder="请选择抄送给谁"
+            >
+              <el-option
+                v-for="item in staffs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="字段状态">
+            <el-button @click="addWordStateChange">添加修改</el-button>
+            <el-row
+              v-for="(item, $index) in stateChange"
+              :key="item + $index"
+              style="margin-top: 2px"
+            >
+              <el-col :span="11">
+                <el-select
+                  style="width: 100%"
+                  v-model="item.name"
+                  placeholder="请选择字段"
+                >
+                  <el-option
+                    v-for="item in fieldList"
+                    :key="item.id"
+                    :label="item.field_name"
+                    :value="item.field_key"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="1" style="height: 1px"></el-col>
+              <el-col :span="8">
+                <el-select
+                  style="width: 100%"
+                  v-model="item.value"
+                  placeholder="请选择状态"
+                >
+                  <el-option
+                    v-for="item in state_fields"
+                    :label="item.label"
+                    :value="item.value"
+                    :key="item.value"
+                  ></el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="2" style="text-align: center" v-if="$index !== 0">
+                <i
+                  class="el-icon-remove-outline"
+                  style="color: red; font-size: 16px"
+                  @click.prevent="removeStateChange($index)"
+                ></i>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-form>
+        <div style="text-align: right">
+          <el-button type="danger" @click="dialogVisible = false"
+            >取消</el-button
+          >
+          <el-button type="primary" @click="submitHandle('Form')"
+            >确认</el-button
+          >
+        </div>
+      </el-dialog>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-	export default {
-		name: "state",
-		data() {
-			return {
-				apiObj: this.$API.wf.state.list,
-				id: sessionStorage.getItem('jinYuWorkflowId'),
-				list: null,
-				type: "add",
-				titleMap: {
-					add: '新增',
-					edit: '编辑',
-					show: '查看'
-				},
-				participant: '',
-				participants: [],
-				roles: [],
-				staffs: [],
-				stateChange: [],
-				fieldList: [],
-				//表单数据
-				addForm: {
-					name: '',
-					is_hidden: false,
-					sort: '',
-					type: '',
-					participant_cc: [],
-					enable_retreat: false,
-					participant_type: 0,
-					filter_policy: 0,
-					distribute_type: '2',//分发类型
-					state_fields: {}//字段状态是否可写
-				},
-				//验证规则
-				rules: {
-					name: [
-						{required: true, message: '请输入工作流名称'}
-					]
-				},
-				options_: {
-					"0": '无处理',
-					"1": '个人',
-					"2": '多人',
-					"4": '角色',
-					"6": '脚本',
-					"7": '工单的字段',
-					"9": '代码获取',
-				},
-				options: [{
-					value: 0,
-					label: '普通类型'
-				}, {
-					value: 1,
-					label: '初始状态'
-				}, {
-					value: 2,
-					label: '结束状态'
-				}],
-				typeoptions: [{
-					value: 0,
-					label: '无处理'
-				}, {
-					value: 1,
-					label: '个人'
-				}, {
-					value: 2,
-					label: '多人'
-				}
-					, {
-						value: 4,
-						label: '角色'
-					}
-					, {
-						value: 6,
-						label: '脚本'
-					}
-					, {
-						value: 7,
-						label: '工单的字段'
-					}
-					, {
-						value: 9,
-						label: '代码获取'
-					}],
-				state_fields: [
-					{
-						value: 1,
-						label: '只读'
-					}, {
-						value: 2,
-						label: '必填'
-					}, {
-						value: 3,
-						label: '可选'
-					}, {
-						value: 4,
-						label: '隐藏'
-					},
-				],
-				editId: null,
-				dialogVisible: false,
-			}
-		},
-		mounted() {
-			debugger;
-			this.id = sessionStorage.getItem('jinYuWorkflowId');
-			this.getList();
-			this.getUsers();
-			this.getRole();
-			this.getField();
-		},
-		methods: {
-			//添加字段选项
-			addWordStateChange() {
-				this.stateChange.push({name: '', value: ''})
-			},
-			//删除字段选项
-			removeStateChange(index) {
-				this.stateChange.splice(index, 1)
-			},
-			//获取员工
-			async getUsers() {
-				let staffs = await this.$API.system.user.get({page: 0});
-				this.staffs = staffs;
-			},
-			//获取角色
-			async getRole() {
-				let roles = await this.$API.system.role.get({page: 0});
-				this.roles = roles;
-			},
-			//获取字段
-			async getField() {
-				let fieldList = await this.$API.wf.getCustomfields.get(this.id);
-				this.fieldList = fieldList;
-			},
-			handleAdd() {
-				this.type = 'add';
-				this.dialogVisible = true;
-			},
-			submitHandle() {
-				let that = this;
-				debugger;
-				this.$refs.Form.validate((valid) => {
-					if (valid) {
-						let state_fields = {};
-						if (this.stateChange.length > 0) {
-							for (let i = 0; i < this.stateChange.length; i++) {
-								state_fields[this.stateChange[i].name] = this.stateChange[i].value;
-							}
-						}
-						this.addForm.state_fields = state_fields;
-						this.addForm.participant = this.addForm.participant_type === 1 ? this.participant : this.participants;
-						that.isSaveing = true;
-						let res = null;
-						if (that.type === 'add') {
-							that.addForm.workflow = this.id;
-							res = that.$API.wf.stateAdd.post(that.addForm)
-						} else {
-							res = that.$API.wf.stateEdit.put(that.editId, that.addForm);
-						}
-						if (res.err_msg) {
-							that.isSaveing = false;
-						} else {
-							that.isSaveing = false;
-							that.dialogVisible = false;
-							that.getList();
-						}
-					}
-				})
-			},
-			handleEdit(row) {
-				this.type = 'edit';
-				this.editId = row.id;
-				this.dialogVisible = true;
-				this.addForm = Object.assign({}, row);
-			},
-			async getList() {
-				let res = await this.$API.wf.getWorkflowState.get(this.id);
-				console.log(res);
-				this.list = res;
-			},
-		},
-	}
+export default {
+  name: "state",
+  data() {
+    return {
+      id: sessionStorage.getItem("jinYuWorkflowId"),
+      list: null,
+      type: "add",
+      titleMap: {
+        add: "新增",
+        edit: "编辑",
+        show: "查看",
+      },
+      participant: "",
+      participants: [],
+      roles: [],
+      staffs: [],
+      stateChange: [],
+      fieldList: [],
+      //表单数据
+      addForm: {
+        name: "",
+        is_hidden: false,
+        sort: "",
+        type: "",
+        participant_cc: [],
+        enable_retreat: false,
+        participant_type: 0,
+        filter_policy: 0,
+        distribute_type: 2, //分发类型
+        state_fields: {}, //字段状态是否可写
+      },
+      //验证规则
+      rules: {
+        name: [{ required: true, message: "请输入工作流名称" }],
+      },
+      options_: {
+        0: "无处理",
+        1: "个人",
+        2: "多人",
+        4: "角色",
+        6: "脚本",
+        7: "工单的字段",
+        9: "代码获取",
+        10: "岗位",
+      },
+	  options2_: {
+        1: "主动接单",
+        2: "直接处理",
+        3: "随机分配",
+        4: "全部处理",
+      },
+      options: [
+        {
+          value: 0,
+          label: "普通类型",
+        },
+        {
+          value: 1,
+          label: "初始状态",
+        },
+        {
+          value: 2,
+          label: "结束状态",
+        },
+      ],
+      typeoptions: [
+        {
+          value: 0,
+          label: "无处理",
+        },
+        {
+          value: 1,
+          label: "个人",
+        },
+        {
+          value: 2,
+          label: "多人",
+        },
+        {
+          value: 4,
+          label: "角色",
+        },
+        {
+          value: 6,
+          label: "脚本",
+        },
+        {
+          value: 7,
+          label: "工单的字段",
+        },
+        {
+          value: 9,
+          label: "代码获取",
+        },
+        {
+          value: 10,
+          label: "岗位",
+        },
+      ],
+      state_fields: [
+        {
+          value: 1,
+          label: "只读",
+        },
+        {
+          value: 2,
+          label: "必填",
+        },
+        {
+          value: 3,
+          label: "可选",
+        },
+        {
+          value: 4,
+          label: "隐藏",
+        },
+      ],
+      dis_type_options: [
+        {
+          label: "主动接单",
+          value: 1,
+        },
+        {
+          label: "直接处理",
+          value: 2,
+        },
+        {
+          label: "随机分配",
+          value: 3,
+        },
+        {
+          label: "全部处理",
+          value: 4,
+        },
+      ],
+      editId: null,
+      dialogVisible: false,
+    };
+  },
+  mounted() {
+    this.id = sessionStorage.getItem("jinYuWorkflowId");
+    this.getList();
+    this.getUsers();
+    this.getRole();
+    this.getField();
+  },
+  methods: {
+    //添加字段选项
+    addWordStateChange() {
+      this.stateChange.push({ name: "", value: "" });
+    },
+    //删除字段选项
+    removeStateChange(index) {
+      this.stateChange.splice(index, 1);
+    },
+    //获取员工
+    async getUsers() {
+      let staffs = await this.$API.system.user.list.req({ page: 0 });
+      this.staffs = staffs;
+    },
+    //获取角色
+    async getRole() {
+      let roles = await this.$API.system.role.list.req({ page: 0 });
+      this.roles = roles;
+    },
+    //获取字段
+    async getField() {
+      let fieldList = await this.$API.wf.workflow.customfields.req(this.id);
+      this.fieldList = fieldList;
+    },
+    handleAdd() {
+      this.type = "add";
+      this.dialogVisible = true;
+    },
+    async submitHandle() {
+      let that = this;
+      that.isSaveing = true;
+      let res = null;
+      if (that.type === "add") {
+        that.addForm.workflow = this.id;
+        res = await that.$API.wf.state.create.req(that.addForm);
+      } else {
+        res = await that.$API.wf.state.update.req(that.editId, that.addForm);
+      }
+      if (res.err_msg) {
+        that.isSaveing = false;
+      } else {
+        that.isSaveing = false;
+        that.dialogVisible = false;
+        that.getList();
+      }
+      // this.$refs.Form.validate((valid) => {
+      // 	if (valid) {
+      // 		let state_fields = {};
+      // 		if (this.stateChange.length > 0) {
+      // 			for (let i = 0; i < this.stateChange.length; i++) {
+      // 				state_fields[this.stateChange[i].name] = this.stateChange[i].value;
+      // 			}
+      // 		}
+      // 		this.addForm.state_fields = state_fields;
+      // 		this.addForm.participant = this.addForm.participant_type === 1 ? this.participant : this.participants;
+      // 		that.isSaveing = true;
+      // 		let res = null;
+      // 		if (that.type === 'add') {
+      // 			that.addForm.workflow = this.id;
+      // 			res = that.$API.wf.stateAdd.post(that.addForm)
+      // 		} else {
+      // 			res = that.$API.wf.stateEdit.put(that.editId, that.addForm);
+      // 		}
+      // 		if (res.err_msg) {
+      // 			that.isSaveing = false;
+      // 		} else {
+      // 			that.isSaveing = false;
+      // 			that.dialogVisible = false;
+      // 			that.getList();
+      // 		}
+      // 	}
+      // })
+    },
+    handleEdit(row) {
+      this.type = "edit";
+      this.editId = row.id;
+      this.dialogVisible = true;
+      this.addForm = Object.assign({}, row);
+    },
+    async getList() {
+      let res = await this.$API.wf.workflow.states.req(this.id);
+      console.log(res);
+      this.list = res;
+    },
+  },
+};
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue
index c3aa717d..a52f8575 100644
--- a/src/views/wf/transform.vue
+++ b/src/views/wf/transform.vue
@@ -1,11 +1,17 @@
 <template>
-	<el-main class="nopadding">
-		<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
-		<el-table
-			:data="list"
-			style="width: 100%"
+<el-container>
+	<el-header>
+		<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
+			</div>
+	</el-header>
+		<el-main class="nopadding">
+		
+		<scTable
+			:data="list" ref="table"
+			row-key="id" stripe highlightCurrentRow hidePagination
 		>
-			<el-table-column type="index" width="50"/>
+			<el-table-column label="ID" prop="id"></el-table-column>
 			<el-table-column label="名称" prop="name"></el-table-column>
 			<el-table-column label="定时器（单位秒）" prop="timer"></el-table-column>
 			<el-table-column label="源状态">
@@ -38,7 +44,7 @@
 					</el-link>
 				</template>
 			</el-table-column>
-		</el-table>
+		</scTable>
 		<el-dialog
 			v-model="dialogVisible"
 			:title="titleMap[type]"
@@ -48,7 +54,6 @@
 				:model="addForm"
 				label-width="130px"
 				label-position="right"
-				:rules="rule"
 			>
 				<el-form-item label="名称" prop="name">
 					<el-input v-model="addForm.name" placeholder="名称"/>
@@ -78,6 +83,7 @@
 				</el-form-item>
 				<el-form-item label="条件表达式" prop="condition_expression">
 					<vue-json-editor
+						style="width:100%"
 						v-model="addForm.condition_expression"
 						:showBtns="false"
 						:mode="'code'"
@@ -105,6 +111,8 @@
 			</div>
 		</el-dialog>
 	</el-main>
+</el-container>
+
 </template>
 
 <script>
@@ -176,36 +184,34 @@
 				this.addForm = Object.assign({}, row);
 			},
 			async getList() {
-				let res = await this.$API.wf.getWorkflowTransition.get(this.id);
+				let res = await this.$API.wf.workflow.transitions.req(this.id);
 				this.list = res;
 			},
 			async getStateList() {
-				let res = await this.$API.wf.getWorkflowState.get(this.id);
+				let res = await this.$API.wf.workflow.states.req(this.id);
 				console.log(res);
 				this.stateList = res;
 			},
-			submitHandle(){
+			async submitHandle(){
 				let that = this;
+				let res = null;
+				if (that.type === 'add') {
+					debugger;
+					that.addForm.workflow = this.id;
+					res = await that.$API.wf.transition.create.req(that.addForm);
+				} else {
+					res = await that.$API.wf.transition.update.req(that.editId, that.addForm);
+				}
+				if(res.err_msg){
+					that.isSaveing = false;
+				}else{
+					that.isSaveing = false;
+					that.dialogVisible = false;
+					that.getList();
+				}
 				this.$refs.Form.validate((valid) => {
 					if (valid) {
-						let res = null;
-						if (that.type === 'add') {
-							debugger;
-							that.addForm.workflow = this.id;
-							res = that.$API.wf.transitionAdd.post(that.addForm);
-						} else {
-							res = that.$API.wf.transitionEdit.put(that.editId, that.addForm);
-						}
-						if(res.err_msg){
-							this.$message.error(res.err_msg)
-						}else{
-							that.isSaveing = false;
-							that.limitedVisible = false;
-							that.$refs.table.refresh();
-						}
-						that.isSaveing = false;
-						that.limitedVisible = false;
-						that.getList();
+						
 					}
 				})
 			},