From 687428200abd9fb0273182648009f86f0879c816 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Wed, 17 Jan 2024 15:46:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/upload.js                      |  5 ++-
 .../enginerring/inspectionPlan/index.vue      | 43 ++++++++++++++-----
 src/views/mobilePage/index.vue                | 31 +++++++++++++
 .../enginerring/inspectionPlan/index.vue      | 18 +++++---
 4 files changed, 80 insertions(+), 17 deletions(-)
 create mode 100644 src/views/mobilePage/index.vue

diff --git a/src/api/system/upload.js b/src/api/system/upload.js
index 71ad3c2..f3d93c2 100644
--- a/src/api/system/upload.js
+++ b/src/api/system/upload.js
@@ -23,7 +23,10 @@ export function uploadFileData(data) {
   return request({
     url: '/common/upload',
     method: 'post',
-    data: data
+    data: data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
   })
 }
 
diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
index 64d3954..c5ceee3 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
@@ -1,6 +1,6 @@
 <!-- 巡查计划管理-堤防 -->
 <script>
-import { getDicts, postDFInspectionPlanlist, 
+import { postDFInspectionPlanlist, 
   postDFInspectionPlan, putDFInspectionPlan, 
   postDFInspectionProjectList, getDFInspectionPlan, 
   deleteDFInspectionPlan, listUser } from '@/api/management'
@@ -65,7 +65,6 @@ export default {
     }
   },
   methods: {
-    uploadFileData,
     // 编辑巡查项目
     editTableItem(row) {
       getDFInspectionPlan(row.id).then((res) => {
@@ -232,8 +231,22 @@ export default {
       })
     },
     // 上传前
-    beforeAvatarUpload(e){
-      console.log('beforeAvatarUpload >>>>>  ', e)
+    beforeUpload(e){
+      console.log('beforeUpload >>>>>  ', e)
+      return true
+    },
+    handleUpload(e){
+      console.log('e >>>>>  ', e)
+      const {file} = e
+      let formData = new FormData()
+      formData.append('file',file)
+      uploadFileData(formData).then(res=>{
+        console.log('res >>>>>  ', res)
+
+      }).catch(err=>{
+        console.log('err >>>>>  ', err)
+
+      })
     },
     // 文件上传后
     handleChange(e){
@@ -245,10 +258,11 @@ export default {
       this.getTableData()
     },
   },
-  mounted() {
-    // 获取列表数据
-    this.getTableData()
-    getDicts('xs_classfy').then((res) => {
+  created(){
+    this.getDicts("embankment_type").then((response) => {
+      this.embankmentTypeOptions = response.data;
+    });
+    this.getDicts('xs_classfy').then((res) => {
       if (res.data && Array.isArray(res.data)) {
         res.data.forEach(element => {
           element.dictValue = element.dictValue
@@ -256,10 +270,15 @@ export default {
         this.examType = res.data
       }
     })
-    getDicts('xs_cycle_type').then((res) => {
+    this.getDicts('xs_cycle_type').then((res) => {
       this.patrolType = res.data
     })
   },
+  mounted() {
+    // 获取列表数据
+    this.getTableData()
+    
+  },
 }
 </script>
 
@@ -363,13 +382,15 @@ export default {
         </el-form-item>
         <el-form-item v-if="ruleForm.type == 2" label-width="120px" label="检查依据" prop="checkList">
           <el-upload
+            action="#"
             class="avatar-uploader"
-            :http-request="uploadFileData"
+            :http-request="handleUpload"
             :auto-upload="true"
-            :before-upload="beforeAvatarUpload"
+            :before-upload="beforeUpload"
             v-model:file-list="ruleForm.checkList"
             accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt"
             :on-change="handleChange"
+            :maxLength="9"
           >
             <el-button type="primary">上传</el-button>
             <template #tip>
diff --git a/src/views/mobilePage/index.vue b/src/views/mobilePage/index.vue
new file mode 100644
index 0000000..6390ae4
--- /dev/null
+++ b/src/views/mobilePage/index.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="mobile-page">
+    <iframe class="iframe-page" :src="h5Src"></iframe>
+  </div>
+</template>
+<script>
+import { getToken } from '@/utils/auth'
+export default {
+  data() {
+    return {
+      h5Src: `http://172.16.34.83:7003/?t=${getToken()}`,
+    }
+  },
+  created(){}
+}
+</script>
+<style lang="scss">
+.mobile-page{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .iframe-page{
+    border: 1px solid #ccc;
+    border-radius: 10px;
+    width: 375px;
+    height: 720px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
index 8100bb8..35319b7 100644
--- a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
@@ -62,7 +62,6 @@ export default {
     }
   },
   methods: {
-    uploadFileData,
     // 编辑巡查项目
     editTableItem(row) {
       getSZInspectionPlan(row.id).then((res) => {
@@ -107,7 +106,7 @@ export default {
     // 路线设置
     routeSetting(row) {
       this.$router.push({
-        path: '/patrolRouteSettings',
+        path: 'patrolRouteSettings',
         query: { id: row.id, name: row.name, editor: true }
       })
     },
@@ -235,10 +234,20 @@ export default {
       this.searchInput = ''
       this.getTableData()
     },
-
     // 上传前
     beforeAvatarUpload(e){
       console.log('beforeAvatarUpload >>>>>  ', e)
+      let formData = new FormData()
+      formData.append({
+        file: e
+      })
+      uploadFileData(formData).then(res=>{
+        console.log('res >>>>>  ', res)
+
+      }).catch(e=>{
+        console.log('e >>>>>  ', e)
+
+      })
     },
     // 文件上传后
     handleChange(e){
@@ -366,8 +375,7 @@ export default {
           <el-upload
             class="avatar-uploader"
             action="#"
-            :http-request="uploadFileData"
-            :auto-upload="true"
+            :auto-upload="false"
             :before-upload="beforeAvatarUpload"
             v-model:file-list="ruleForm.checkList"
             accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt"

From aef93de7fd4d84329c2d50a6391fc80bab52248b Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Wed, 17 Jan 2024 18:46:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B0=B4=E9=97=B8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mobilePage/index.vue                                | 2 +-
 .../sluice/runManage/enginerring/inspectionItems/index.vue    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/mobilePage/index.vue b/src/views/mobilePage/index.vue
index 6390ae4..17dbd1d 100644
--- a/src/views/mobilePage/index.vue
+++ b/src/views/mobilePage/index.vue
@@ -8,7 +8,7 @@ import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
-      h5Src: `http://172.16.34.83:7003/?t=${getToken()}`,
+      h5Src: `http://172.16.34.83:8002/?t=${getToken()}`,
     }
   },
   created(){}
diff --git a/src/views/sluice/runManage/enginerring/inspectionItems/index.vue b/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
index 365928b..227fdd3 100644
--- a/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
@@ -218,7 +218,7 @@ export default {
       }
     })
     // 获取一级数据
-    getDicts('df_xs_c_classfy').then((res) => {
+    getDicts('sz_xs_c_classfy').then((res) => {
       if (res.data && Array.isArray(res.data)) {
         this.firstType = res.data
       }
@@ -279,6 +279,8 @@ export default {
         :total="pageData.total" @size-change="getTableData()">
       </el-pagination>
     </div>
+
+    <!-- 弹窗 -->
     <el-dialog title="新增/编辑巡查项目" @close="closeDialog" :visible.sync="dialogVisible" width="50%">
       <div style="display: flex; margin-bottom: 16px;">
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span