From d977e8e4cb532eacea5981679e3b0ec141568247 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 22 Feb 2024 17:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=96=B0=E5=8A=A0=E5=A4=96?=
 =?UTF-8?q?=E6=9D=A5=E4=BA=BA=E5=91=98=E9=83=A8=E9=97=A8=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=EF=BC=8C=E6=91=84=E5=83=8F=E5=A4=B4=E5=AE=9A=E4=BD=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../department/components/add.vue                   | 13 ++++++++++++-
 .../enterprise_management/department/index.vue      |  1 +
 src/views/enterprise_management/user/add.vue        |  2 +-
 src/views/video_manager/video_manager/index.vue     |  7 +++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/enterprise_management/department/components/add.vue b/src/views/enterprise_management/department/components/add.vue
index 5a241d0..7e0093a 100644
--- a/src/views/enterprise_management/department/components/add.vue
+++ b/src/views/enterprise_management/department/components/add.vue
@@ -4,7 +4,7 @@
     :title="type === 'add' ? '新增' : '修改'"
     :before-close="fnClose"
   >
-    <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="180px">
       <el-form-item label="上级部门">
         <el-tag>{{ parentName }}</el-tag>
       </el-form-item>
@@ -49,6 +49,14 @@
           <el-radio label="0">否</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否外来人员部门" prop="FOREIGNPERSONNEL">
+        <el-radio-group
+          v-model="form.FOREIGNPERSONNEL"
+        >
+          <el-radio label="1">是</el-radio>
+          <el-radio label="0">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
         v-if="form.ISSUPERVISE === '1'"
         label="监管部门"
@@ -131,6 +139,9 @@ const rules = {
   ISSUPERVISE: [
     { required: true, message: "是否监管部门不能为空", trigger: "blur" },
   ],
+  FOREIGNPERSONNEL: [
+    { required: true, message: "是否外来人员部门不能为空", trigger: "blur" },
+  ],
   checkedIds: [
     { required: true, message: "是否监管部门不能为空", trigger: "change" },
   ],
diff --git a/src/views/enterprise_management/department/index.vue b/src/views/enterprise_management/department/index.vue
index fb9867e..36e8793 100644
--- a/src/views/enterprise_management/department/index.vue
+++ b/src/views/enterprise_management/department/index.vue
@@ -160,6 +160,7 @@ const data = reactive({
       HEADMAN: "",
       TEL: "",
       FUNCTIONS: "",
+      FOREIGNPERSONNEL: "0",
       BZ: "",
       ISSUPERVISE: "0",
       checkedIds: [],
diff --git a/src/views/enterprise_management/user/add.vue b/src/views/enterprise_management/user/add.vue
index fc7e942..d5f60f4 100644
--- a/src/views/enterprise_management/user/add.vue
+++ b/src/views/enterprise_management/user/add.vue
@@ -529,7 +529,7 @@ const rules = {
     { required: true, message: "请选择入职日期", trigger: "change" },
   ],
   CARDNO: [
-    { required: true, message: "请输入定位卡号(4位纯数字)", trigger: "blur" },
+    { required: false, message: "请输入定位卡号(4位纯数字)", trigger: "blur" },
     {
       pattern: /^-?[0-9]\d*$/,
       message: "请输入正确的定位卡号(4位纯数字)",
diff --git a/src/views/video_manager/video_manager/index.vue b/src/views/video_manager/video_manager/index.vue
index 7fd7167..380fe61 100644
--- a/src/views/video_manager/video_manager/index.vue
+++ b/src/views/video_manager/video_manager/index.vue
@@ -58,6 +58,9 @@
             >
               修改
             </el-button>
+            <el-button type="primary" text link @click="fnSetPositioning(row)">
+              定位
+            </el-button>
             <el-button type="primary" text link @click="fnDeleteVideo(row)">
               删除
             </el-button>
@@ -149,6 +152,10 @@ const fnAddOrEdit = async (VIDEOMANAGER_ID, type) => {
     data.addDialog.form = resData.pd;
   }
 };
+const fnSetPositioning = async () => {
+  // 接口路径 /videomanager/setPositioning
+  // 参数 {"camId":1,"lon":119.44794324054146,"lat":39.91841473114172,"alt":12.189401230148036}
+};
 const fnUpToBi = async (VIDEOMANAGER_ID) => {
   await ElMessageBox.confirm("确定要置顶吗？置顶后将会默认展示在Bi页", {
     type: "warning",