From 0e3661c3aa4840efb2765fa9300e69ae548fc8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <2405973191@qq.com>
Date: Wed, 28 Aug 2024 23:58:39 +0800
Subject: [PATCH 1/6] bug

---
 src/views/drivingSchool/DriveContractTest/index.vue          | 2 ++
 src/views/drivingSchool/DriveSchoolContract/index.vue        | 2 ++
 src/views/drivingSchool/DriveSchoolNotice/index.vue          | 2 ++
 src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue | 3 ++-
 src/views/drivingSchool/IDriveSchoolCheck/index.vue          | 3 ++-
 src/views/drivingSchool/driveSchoolCoachBalance/index.vue    | 4 ++--
 src/views/drivingSchool/driveSchoolDila/index.vue            | 2 ++
 src/views/drivingSchool/drivingSchoolCar/index.vue           | 4 ++--
 src/views/drivingSchool/drivingSchoolCarTwo/index.vue        | 4 ++--
 src/views/drivingSchool/drivingSchoolInsurance/index.vue     | 3 ++-
 src/views/drivingSchool/schoolCoach/index.vue                | 3 ++-
 src/views/drivingSchool/schoolCourse/index.vue               | 3 ++-
 12 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/drivingSchool/DriveContractTest/index.vue b/src/views/drivingSchool/DriveContractTest/index.vue
index 710e91e..3e8a2a2 100644
--- a/src/views/drivingSchool/DriveContractTest/index.vue
+++ b/src/views/drivingSchool/DriveContractTest/index.vue
@@ -105,9 +105,11 @@
 
 <script>
 import { listTest, getTest, delTest, addTest, updateTest } from "./api/test";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Test",
+  components: {editor},
   data() {
     return {
       viewFlag:false,
diff --git a/src/views/drivingSchool/DriveSchoolContract/index.vue b/src/views/drivingSchool/DriveSchoolContract/index.vue
index 6ecd31a..f843f6b 100644
--- a/src/views/drivingSchool/DriveSchoolContract/index.vue
+++ b/src/views/drivingSchool/DriveSchoolContract/index.vue
@@ -87,9 +87,11 @@
 
 <script>
 import { listContract, getContract, delContract, addContract, updateContract } from "./api/contract";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Contract",
+  components: {editor},
   data() {
     return {
       viewFlag:false,
diff --git a/src/views/drivingSchool/DriveSchoolNotice/index.vue b/src/views/drivingSchool/DriveSchoolNotice/index.vue
index 3994659..8af1998 100644
--- a/src/views/drivingSchool/DriveSchoolNotice/index.vue
+++ b/src/views/drivingSchool/DriveSchoolNotice/index.vue
@@ -105,9 +105,11 @@
 
 <script>
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "./api/notice";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Notice",
+  components: {editor},
   data() {
     return {
       viewContent:"",
diff --git a/src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue b/src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue
index efcfed3..23a87e5 100644
--- a/src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue
+++ b/src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue
@@ -95,9 +95,10 @@
 
 <script>
 import { listJournal, getJournal, delJournal, addJournal, updateJournal } from "./api/journal";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "Journal",
+  components: {editor},
   data() {
     return {
       viewContent:"",
diff --git a/src/views/drivingSchool/IDriveSchoolCheck/index.vue b/src/views/drivingSchool/IDriveSchoolCheck/index.vue
index 001501c..7ba89bb 100644
--- a/src/views/drivingSchool/IDriveSchoolCheck/index.vue
+++ b/src/views/drivingSchool/IDriveSchoolCheck/index.vue
@@ -162,9 +162,10 @@
 
 <script>
 import { listCheck, getCheck, delCheck, addCheck, updateCheck,listCards } from "./api/check";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "Check",
+  components: {editor},
   data() {
     return {
       carLists:[],
diff --git a/src/views/drivingSchool/driveSchoolCoachBalance/index.vue b/src/views/drivingSchool/driveSchoolCoachBalance/index.vue
index a30ee3f..63d96f3 100644
--- a/src/views/drivingSchool/driveSchoolCoachBalance/index.vue
+++ b/src/views/drivingSchool/driveSchoolCoachBalance/index.vue
@@ -266,8 +266,8 @@ export default {
       console.log("252",this.queryParams)
       getBalanceList(this.queryParams).then(response => {
 
-        this.passList = response.rows;
-        this.total = response.total;
+        this.passList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
diff --git a/src/views/drivingSchool/driveSchoolDila/index.vue b/src/views/drivingSchool/driveSchoolDila/index.vue
index 95c0d31..47f2a5a 100644
--- a/src/views/drivingSchool/driveSchoolDila/index.vue
+++ b/src/views/drivingSchool/driveSchoolDila/index.vue
@@ -136,9 +136,11 @@
 
 <script>
 import { listDial, getDial, delDial, addDial, updateDial } from "./api/dial";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Dial",
+  components: {editor},
   data() {
     return {
       // 遮罩层
diff --git a/src/views/drivingSchool/drivingSchoolCar/index.vue b/src/views/drivingSchool/drivingSchoolCar/index.vue
index 593b93e..50534a4 100644
--- a/src/views/drivingSchool/drivingSchoolCar/index.vue
+++ b/src/views/drivingSchool/drivingSchoolCar/index.vue
@@ -288,7 +288,7 @@
 
 <script>
 import { listCar, getCar, delCar, addCar, updateCar } from "./api/car";
-import {getToken} from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 
 export default {
   name: "Car",
@@ -305,7 +305,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: {Authorization: "Bearer " + getAccessToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/drivingSchool/system/car/importData"
       },
diff --git a/src/views/drivingSchool/drivingSchoolCarTwo/index.vue b/src/views/drivingSchool/drivingSchoolCarTwo/index.vue
index 122dedf..490094e 100644
--- a/src/views/drivingSchool/drivingSchoolCarTwo/index.vue
+++ b/src/views/drivingSchool/drivingSchoolCarTwo/index.vue
@@ -292,7 +292,7 @@
 
 <script>
 import { listCar, getCar, delCar, addCar, updateCar } from "./api/car";
-import {getToken} from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 
 export default {
   name: "Car",
@@ -309,7 +309,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: {Authorization: "Bearer " + getAccessToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/drivingSchool/system/car/importData"
       },
diff --git a/src/views/drivingSchool/drivingSchoolInsurance/index.vue b/src/views/drivingSchool/drivingSchoolInsurance/index.vue
index 793631a..58f8435 100644
--- a/src/views/drivingSchool/drivingSchoolInsurance/index.vue
+++ b/src/views/drivingSchool/drivingSchoolInsurance/index.vue
@@ -158,9 +158,10 @@
 
 <script>
 import { listInsurance, getInsurance, delInsurance, addInsurance, updateInsurance ,listCards} from "./api/insurance";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "Insurance",
+  components: {editor},
   data() {
     return {
       viewContent:"",
diff --git a/src/views/drivingSchool/schoolCoach/index.vue b/src/views/drivingSchool/schoolCoach/index.vue
index 00983f5..c3f5bb7 100644
--- a/src/views/drivingSchool/schoolCoach/index.vue
+++ b/src/views/drivingSchool/schoolCoach/index.vue
@@ -216,10 +216,11 @@
 <script>
 import { listSchoolCoach, getSchoolCoach, delSchoolCoach, addSchoolCoach, updateSchoolCoach } from "./api/schoolCoach";
 //import CouponTemplate from "@/views/system/inspection/PartnerManagement/couponTemplate";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "SchoolCoach",
   // components: {CouponTemplate},
+  components: {editor},
   data() {
     return {
       viewFlag:false,
diff --git a/src/views/drivingSchool/schoolCourse/index.vue b/src/views/drivingSchool/schoolCourse/index.vue
index 61ae60d..6665d90 100644
--- a/src/views/drivingSchool/schoolCourse/index.vue
+++ b/src/views/drivingSchool/schoolCourse/index.vue
@@ -204,9 +204,10 @@
 
 <script>
 import { listDriveSchoolCourse, getDriveSchoolCourse, delDriveSchoolCourse, addDriveSchoolCourse, updateDriveSchoolCourse } from "./api/driveSchoolCourse";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "DriveSchoolCourse",
+  components: {editor},
   data() {
     return {
       viewFlag:false,

From 3cb358495ee26ca2e776dbca079b4c2a89502f23 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Thu, 29 Aug 2024 14:42:46 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=863?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/company/archives/archives.js          |  24 +++
 src/utils/createUUID.js                       |   5 -
 src/utils/createUniqueCode.js                 |  17 ++
 src/utils/dict.js                             |   2 +
 .../form/PropertyDealChangeForm.vue           |   2 +-
 .../form/PropertyDealDisposalForm.vue         |   2 +-
 .../archives/components/ArchivesTable.vue     | 122 +++++++++--
 .../archives/components/ArchivesType.vue      |  16 --
 .../archives/form/ArchivesCatalogForm.vue     |   1 -
 .../views/archives/form/ArchivesForm.vue      | 199 ++++++++++++++++++
 10 files changed, 351 insertions(+), 39 deletions(-)
 create mode 100644 src/api/company/archives/archives.js
 delete mode 100644 src/utils/createUUID.js
 create mode 100644 src/utils/createUniqueCode.js
 delete mode 100644 src/views/knowledge/views/archives/components/ArchivesType.vue
 create mode 100644 src/views/knowledge/views/archives/form/ArchivesForm.vue

diff --git a/src/api/company/archives/archives.js b/src/api/company/archives/archives.js
new file mode 100644
index 0000000..17604bd
--- /dev/null
+++ b/src/api/company/archives/archives.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function updateArchives(data){
+  return request({
+    url: "/archives/update",
+    method: "post",
+    data
+  })
+}
+
+export function queryArchivesPage(params){
+  return request({
+    url: "/archives/list",
+    method: "get",
+    params
+  })
+}
+
+export function removeArchivesById(id){
+  return request({
+    url: "/archives/remove/" + id,
+    method: 'delete'
+  })
+}
diff --git a/src/utils/createUUID.js b/src/utils/createUUID.js
deleted file mode 100644
index a261edd..0000000
--- a/src/utils/createUUID.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import {v4 as uuidv4} from 'uuid'
-
-export function createUUID(){
-  return uuidv4().replace(/-/g, '')
-}
diff --git a/src/utils/createUniqueCode.js b/src/utils/createUniqueCode.js
new file mode 100644
index 0000000..eb411cb
--- /dev/null
+++ b/src/utils/createUniqueCode.js
@@ -0,0 +1,17 @@
+import { v4 as uuidv4 } from 'uuid'
+
+export function createUUID() {
+  return uuidv4().replace(/-/g, '')
+}
+
+export function createHashCodeByStr(str) {
+  let hash = 0
+  if (str.length === 0) return hash
+  for (let i = 0; i < str.length; i++) {
+    const char = str.charCodeAt(i)
+    hash = ((hash << 5) - hash) + char
+    hash = hash & hash // 转换为32位整数
+  }
+  // 将整数转换为16进制字符串，以缩短code长度
+  return Math.abs(hash).toString(16)
+}
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 1284e6d..b8c035c 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -169,6 +169,8 @@ export const DICT_TYPE = {
   RESCUE_CAR_TYPE: 'rescue_car_type',
   // 档案分类
   ARCHIVES_TYPE: 'archives_type',
+  // 档案项分类
+  ARCHIVES_ITEM_TYPE: 'archives_item_type',
 }
 
 /**
diff --git a/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue b/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue
index 62b75f1..26a8a27 100644
--- a/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue
+++ b/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue
@@ -186,7 +186,7 @@
 
 <script>
 import * as PropertyDealItemApi from '@/api/company/property/propertydealitem'
-import { createUUID } from '@/utils/createUUID'
+import { createUUID } from '@/utils/createUniqueCode'
 import * as PropertyDealApi from '@/api/company/property/propertydeal'
 import * as PropertyApi from '@/api/company/property/property'
 import { getCompanyList } from '@/api/base/company'
diff --git a/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue b/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue
index 6de4d84..5b83272 100644
--- a/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue
+++ b/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue
@@ -149,7 +149,7 @@
 
 <script>
 
-import { createUUID } from '@/utils/createUUID'
+import { createUUID } from '@/utils/createUniqueCode'
 import * as PropertyApi from '@/api/company/property/property'
 import * as PropertyDealApi from '@/api/company/property/propertydeal'
 import * as PropertyDealItemApi from '@/api/company/property/propertydealitem'
diff --git a/src/views/knowledge/views/archives/components/ArchivesTable.vue b/src/views/knowledge/views/archives/components/ArchivesTable.vue
index 499d284..46282b1 100644
--- a/src/views/knowledge/views/archives/components/ArchivesTable.vue
+++ b/src/views/knowledge/views/archives/components/ArchivesTable.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="app-container">
+    <!-- 档案目录 -->
     <div class="left">
       <div class="left_top">
-        当前选择的是:&nbsp;&nbsp;{{ chooseData }}
+        当前选择的是:&nbsp;&nbsp;{{ chooseData.dictLabel }}
       </div>
       <!-- 操作工具栏 -->
       <el-row :gutter="10" class="mb8" style="margin-top: 1rem">
@@ -42,17 +43,20 @@
         </template>
       </el-tree>
     </div>
+
+    <!-- 具体表格 -->
     <div class="right">
+      <!-- 搜索栏 -->
       <el-empty style="margin-top: 10%" v-if="!chooseData" description="请先选择目录"></el-empty>
       <div v-else>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="90px"
         >
-          <el-form-item label="名称" prop="fileName">
-            <el-input v-model="queryParams.fileName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
+          <el-form-item label="名称" prop="archivesName">
+            <el-input v-model="queryParams.archivesName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
           </el-form-item>
-          <el-form-item label="时间区间" prop="fileDateArray">
-            <el-date-picker v-model="queryParams.fileDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-form-item v-if="activeTab === 'contract_type'" label="时间区间" prop="queryDateArray">
+            <el-date-picker v-model="queryParams.queryDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
                             type="daterange"
                             range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                             :default-time="['00:00:00', '23:59:59']"
@@ -65,31 +69,82 @@
         </el-form>
 
         <!-- 操作工具栏 -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini"
-                       v-hasPermi="['company:staff:create']"
+        <el-row :gutter="10" class="mb8" style="margin-bottom: 1rem">
+          <el-col :span="1.5" v-if="chooseData.isCreated">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openTableFrom(undefined)"
             >新增
             </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
+
+        <!-- 表格 -->
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+          <el-table-column label="序号" align="center" width="80">
+            <template scope="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" label="档案名称" align="center" prop="archivesName" width="180"/>
+          <el-table-column label="档案类别" align="center" prop="sex" width="80">
+            <template v-slot="scope">
+              <dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" label="档案存放位置" align="center" prop="archivesPhysicsUrl" width="180"/>
+          <el-table-column v-if="activeTab === 'contract_type'" label="签订日期" align="center" prop="signTime" width="180"/>
+          <el-table-column v-if="activeTab === 'contract_type'" label="到期日期" align="center" prop="expireTime" width="180"/>
+          <el-table-column label="备注" align="center" prop="remark" width="180" :show-overflow-tooltip="true"/>
+          <el-table-column v-if="chooseData.isUpdated || chooseData.isDeleted" label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
+            <template v-slot="scope">
+              <el-button v-if="chooseData.isUpdated" size="mini" type="text" icon="el-icon-edit" @click="openTableFrom(scope.row)"
+              >修改
+              </el-button>
+              <el-button v-if="chooseData.isDeleted" size="mini" type="text" icon="el-icon-delete" @click="handleItemDelete(scope.row)"
+              >删除
+              </el-button>
+              <el-dropdown>
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleStaffChange" size="mini" type="text" icon="el-icon-search"
+                  >查看详情
+                  </el-dropdown-item>
+                  <el-dropdown-item command="handleStaffChangeData" size="mini" type="text" icon="el-icon-download"
+                  >下载
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </div>
+
+      <div style="margin-bottom: 10rem">
+        <!-- 分页组件 -->
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                    @pagination="getTabList"
+        />
       </div>
     </div>
 
     <ArchivesCatalogForm ref="formRef" @success="getList"/>
+    <ArchivesForm ref="archivesFormRef" @success="getTabList" />
   </div>
 </template>
 
 <script>
 
 import { getArchivesCatalogList, removeArchivesRoleAndDict } from '@/api/company/archives/archivesRole'
+import {queryArchivesPage, removeArchivesById} from '@/api/company/archives/archives'
 import ArchivesCatalogForm from '@/views/knowledge/views/archives/form/ArchivesCatalogForm'
+import ArchivesForm from '@/views/knowledge/views/archives/form/ArchivesForm'
 
 export default {
   name: 'ArchivesTable',
   components: {
-    ArchivesCatalogForm
+    ArchivesCatalogForm,
+    ArchivesForm
   },
   props: {
     activeTab: {
@@ -103,8 +158,11 @@ export default {
       filterText: '',
       chooseData: '',
       queryParams: {
-        fileName: null,
-        fileDateArray: null
+        archivesName: null,
+        queryDateArray: null,
+        pageNo: 1,
+        pageSize: 10,
+        dataId: null
       },
       // 显示搜索条件
       showSearch: true,
@@ -113,7 +171,12 @@ export default {
       dictDataTree: [],
       selectNodes: [],
       // 档案目录加载遮罩
-      treeLoading : true
+      treeLoading : true,
+      // 遮罩层
+      loading: false,
+      list: [],
+      total: 0,
+      chooseDataId: 0,
     }
   },
   watch: {
@@ -157,7 +220,10 @@ export default {
     },
     // 节点事件
     handleNodeClick(e) {
-      this.chooseData = e.dictLabel
+      this.chooseData = e
+      this.chooseDataId = e.dataId
+      this.queryParams.dataId = e.dataId
+      this.getTabList()
     },
     // 节点筛选
     filterNode(value, data) {
@@ -171,11 +237,13 @@ export default {
       return text
     },
     handleQuery() {
-
+      this.queryParams.pageNo = 1
+      this.getTabList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
+      this.queryParams.queryDateArray = null
       this.handleQuery()
     },
     handleSelectionChange(selection) {
@@ -199,6 +267,30 @@ export default {
         this.$modal.msgSuccess('删除成功')
       } catch {
       }
+    },
+    /** 获取表格数据 */
+    async getTabList(){
+      const res = await queryArchivesPage(this.queryParams)
+      this.list = res.data.records
+      this.total = res.data.total
+    },
+    openTableFrom(row){
+      const data = {
+        ...row,
+        activeTab: this.activeTab,
+        dataId: this.chooseDataId
+      }
+      this.$refs['archivesFormRef'].open(data)
+    },
+    async handleItemDelete(row){
+      const id = row.id
+      const name = row.archivesName
+      try {
+        await this.$modal.confirm('是否确认删除名称为"' + name + '"的数据项?')
+        await removeArchivesById(id)
+        await this.getTabList()
+        this.$modal.msgSuccess('删除成功')
+      }catch {}
     }
   }
 }
diff --git a/src/views/knowledge/views/archives/components/ArchivesType.vue b/src/views/knowledge/views/archives/components/ArchivesType.vue
deleted file mode 100644
index 86af51a..0000000
--- a/src/views/knowledge/views/archives/components/ArchivesType.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <div class="app-container">
-
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ArchivesType',
-
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue b/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue
index e407681..7ba657a 100644
--- a/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue
+++ b/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue
@@ -166,7 +166,6 @@ export default {
           deleteRoleIds: this.formData.deleteRoleIds.join(","),
           createRoleIds: this.formData.createRoleIds.join(","),
         }
-        console.log(data)
         // 修改的提交
         if (data.dataId) {
           await updateArchivesRoleAndDict(data)
diff --git a/src/views/knowledge/views/archives/form/ArchivesForm.vue b/src/views/knowledge/views/archives/form/ArchivesForm.vue
new file mode 100644
index 0000000..eeb2545
--- /dev/null
+++ b/src/views/knowledge/views/archives/form/ArchivesForm.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="145px">
+        <!-- 档案信息 -->
+        <el-card class="box-card">
+          <!-- 卡片头 -->
+          <div slot="header" class="clearfix">
+            <i class="el-icon-plus"/>
+            <span>档案信息</span>
+          </div>
+          <!-- 卡片内容 -->
+          <div>
+            <el-row :gutter="2">
+              <el-col :span="12">
+                <el-form-item label="档案名称" prop="archivesName">
+                  <el-input v-model="formData.archivesName" placeholder="请输入档案名称"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="档案存放位置" prop="archivesPhysicsUrl">
+                  <el-input v-model="formData.archivesPhysicsUrl" placeholder="请输入档案存放位置"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="2" v-if="activeTab === 'contract_type'">
+              <el-col :span="12">
+                <el-form-item label="签订日期" prop="signTime">
+                  <el-date-picker clearable v-model="formData.signTime" type="date" value-format="yyyy-MM-dd"
+                                  placeholder="选择签订日期"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="到期日期" prop="expireTime">
+                  <el-date-picker clearable v-model="formData.expireTime" type="date" value-format="yyyy-MM-dd"
+                                  placeholder="到期日期"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
+        <!-- 档案内容 -->
+        <el-card class="box-card">
+          <!-- 卡片头 -->
+          <div slot="header" class="clearfix">
+            <i class="el-icon-plus"/>
+            <span>档案内容</span>
+          </div>
+          <!-- 卡片内容 -->
+          <div>
+              <el-form-item label="档案类型" prop="archivesType">
+                <el-radio-group v-model="formData.archivesType">
+                  <el-radio-button
+                    v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >
+                    {{ dict.label }}
+                  </el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            <el-form-item label="文件上传"  prop="archivesUrls">
+              <FileUpload v-model="formData.archivesUrls" :limit="50" />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="formData.remark" maxlength="200"
+                        show-word-limit />
+            </el-form-item>
+          </div>
+        </el-card>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {createHashCodeByStr} from '@/utils/createUniqueCode'
+import {updateArchives} from '@/api/company/archives/archives'
+
+export default {
+  name: 'ArchivesForm',
+  data() {
+    return {
+      dialogTitle: null,
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        id: null,
+        archivesName: null,
+        archivesPhysicsUrl: null,
+        signTime: null,
+        expireTime: null,
+        archivesType: "01",
+        archivesUrls: null,
+        remark: null,
+        dataId: null,
+        archivesCode: null,
+      },
+      // 表单校验
+      formRules: {
+        archivesName: [{required: true, message: "档案名称不能为空", trigger: "blur"}],
+        archivesPhysicsUrl: [{required: true, message: "档案存放地址不能为空", trigger: "blur"}],
+        signTime: [{required: true, message: "签订日期不能为空", trigger: "blur"}],
+        expireTime: [{required: true, message: "到期日期不能为空", trigger: "blur"}],
+        archivesUrls: [{required: true, message: "文件不能为空", trigger: 'blur'}]
+      },
+      activeItemType: "01",
+      activeTab: '',
+    }
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(data) {
+      this.reset()
+      // 修改时，设置数据
+      if (data.id) {
+        this.formData = {
+          ...data,
+        }
+        this.formData.archivesUrls = this.buildUrls()
+        console.log(this.formData.archivesUrls)
+      }
+      this.dialogTitle = data.id ? '修改档案' : '新增档案'
+      this.activeTab = data.activeTab
+      this.formData.dataId = data.dataId
+      this.dialogVisible = true
+    },
+    // 提交
+    async submitForm() {
+      // 校验主表
+      await this.$refs['formRef'].validate()
+      try {
+        this.formLoading = true
+        this.formData.archivesUrls = this.buildUrls()
+        this.formData.archivesCode = createHashCodeByStr(this.formData.archivesName)
+        const data = this.formData
+        // 修改的提交
+        if (data.id){
+          await updateArchives(data)
+          this.$modal.msgSuccess('修改成功')
+          this.dialogVisible = false
+          this.$emit('success')
+          return
+        }
+        // 添加的提交
+        await updateArchives(data)
+        this.$modal.msgSuccess('新增成功')
+        this.dialogVisible = false
+        this.$emit('success')
+      }finally {
+        this.formLoading = false
+      }
+    },
+    // 处理文件路径
+    buildUrls(){
+      if (typeof this.formData.archivesUrls === 'string'){
+        return this.formData.archivesUrls.split(",").map(item => {
+          return {
+            name: item.split("|")[1],
+            url: item.split("|")[0],
+            uid: item.split("|")[2],
+            status: item.split("|")[3]
+          }
+        })
+      }
+      return this.formData.archivesUrls.map(item => `${item.url}|${item.name}|${item.uid}|${item.status}`).join(",")
+    },
+    reset(){
+      this.formData =  {
+        id: null,
+        archivesName: null,
+        archivesPhysicsUrl: null,
+        signTime: null,
+        expireTime: null,
+        archivesType: "01",
+        archivesUrls: null,
+        remark: null,
+        dataId: null,
+        archivesCode: null,
+      }
+      this.resetForm('formRef')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-card {
+  margin-bottom: 10px;
+}
+</style>

From 5aa3e8b2e3eda6a39b3c07bf9f8abc297df7fadf Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Thu, 29 Aug 2024 19:18:18 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=863?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   3 +-
 src/components/FileUpload2/index.vue          |  25 +++
 src/utils/downloadZIP.js                      |  29 +++
 .../archives/components/ArchivesTable.vue     |  80 ++++++-
 .../archives/form/ArchivesCatalogForm.vue     |  33 ++-
 .../views/archives/form/ArchivesForm.vue      |  13 +-
 .../views/archives/form/ArchivesShowForm.vue  | 199 ++++++++++++++++++
 7 files changed, 362 insertions(+), 20 deletions(-)
 create mode 100644 src/utils/downloadZIP.js
 create mode 100644 src/views/knowledge/views/archives/form/ArchivesShowForm.vue

diff --git a/package.json b/package.json
index 6c2d691..57ccf95 100644
--- a/package.json
+++ b/package.json
@@ -52,11 +52,12 @@
     "dayjs": "^1.11.12",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "jsencrypt": "3.3.1",
+    "jszip": "^3.10.1",
     "min-dash": "3.5.2",
     "nprogress": "0.2.0",
     "qrcode.vue": "^1.7.0",
diff --git a/src/components/FileUpload2/index.vue b/src/components/FileUpload2/index.vue
index e7873ad..5183ce4 100644
--- a/src/components/FileUpload2/index.vue
+++ b/src/components/FileUpload2/index.vue
@@ -98,8 +98,13 @@ export default {
       return this.isShowTip && (this.fileType || this.fileSize);
     },
   },
+  mounted(){
+    //加载文件列表
+    this.initFiles()
+  },
   watch: {
     value(val) {
+
       if (val) {
         let temp = 1;
         const list = Array.isArray(val)? val : this.value.split(",");
@@ -116,6 +121,26 @@ export default {
     },
   },
   methods: {
+    /**
+     * 手动加载文件列表，为了解决本组件value值变化可能会出现监听不到的情况
+     */
+    initFiles(){
+      if(this.fileList.length==0){
+        // 不存在就是新增，新增时直接返回，不然要报错
+        if (!this.value){
+          return;
+        }
+        let temp = 1;
+        const list = Array.isArray(this.value)? this.value : this.value.split(",");
+        this.fileList = list.map((item) => {
+          if (typeof item === "string") {
+            item = { name: item, url: item };
+          }
+          item.uid = item.uid || new Date().getTime() + temp++;
+          return item;
+        });
+      }
+    },
     handleBeforeUpload(file) {
       if (this.fileType.length) {
         const name = file.name.split(".");
diff --git a/src/utils/downloadZIP.js b/src/utils/downloadZIP.js
new file mode 100644
index 0000000..444554c
--- /dev/null
+++ b/src/utils/downloadZIP.js
@@ -0,0 +1,29 @@
+import JSZip from 'jszip'
+import { saveAs } from 'file-saver'
+
+export async function downloadFilesAsZip(fileObject) {
+  const zip = new JSZip()
+  for (const item of fileObject.files) {
+    try {
+      const response = await fetch(item.url)
+      if (!response.ok) {
+        throw new Error(`下载失败 ${item.url}: ${response.status}`)
+      }
+      const blob = await response.blob()
+      // 提取文件名，假设文件路径中最后一部分为文件名
+      const fileName = item.name
+      zip.file(fileName, blob)
+    } catch (error) {
+      console.error(`下载失败 ${item.url}:`, error)
+    }
+  }
+
+  // 生成压缩文件
+  try {
+    const content = await zip.generateAsync({ type: 'blob' });
+    // 保存压缩文件
+    saveAs(content, fileObject.zipName);
+  } catch (error) {
+    console.error('生成ZIP错误', error);
+  }
+}
diff --git a/src/views/knowledge/views/archives/components/ArchivesTable.vue b/src/views/knowledge/views/archives/components/ArchivesTable.vue
index 46282b1..d974eda 100644
--- a/src/views/knowledge/views/archives/components/ArchivesTable.vue
+++ b/src/views/knowledge/views/archives/components/ArchivesTable.vue
@@ -34,6 +34,7 @@
                :filter-node-method="filterNode"
                @node-click="handleNodeClick"
                highlight-current
+               :default-checked-keys="[chooseData.id]"
       >
         <template v-slot="{ node, data }">
           <!-- 自定义节点内容 -->
@@ -47,8 +48,8 @@
     <!-- 具体表格 -->
     <div class="right">
       <!-- 搜索栏 -->
-      <el-empty style="margin-top: 10%" v-if="!chooseData" description="请先选择目录"></el-empty>
-      <div v-else>
+      <el-empty style="margin-top: 10%" v-show="!chooseData" description="请先选择目录"></el-empty>
+      <div v-show="!!chooseData">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="90px"
         >
@@ -75,11 +76,11 @@
             >新增
             </el-button>
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getTabList"></right-toolbar>
         </el-row>
 
         <!-- 表格 -->
-        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :row-class-name="getRowClass">
           <el-table-column label="序号" align="center" width="80">
             <template scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -103,13 +104,13 @@
               <el-button v-if="chooseData.isDeleted" size="mini" type="text" icon="el-icon-delete" @click="handleItemDelete(scope.row)"
               >删除
               </el-button>
-              <el-dropdown>
+              <el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleStaffChange" size="mini" type="text" icon="el-icon-search"
+                  <el-dropdown-item command="showItem" size="mini" type="text" icon="el-icon-search"
                   >查看详情
                   </el-dropdown-item>
-                  <el-dropdown-item command="handleStaffChangeData" size="mini" type="text" icon="el-icon-download"
+                  <el-dropdown-item v-if="chooseData.isDownload" command="downloadItem" size="mini" type="text" icon="el-icon-download"
                   >下载
                   </el-dropdown-item>
                 </el-dropdown-menu>
@@ -130,6 +131,7 @@
 
     <ArchivesCatalogForm ref="formRef" @success="getList"/>
     <ArchivesForm ref="archivesFormRef" @success="getTabList" />
+    <ArchivesShowForm ref="archivesShowFormRef" @success="getTabList" />
   </div>
 </template>
 
@@ -139,12 +141,15 @@ import { getArchivesCatalogList, removeArchivesRoleAndDict } from '@/api/company
 import {queryArchivesPage, removeArchivesById} from '@/api/company/archives/archives'
 import ArchivesCatalogForm from '@/views/knowledge/views/archives/form/ArchivesCatalogForm'
 import ArchivesForm from '@/views/knowledge/views/archives/form/ArchivesForm'
+import {downloadFilesAsZip} from '@/utils/downloadZIP'
+import ArchivesShowForm from '@/views/knowledge/views/archives/form/ArchivesShowForm'
 
 export default {
   name: 'ArchivesTable',
   components: {
     ArchivesCatalogForm,
-    ArchivesForm
+    ArchivesForm,
+    ArchivesShowForm
   },
   props: {
     activeTab: {
@@ -217,9 +222,13 @@ export default {
       } finally {
         this.treeLoading = false
       }
+      if (this.chooseData){
+        await this.$tab.refreshPage(this.$route)
+      }
     },
     // 节点事件
     handleNodeClick(e) {
+      this.loading = true
       this.chooseData = e
       this.chooseDataId = e.dataId
       this.queryParams.dataId = e.dataId
@@ -270,9 +279,11 @@ export default {
     },
     /** 获取表格数据 */
     async getTabList(){
+      this.loading = true
       const res = await queryArchivesPage(this.queryParams)
       this.list = res.data.records
       this.total = res.data.total
+      this.loading = false
     },
     openTableFrom(row){
       const data = {
@@ -291,6 +302,51 @@ export default {
         await this.getTabList()
         this.$modal.msgSuccess('删除成功')
       }catch {}
+    },
+    // 下载ZIP
+    async downloadItem(row){
+      const fileObject = {
+        zipName: row.archivesName,
+        files: row.archivesUrls.split(",").map(item => {
+          return {
+            name: item.split("|")[1],
+            url: item.split("|")[0],
+            uid: item.split("|")[2],
+            status: item.split("|")[3]
+          }
+        })
+      }
+      await downloadFilesAsZip(fileObject)
+    },
+    handleCommand(command, index, row){
+      switch (command){
+        case 'showItem':
+          row = {
+            ...row,
+            activeTab: this.activeTab
+          }
+          this.$refs["archivesShowFormRef"].open(row)
+          break
+        case 'downloadItem':
+          this.downloadItem(row)
+          break
+        default:
+          break
+      }
+    },
+    // 记录项颜色
+    getRowClass(row, rowIndex){
+      if (this.activeTab !== 'contract_type'){
+        return '';
+      }
+      const diffTime = new Date(row.row.expireTime) - new Date()
+      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+      if (diffDays < 0 || diffDays <= 30){
+        return 'one-month-row';
+      }else if (diffDays <= 90){
+        return 'three-months-row';
+      }
+      return ''
     }
   }
 }
@@ -335,4 +391,12 @@ div {
 ::v-deep .el-tree-node__expand-icon.is-leaf {
   display: none;
 }
+
+::v-deep .el-table .one-month-row td{
+  background-color: #ffcccc !important; /* 红色背景 */
+}
+
+::v-deep .el-table .three-months-row td{
+  background-color: #ffffcc !important; /* 黄色背景 */
+}
 </style>
diff --git a/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue b/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue
index 7ba657a..c75a96b 100644
--- a/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue
+++ b/src/views/knowledge/views/archives/form/ArchivesCatalogForm.vue
@@ -89,6 +89,26 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="下载权限" prop="downloadRoleIds">
+              <el-select
+                style="width: 100%"
+                filterable
+                clearable
+                v-model="formData.downloadRoleIds" multiple placeholder="请选择有下载权限的角色"
+              >
+                <el-option
+                  v-for="(item, index) in roleList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
@@ -118,6 +138,7 @@ export default {
         updateRoleIds: null,
         createRoleIds: null,
         deleteRoleIds: null,
+        downloadRoleIds: null,
         dictLabel: null,
       },
       formRules:{
@@ -125,6 +146,7 @@ export default {
         updateRoleIds: [{required: true, message: "修改权限不能为空", trigger: "blur"}],
         deleteRoleIds: [{required: true, message: "删除权限不能为空", trigger: "blur"}],
         createRoleIds: [{required: true, message: "新增权限不能为空", trigger: "blur"}],
+        downloadRoleIds: [{required: true, message: "下载权限不能为空", trigger: "blur"}],
         dictLabel: [{required: true, message: "档案名称不能为空", trigger: "blur"}],
       },
       roleList: [],
@@ -139,10 +161,11 @@ export default {
       if (data.dataId) {
         this.formData = {
           ...data,
-          queryRoleIds: data.queryRoleIds.split(",").map(item => parseInt(item)),
-          createRoleIds: data.createRoleIds.split(",").map(item => parseInt(item)),
-          updateRoleIds: data.updateRoleIds.split(",").map(item => parseInt(item)),
-          deleteRoleIds: data.deleteRoleIds.split(",").map(item => parseInt(item))
+          queryRoleIds: data.queryRoleIds ? data.queryRoleIds.split(",").map(item => parseInt(item)) : null,
+          createRoleIds: data.createRoleIds ? data.createRoleIds.split(",").map(item => parseInt(item)) : null,
+          updateRoleIds: data.updateRoleIds ? data.updateRoleIds.split(",").map(item => parseInt(item)) : null,
+          deleteRoleIds: data.deleteRoleIds ? data.deleteRoleIds.split(",").map(item => parseInt(item)) : null,
+          downloadRoleIds: data.downloadRoleIds ? data.downloadRoleIds.split(",").map(item => parseInt(item)) : null
         }
       }
       await this.listRoles()
@@ -165,6 +188,7 @@ export default {
           updateRoleIds: this.formData.updateRoleIds.join(","),
           deleteRoleIds: this.formData.deleteRoleIds.join(","),
           createRoleIds: this.formData.createRoleIds.join(","),
+          downloadRoleIds: this.formData.deleteRoleIds.join(","),
         }
         // 修改的提交
         if (data.dataId) {
@@ -192,6 +216,7 @@ export default {
         updateRoleIds: null,
         createRoleIds: null,
         deleteRoleIds: null,
+        downloadRoleIds: null,
         dictLabel: null,
       }
       this.resetForm('formRef')
diff --git a/src/views/knowledge/views/archives/form/ArchivesForm.vue b/src/views/knowledge/views/archives/form/ArchivesForm.vue
index eeb2545..e55ec12 100644
--- a/src/views/knowledge/views/archives/form/ArchivesForm.vue
+++ b/src/views/knowledge/views/archives/form/ArchivesForm.vue
@@ -62,7 +62,7 @@
                 </el-radio-group>
               </el-form-item>
             <el-form-item label="文件上传"  prop="archivesUrls">
-              <FileUpload v-model="formData.archivesUrls" :limit="50" />
+              <FileUpload ref="fileUpload" v-model="formData.archivesUrls" :limit="50" />
             </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input type="textarea" v-model="formData.remark" maxlength="200"
@@ -125,8 +125,7 @@ export default {
         this.formData = {
           ...data,
         }
-        this.formData.archivesUrls = this.buildUrls()
-        console.log(this.formData.archivesUrls)
+        this.formData.archivesUrls = this.buildUrls(data.archivesUrls)
       }
       this.dialogTitle = data.id ? '修改档案' : '新增档案'
       this.activeTab = data.activeTab
@@ -139,7 +138,7 @@ export default {
       await this.$refs['formRef'].validate()
       try {
         this.formLoading = true
-        this.formData.archivesUrls = this.buildUrls()
+        this.formData.archivesUrls = this.buildUrls(undefined)
         this.formData.archivesCode = createHashCodeByStr(this.formData.archivesName)
         const data = this.formData
         // 修改的提交
@@ -160,9 +159,9 @@ export default {
       }
     },
     // 处理文件路径
-    buildUrls(){
-      if (typeof this.formData.archivesUrls === 'string'){
-        return this.formData.archivesUrls.split(",").map(item => {
+    buildUrls(data){
+      if (data){
+        return data.split(",").map(item => {
           return {
             name: item.split("|")[1],
             url: item.split("|")[0],
diff --git a/src/views/knowledge/views/archives/form/ArchivesShowForm.vue b/src/views/knowledge/views/archives/form/ArchivesShowForm.vue
new file mode 100644
index 0000000..d0d5a3a
--- /dev/null
+++ b/src/views/knowledge/views/archives/form/ArchivesShowForm.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" v-loading="formLoading" label-width="145px">
+        <!-- 档案信息 -->
+        <el-card class="box-card">
+          <!-- 卡片头 -->
+          <div slot="header" class="clearfix">
+            <i class="el-icon-plus"/>
+            <span>档案信息</span>
+          </div>
+          <!-- 卡片内容 -->
+          <div>
+            <el-row :gutter="2">
+              <el-col :span="12">
+                <el-form-item label="档案名称" prop="archivesName">
+                  <el-input disabled v-model="formData.archivesName" placeholder="请输入档案名称"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="档案存放位置" prop="archivesPhysicsUrl">
+                  <el-input disabled v-model="formData.archivesPhysicsUrl" placeholder="请输入档案存放位置"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="2" v-if="activeTab === 'contract_type'">
+              <el-col :span="12">
+                <el-form-item label="签订日期" prop="signTime">
+                  <el-date-picker disabled clearable v-model="formData.signTime" type="date" value-format="yyyy-MM-dd"
+                                  placeholder="选择签订日期"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="到期日期" prop="expireTime">
+                  <el-date-picker disabled clearable v-model="formData.expireTime" type="date" value-format="yyyy-MM-dd"
+                                  placeholder="到期日期"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
+        <!-- 档案内容 -->
+        <el-card class="box-card">
+          <!-- 卡片头 -->
+          <div slot="header" class="clearfix">
+            <i class="el-icon-plus"/>
+            <span>档案内容</span>
+          </div>
+          <!-- 卡片内容 -->
+          <div class="card-content" style="display: flex; flex-direction: column; align-items: center;">
+            <div v-for="(file, index) in formData.files" :key="index" class="file-item">
+              <!-- 文件名 -->
+              <div class="file-name" v-if="file.fileType !== 'file'">{{ file.fileName }}</div>
+
+              <!-- 根据文件类型渲染不同的内容 -->
+              <div v-if="file.fileType === 'image'" class="image-preview">
+                <el-image
+                  style="max-width: 100%; max-height: 100%"
+                  :src="file.fileUrl"
+                  :preview-src-list="file.fileUrl">
+                </el-image>
+              </div>
+              <div v-else-if="file.fileType === 'video'" class="video-preview">
+                <video :src="file.fileUrl" controls style="max-width: 100%; max-height: 100%;"></video>
+              </div>
+              <div v-else-if="file.fileType === 'audio'" class="audio-preview">
+                <audio :src="file.fileUrl" controls style="max-width: 100%; max-height: 300px;"></audio>
+              </div>
+              <div v-else class="file-link">
+                <a :href="file.fileUrl" target="_blank">{{ file.fileName }}</a>
+              </div>
+              <hr/>
+            </div>
+          </div>
+        </el-card>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ArchivesShow',
+  data() {
+    return {
+      dialogTitle: null,
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        files: [
+          {
+            fileName: null,
+            fileType: null,
+            fileUrl: null
+          }
+        ]
+      },
+      activeTab: null,
+      // 定义文件类型映射表
+      fileTypeMap: {
+        // 图片文件扩展名
+        jpg: 'image',
+        jpeg: 'image',
+        png: 'image',
+        gif: 'image',
+        bmp: 'image',
+        tif: 'image',
+        tiff: 'image',
+        svg: 'image',
+        webp: 'image',
+
+        // 视频文件扩展名
+        mp4: 'video',
+        avi: 'video',
+        mkv: 'video',
+        mov: 'video',
+        flv: 'video',
+        wmv: 'video',
+        mpg: 'video',
+        mpeg: 'video',
+        m4v: 'video',
+
+        // 音频文件扩展名
+        mp3: 'audio',
+        wav: 'audio',
+        aac: 'audio',
+        flac: 'audio',
+        ogg: 'audio',
+        m4a: 'audio',
+
+        // 默认为普通文件
+        default: 'file'
+      }
+    }
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(data) {
+      this.formData = {
+        ...data,
+        files: this.buildFiles(data.archivesUrls)
+      }
+      this.activeTab = data.activeTab
+      this.dialogTitle = '查看档案'
+      this.dialogVisible = true
+    },
+    buildFiles(data) {
+      return data.split(',').map(item => {
+        return {
+          fileName: item.split('|')[1],
+          fileUrl: item.split('|')[0],
+          fileType: this.fileTypeMap[item.split('|')[1].split('.').pop().toLowerCase()] || this.fileTypeMap.default
+        }
+      })
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-card {
+  margin-bottom: 10px;
+}
+
+.card-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 20px;
+}
+
+.file-item {
+  margin-bottom: 20px;
+  width: 100%;
+  text-align: center;
+}
+
+.file-name {
+  font-size: 16px;
+  margin-bottom: 10px;
+  color: #333;
+}
+
+.image-preview img,
+.video-preview video,
+.audio-preview audio {
+  max-width: 100%;
+  max-height: 300px;
+}
+
+.file-link {
+  text-align: center;
+}
+</style>

From ded5de4057bad3f74729515012dab30325c76801 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Thu, 29 Aug 2024 19:23:08 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A1=A5=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knowledge/views/archives/components/ArchivesTable.vue      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/knowledge/views/archives/components/ArchivesTable.vue b/src/views/knowledge/views/archives/components/ArchivesTable.vue
index d974eda..a14c5d0 100644
--- a/src/views/knowledge/views/archives/components/ArchivesTable.vue
+++ b/src/views/knowledge/views/archives/components/ArchivesTable.vue
@@ -222,9 +222,6 @@ export default {
       } finally {
         this.treeLoading = false
       }
-      if (this.chooseData){
-        await this.$tab.refreshPage(this.$route)
-      }
     },
     // 节点事件
     handleNodeClick(e) {

From 834020e7e854a8b589299d9edacf0507e8a11a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <2405973191@qq.com>
Date: Thu, 29 Aug 2024 22:20:40 +0800
Subject: [PATCH 5/6] bug

---
 src/views/components/map/api.js               |  10 +
 src/views/components/map/mapComponent.vue     | 224 +++++++++++++
 .../DriveSchoolDynamic/index.vue              |   2 +
 .../drivingSchool/DriveSchoolFile/index.vue   |   2 +-
 .../drivingSchool/DriveSchoolNews/index.vue   |   3 +-
 .../schoolInfoConfig/api/schoolInfoConfig.js  |  52 +++
 .../drivingSchool/schoolInfoConfig/index.vue  | 307 ++++++++++++++++++
 7 files changed, 598 insertions(+), 2 deletions(-)
 create mode 100644 src/views/components/map/api.js
 create mode 100644 src/views/components/map/mapComponent.vue
 create mode 100644 src/views/drivingSchool/schoolInfoConfig/api/schoolInfoConfig.js
 create mode 100644 src/views/drivingSchool/schoolInfoConfig/index.vue

diff --git a/src/views/components/map/api.js b/src/views/components/map/api.js
new file mode 100644
index 0000000..f531c67
--- /dev/null
+++ b/src/views/components/map/api.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询省市区详细
+export function getClient() {
+  return request({
+    url: '/province/region/tree',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/components/map/mapComponent.vue b/src/views/components/map/mapComponent.vue
new file mode 100644
index 0000000..3e5b3eb
--- /dev/null
+++ b/src/views/components/map/mapComponent.vue
@@ -0,0 +1,224 @@
+<template>
+  <div>
+    <div style="margin: 20px 0px" ref="pform">
+      <div style="display: flex">
+        <p style="margin-right: 34px">省市区</p>
+        <el-cascader
+          v-model="inputInfo"
+          :options="options"
+          clearable
+          style="margin-top: 8px"
+          @change="changeOption"></el-cascader>
+      </div>
+      <div style="display: flex">
+        <p style="margin-right: 20px;">选择区域</p>
+        <div id="container" class="container" clearable style="margin-top: 15px"></div>
+      </div>
+    </div>
+    <p>详细地址：<el-input v-model="form.address"
+                          placeholder="请输入内容"
+                          style="width: 50%"
+                          @change="getLngLat"
+    ></el-input></p>
+  </div>
+</template>
+
+<script>
+import AMapLoader from "@amap/amap-jsapi-loader";
+import {getClient} from "./api";
+
+export default {
+  props:['pform'],
+  data(){
+    return {
+      // 地图实例
+      map: null,
+      polygons: [],
+      // 标记点
+      marker: "",
+      // 地址逆解析
+      geoCoder: null,
+      // 搜索提示
+      AutoComplete: null,
+      // 搜索关键字
+      keywords: "",
+      // 位置信息
+      form: {
+        lng: "",
+        lat: "",
+        address: "",
+        adcode: "", //地区编码
+      },
+      // 搜索节流阀
+      loading: false,
+      // 搜索提示信息
+      options: [],
+      option:{
+        value:'',
+        label:'',
+        children:[],
+      },
+      district:'',
+      inputInfo:'',
+
+    }
+  },
+  created() {
+    this.form = this.pform;
+    this.getOption();
+  },
+  mounted() {
+  },
+  methods:{
+    pasVal(){
+      this.$emit('pform', this.form); // 触发custom-event事件并传递参数
+      // this.$refs.pform.pasVal()
+    },
+    changeOption(val){
+      this.remoteMethod(val[2]);
+    },
+    getOption(){
+      let _this = this;
+      getClient().then(response => {
+        _this.options = response.data.list;
+      })
+    },
+    initAMap() {
+      let _this = this;
+      AMapLoader.load({
+        key: "7cb5679301662c2e8162eec22719b316", // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: ["AMap.Geocoder", "AMap.AutoComplete","AMap.DistrictSearch"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      }).then((AMap) => {
+        this.map = new AMap.Map("container", {
+          viewMode: "2D", //是否为3D地图模式
+          zoom: 16, //初始化地图级别
+          center: [_this.form.lng, _this.form.lat], //初始化地图中心点位置
+        });
+        // console.log(this.map.center)
+        //地址逆解析插件
+        this.geoCoder = new AMap.Geocoder({
+          city: "010", //城市设为北京，默认：“全国”
+          radius: 1000, //范围，默认：500
+        });
+        // 搜索提示插件
+        this.AutoComplete = new AMap.AutoComplete({ city: "全国" });
+        //点击获取经纬度;
+        this.map.on("click", (e) => {
+          console.log(e,'108')
+          // 获取经纬度
+          this.form.lng = e.lnglat.lng;
+          this.form.lat = e.lnglat.lat;
+          // 清除点
+          this.removeMarker();
+          // 标记点
+          this.setMapMarker();
+        });
+      }).catch(() => {});
+    },
+    // 标记点
+    setMapMarker() {
+      // 自动适应显示想显示的范围区域
+      this.map.setFitView();
+      this.marker = new AMap.Marker({
+        map: this.map,
+        position: [this.form.lng, this.form.lat],
+      });
+      // 逆解析地址
+      this.toGeoCoder();
+      this.map.setFitView();
+      this.map.add(this.marker);
+    },
+    // 清除点
+    removeMarker() {
+      if (this.marker) {
+        this.map.remove(this.marker);
+      }
+    },
+    // 逆解析地址
+    toGeoCoder() {
+
+      let lnglat = [this.form.lng, this.form.lat];
+      this.geoCoder.getAddress(lnglat, (status, result) => {
+        console.log(status,result,143)
+        if (status === "complete" && result.regeocode) {
+          this.form.address = result.regeocode.formattedAddress;
+
+          this.pasVal()
+        }
+      });
+    },
+    // 搜索
+    remoteMethod(query) {
+      let _this = this;
+      if (query !== "") {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          // this.AutoComplete.search(query, (status, result) => {
+          //   console.log(result.tips);
+          // });
+          var opts = {
+            subdistrict: 0, //返回下一级行政区
+            extensions: "all", //返回行政区边界坐标组等具体信息
+            level: "city" //查询行政级别为 市
+          };
+          this.district = new AMap.DistrictSearch(opts); //行政区查询插件
+          //进入就显示整个国家范围
+          this.district.search(query, function(status, result) {
+            _this.form.lng = result.districtList[0].center.lng
+            _this.form.lat = result.districtList[0].center.lat
+            _this.toGeoCoder();
+            _this.pasVal();
+            _this.initAMap();
+          });
+        }, 200);
+      } else {
+        // this.form = this.pform;
+        this.initAMap();
+      }
+    },
+    getLngLat(){
+      let _this = this;
+      const geocoder = new AMap.Geocoder()
+      // 地址反向查经纬度,cName: 当前选中城市
+      geocoder.getLocation(this.form.address, (status, result) => {
+        if (status === 'complete' && result.info === 'OK') {
+          // 经纬度
+          _this.form.lng = result.geocodes[0].location.lng
+          _this.form.lat = result.geocodes[0].location.lat
+          _this.toGeoCoder();
+          _this.pasVal();
+          _this.initAMap();
+        } else {
+          this.$modal.msgError("定位失败");
+        }
+      })
+    },
+    // 选中提示
+    currentSelect(val) {
+      // 清空时不执行后面代码
+      if (!val) {
+        return;
+      }
+      this.form = {
+        lng: val.location.lng,
+        lat: val.location.lat,
+        address: val.district + val.address,
+        adcode: val.adcode,
+      };
+      // 清除点
+      this.removeMarker();
+      // 标记点
+      this.setMapMarker();
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .container {
+    width: 500px;
+    height: 300px;
+  }
+</style>
diff --git a/src/views/drivingSchool/DriveSchoolDynamic/index.vue b/src/views/drivingSchool/DriveSchoolDynamic/index.vue
index a71ddd9..38f2cb8 100644
--- a/src/views/drivingSchool/DriveSchoolDynamic/index.vue
+++ b/src/views/drivingSchool/DriveSchoolDynamic/index.vue
@@ -112,9 +112,11 @@
 
 <script>
 import { listDynamic, getDynamic, delDynamic, addDynamic, updateDynamic } from "./api/dynamic";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Dynamic",
+  components: {editor},
   data() {
     return {
       viewContent:"",
diff --git a/src/views/drivingSchool/DriveSchoolFile/index.vue b/src/views/drivingSchool/DriveSchoolFile/index.vue
index df1bf97..bf06217 100644
--- a/src/views/drivingSchool/DriveSchoolFile/index.vue
+++ b/src/views/drivingSchool/DriveSchoolFile/index.vue
@@ -53,7 +53,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="类型" align="center" prop="fileType">
         <template slot-scope="scope">
-          <dict-tag ::type="DICT_TYPE.File_type" :value="scope.row.fileType"/>
+          <dict-tag :type="DICT_TYPE.File_type" :value="scope.row.fileType"/>
         </template>
       </el-table-column>
       <el-table-column label="上传PDF" align="center" prop="fileAddress" />
diff --git a/src/views/drivingSchool/DriveSchoolNews/index.vue b/src/views/drivingSchool/DriveSchoolNews/index.vue
index 4ba6f5c..58ef600 100644
--- a/src/views/drivingSchool/DriveSchoolNews/index.vue
+++ b/src/views/drivingSchool/DriveSchoolNews/index.vue
@@ -103,9 +103,10 @@
 
 <script>
 import { listNews, getNews, delNews, addNews, updateNews } from "./api/news";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "News",
+  components: {editor},
   data() {
     return {
       viewContent:"",
diff --git a/src/views/drivingSchool/schoolInfoConfig/api/schoolInfoConfig.js b/src/views/drivingSchool/schoolInfoConfig/api/schoolInfoConfig.js
new file mode 100644
index 0000000..edb0e11
--- /dev/null
+++ b/src/views/drivingSchool/schoolInfoConfig/api/schoolInfoConfig.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询驾校信息列表
+export function listSchoolInfo(query) {
+  return request({
+    url: '/drivingSchool/system/schoolInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询驾校信息详细
+export function getSchoolInfo(id) {
+  return request({
+    url: '/drivingSchool/system/schoolInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 根据机构id查询驾校信息详细
+export function getSchoolInfoByDeptId() {
+  return request({
+    url: '/drivingSchool/system/schoolInfo/getSchoolInfoByDeptId',
+    method: 'get'
+  })
+}
+
+// 新增驾校信息
+export function addSchoolInfo(data) {
+  return request({
+    url: '/drivingSchool/system/schoolInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改驾校信息
+export function updateSchoolInfo(data) {
+  return request({
+    url: '/drivingSchool/system/schoolInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除驾校信息
+export function delSchoolInfo(id) {
+  return request({
+    url: '/drivingSchool/system/schoolInfo/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/drivingSchool/schoolInfoConfig/index.vue b/src/views/drivingSchool/schoolInfoConfig/index.vue
new file mode 100644
index 0000000..3aeb665
--- /dev/null
+++ b/src/views/drivingSchool/schoolInfoConfig/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="驾校名称" prop="schoolName">
+        <el-input v-model="form.schoolName" placeholder="请输入驾校名称" />
+      </el-form-item>
+      <el-form-item label="驾校封面图" prop="photo">
+        <image-upload  v-model="form.photo"/>
+      </el-form-item>
+      <el-form-item label="营业开始时间" prop="businessStartTime">
+        <el-time-select
+          placeholder="起始时间"
+          v-model="form.businessStartTime"
+          :picker-options="{
+      start: '08:30',
+      step: '00:15',
+      end: '18:30'
+    }">
+        </el-time-select>
+      </el-form-item>
+
+      <el-form-item label="营业结束时间" prop="businessEndTime">
+        <el-time-select
+          placeholder="结束时间"
+          v-model="form.businessEndTime"
+          :picker-options="{
+      start: '08:30',
+      step: '00:15',
+      end: '18:30',
+      minTime: businessStartTime
+    }">
+        </el-time-select>
+      </el-form-item>
+      <el-form-item label="驾校负责人" prop="leaderName">
+        <el-input v-model="form.leaderName" placeholder="请输入驾校负责人" />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="phone">
+        <el-input v-model="form.phone" placeholder="请输入联系方式" />
+      </el-form-item>
+      <map-componment  style="margin-left: 35px" :pform="mapForm" ref="mapRef" @pform="getForm"></map-componment>
+<!--      <p>详细地址：<el-input v-model="form.address"-->
+<!--                            placeholder="请输入内容"-->
+<!--                            style="width: 50%"-->
+<!--                            @change="getLngLat"-->
+<!--      ></el-input></p>-->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="yesitis">确 定</el-button>
+    </div>
+    <!-- 添加或修改电梯品牌对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listSchoolInfo,
+  getSchoolInfo,
+  delSchoolInfo,
+  addSchoolInfo,
+  updateSchoolInfo,
+  getSchoolInfoByDeptId
+} from "./api/schoolInfoConfig";
+import mapComponment from "@/views/components/map/mapComponent.vue";
+export default {
+  props:['pform'],
+  name: "schoolInfoConfig",
+  components:{
+    mapComponment
+  },
+  data() {
+    return {
+      // 位置信息
+      mapForm: {
+        lng: "116.9645",
+        lat: "36.975",
+        address: "",
+        adcode: "", //地区编码
+      },
+      businessStartTime: null,
+      businessEndTime: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 驾校信息表格数据
+      schoolInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: null,
+        schoolName: null,
+        input: null,
+        sort: null,
+        phone: null,
+        region: this.$refs.mapRef?.inputInfo,
+        photo: null,
+        address: null,
+        businessStartTime: null,
+        businessEndTime: null,
+      },
+      // 表单参数
+      form: {
+        businessStartTime: null,
+        businessEndTime: null,
+      },
+      // 表单校验
+      rules: {
+        schoolName: [
+          { required: true, message: "驾校名称不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
+        ],
+        leaderName: [
+          { required: true, message: "驾校负责人不能为空", trigger: "blur" }
+        ],
+        sort: [
+          { required: true, message: "显示排序不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+
+  created() {
+    this.getList();
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    busChange(data){
+      console.log(data,'业务变化')
+      //处理新增
+      for (let i = 0; i < data.length; i++) {
+        let flag ='0'
+        for (let j = 0; j < this.form.priceDtoList.length; j++) {
+          if (data[i]== this.form.priceDtoList[j].serviceId){
+            flag = '1'
+          }
+        }
+        if (flag=='0'){
+          console.log(data[i],i,'199')
+          //就需要追加进去这个业务
+          this.elevTypeDict.forEach(it=>{
+            if (it.dictValue==data[i]){
+              let item ={
+                serviceId:it.dictValue,
+                serviceName:it.dictLabel,
+                priceStart:0,
+                priceEnd:0
+              }
+              this.form.priceDtoList.push(item)
+            }
+          })
+
+        }
+      }
+      //处理删除
+      for (let i = 0; i < this.form.priceDtoList.length; i++) {
+        let flag = '0'
+        for (let j = 0; j < data.length; j++) {
+          if (data[i] == this.form.priceDtoList[j].serviceId) {
+            flag = '1'
+          }
+        }
+        if (flag=='0'){
+          //就删除这个业务
+
+          this.form.priceDtoList.splice(i,1)
+        }
+      }
+    },
+    getForm(data){
+
+      if (data != undefined){
+        this.mapForm = data;
+
+        this.form.address = this.mapForm.address
+        this.form.lgt = this.mapForm.lng
+        this.form.lat = this.mapForm.lat
+      }
+    },
+    /** 查询电梯品牌列表 */
+    getList() {
+      this.loading = true;
+      getSchoolInfoByDeptId().then(res => {
+        if (res.data){
+          this.form = res.data;
+          this.mapForm.lat = this.form.lat;
+          this.mapForm.lng = this.form.lgt;
+          this.mapForm.address = this.form.address;
+        }
+        this.$refs.mapRef.initAMap();
+        console.log(this.mapForm)
+        this.loading = false;
+      })
+    },
+    async yesitis(){
+      this.form.region = String(this.$refs.mapRef.inputInfo)
+      // this.form.region = this.$refs.mapRef.inputInfo.repeat(/\[|]/g,'')
+
+      await updateSchoolInfo(this.form).then(res=>{
+        this.$modal.msgSuccess("保存成功");
+        this.getList()
+      })
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        schoolName: null,
+        leaderName: null,
+        phone: null,
+        photo: null,
+        region: this.$refs.mapRef.inputInfo,
+        address: null,
+        lat: null,
+        lgt: null,
+        businessStartTime: null,
+        businessEndTime: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getElevBrand(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改电梯品牌";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (!this.form.lat){
+            this.$message.warning("请选择位置信息")
+            return
+          }
+          if (!this.form.brandAdress){
+            this.$message.warning("请填写详细位置")
+            return
+          }
+          if (this.form.id != null) {
+            updateElevBrand(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addElevBrand(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    }
+  }
+};
+</script>

From 664449f090bda2ce22a5e29b35ce32cc9ccf4dac Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Fri, 30 Aug 2024 16:21:02 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A1=A5=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 ++
 src/main.js                                   |  4 ++++
 src/views/company/promotion/index.vue         | 12 ++++++----
 src/views/company/staff/index.vue             | 16 +++++++++-----
 .../archives/components/ArchivesTable.vue     | 10 ++++-----
 .../views/archives/form/ArchivesForm.vue      | 22 +++++++++----------
 src/views/rescue/index.vue                    | 14 ++++++------
 7 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 57ccf95..629c503 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "url": "https://github.com/YunaiV/ruoyi-vue-pro"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@babel/parser": "^7.18.4",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.27.2",
@@ -70,6 +71,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.8",
     "vue-meta": "^2.4.0",
+    "vue-qriously": "^1.1.1",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.4.9",
     "vue-video-player": "^5.0.2",
diff --git a/src/main.js b/src/main.js
index 6e38255..18d9258 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,8 @@ import ImagePreview from "@/components/ImagePreview/index.vue";
 // import hljs from 'highlight.js'
 // import 'highlight.js/styles/github-gist.css'
 import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict";
+// 二维码
+import VueQriously from 'vue-qriously'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -61,6 +63,8 @@ import VueMeta from 'vue-meta'
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+// 二维码
+Vue.use(VueQriously)
 // Vue.use(hljs.vuePlugin);
 
 // bpmnProcessDesigner 需要引入
diff --git a/src/views/company/promotion/index.vue b/src/views/company/promotion/index.vue
index 9f6ff22..9fec3e5 100644
--- a/src/views/company/promotion/index.vue
+++ b/src/views/company/promotion/index.vue
@@ -15,9 +15,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="推广人推广码" prop="uniqueCode">
-        <el-input v-model="queryParams.uniqueCode" placeholder="请输入推广人推广码" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+<!--      <el-form-item label="推广人推广码" prop="uniqueCode">-->
+<!--        <el-input v-model="queryParams.uniqueCode" placeholder="请输入推广人推广码" clearable @keyup.enter.native="handleQuery"/>-->
+<!--      </el-form-item>-->
       <el-form-item label="被推广人姓名" prop="newUserName">
         <el-input v-model="queryParams.newUserName" placeholder="请输入被推广人姓名" clearable
                   @keyup.enter.native="handleQuery"
@@ -59,7 +59,11 @@
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.oldUser.userType"/>
         </template>
       </el-table-column>
-      <el-table-column label="推广人推广码" align="center" prop="uniqueCode" width="180" />
+      <el-table-column label="推广人推广码" align="center" prop="uniqueCode" width="180">
+        <template v-slot="scope">
+          <qriously :value="scope.row.uniqueCode" :options="{ width: 100, height: 100 }"/>
+        </template>
+      </el-table-column>
       <el-table-column label="推广渠道" align="center" prop="promotionChannel" width="180">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_CHANNEL" :value="scope.row.promotionChannel"/>
diff --git a/src/views/company/staff/index.vue b/src/views/company/staff/index.vue
index f27aa4b..33934e6 100644
--- a/src/views/company/staff/index.vue
+++ b/src/views/company/staff/index.vue
@@ -53,11 +53,11 @@
       <el-form-item label="司龄" prop="joinedYear">
         <el-input v-model="queryParams.joinedYear" placeholder="请输入司龄" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="唯一推广码" prop="uniqueCode">
-        <el-input v-model="queryParams.uniqueCode" placeholder="请输入唯一推广码" clearable
-                  @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="唯一推广码" prop="uniqueCode">-->
+<!--        <el-input v-model="queryParams.uniqueCode" placeholder="请输入唯一推广码" clearable-->
+<!--                  @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="工作日期" prop="workDateArray">
         <el-date-picker v-model="queryParams.workDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
                         type="daterange"
@@ -105,6 +105,11 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="唯一推广码" align="center" prop="uniqueCode" width="180">
+        <template v-slot="scope">
+          <qriously :value="scope.row.uniqueCode" :options="{ width: 100, height: 100 }"/>
+        </template>
+      </el-table-column>
       <el-table-column label="工号" align="center" prop="workNo" width="180"/>
       <el-table-column label="姓名" align="center" prop="name" width="180"/>
       <el-table-column label="角色" :show-overflow-tooltip="true" align="center" prop="roleNames" width="180"/>
@@ -125,7 +130,6 @@
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" label="个人简介" align="center" prop="content" width="180"/>
-      <el-table-column label="唯一推广码" align="center" prop="uniqueCode" width="180"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
diff --git a/src/views/knowledge/views/archives/components/ArchivesTable.vue b/src/views/knowledge/views/archives/components/ArchivesTable.vue
index a14c5d0..750d9a1 100644
--- a/src/views/knowledge/views/archives/components/ArchivesTable.vue
+++ b/src/views/knowledge/views/archives/components/ArchivesTable.vue
@@ -87,11 +87,11 @@
             </template>
           </el-table-column>
           <el-table-column :show-overflow-tooltip="true" label="档案名称" align="center" prop="archivesName" width="180"/>
-          <el-table-column label="档案类别" align="center" prop="sex" width="80">
-            <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="档案类别" align="center" prop="sex" width="80">-->
+<!--            <template v-slot="scope">-->
+<!--              <dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column :show-overflow-tooltip="true" label="档案存放位置" align="center" prop="archivesPhysicsUrl" width="180"/>
           <el-table-column v-if="activeTab === 'contract_type'" label="签订日期" align="center" prop="signTime" width="180"/>
           <el-table-column v-if="activeTab === 'contract_type'" label="到期日期" align="center" prop="expireTime" width="180"/>
diff --git a/src/views/knowledge/views/archives/form/ArchivesForm.vue b/src/views/knowledge/views/archives/form/ArchivesForm.vue
index e55ec12..28dd09c 100644
--- a/src/views/knowledge/views/archives/form/ArchivesForm.vue
+++ b/src/views/knowledge/views/archives/form/ArchivesForm.vue
@@ -50,17 +50,17 @@
           </div>
           <!-- 卡片内容 -->
           <div>
-              <el-form-item label="档案类型" prop="archivesType">
-                <el-radio-group v-model="formData.archivesType">
-                  <el-radio-button
-                    v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"
-                    :key="dict.value"
-                    :label="dict.value"
-                  >
-                    {{ dict.label }}
-                  </el-radio-button>
-                </el-radio-group>
-              </el-form-item>
+<!--              <el-form-item label="档案类型" prop="archivesType">-->
+<!--                <el-radio-group v-model="formData.archivesType">-->
+<!--                  <el-radio-button-->
+<!--                    v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.value"-->
+<!--                  >-->
+<!--                    {{ dict.label }}-->
+<!--                  </el-radio-button>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
             <el-form-item label="文件上传"  prop="archivesUrls">
               <FileUpload ref="fileUpload" v-model="formData.archivesUrls" :limit="50" />
             </el-form-item>
diff --git a/src/views/rescue/index.vue b/src/views/rescue/index.vue
index bc5e7ca..f64d5e9 100644
--- a/src/views/rescue/index.vue
+++ b/src/views/rescue/index.vue
@@ -198,13 +198,13 @@
             @click="designateDriver(scope.row)"
 
           >指派司机</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleMap(scope.row)"
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleMap(scope.row)"-->
 
-          >路线</el-button>
+<!--          >路线</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -547,7 +547,7 @@ export default {
     },
     getDriverList() {
       getDriver().then(response => {
-        this.driverList = response.rows;
+        this.driverList = response.data;
       });
     },
     // 取消按钮