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] =?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;
       });
     },
     // 取消按钮