mod: 工单

web/src/views/zgzs_manage/xsxclist.vue

@@ -200,6 +200,37 @@
                   </el-col>
                 </el-row>
               </el-form>
+              <!-- 工单查看按钮 -->
+              <div style="margin-top: 20px; padding: 0 10px;">
+                <h4 style="margin-bottom: 15px; padding-bottom: 10px; border-bottom: 1px solid #e6ebf5; color: #303133; font-size: 14px; font-weight: 600;">关联工单</h4>
+                <div v-if="Array.isArray(dialogModel.workIds) && dialogModel.workIds.length > 0" style="display: flex; flex-wrap: wrap; gap: 10px;">
+                  <el-button
+                    v-for="(workId, index) in dialogModel.workIds"
+                    :key="index"
+                    type="info"
+                    size="small"
+                    plain
+                    style="border-radius: 4px; padding: 6px 15px;"
+                    @click="viewWorkOrder(workId)"
+                  >
+                    <i class="el-icon-document" /> 工单 {{ index + 1 }}
+                  </el-button>
+                </div>
+                <div v-else-if="dialogModel.workIds && typeof dialogModel.workIds === 'number' && dialogModel.workIds > 0" style="display: flex; gap: 10px;">
+                  <el-button
+                    type="info"
+                    size="small"
+                    plain
+                    style="border-radius: 4px; padding: 6px 15px;"
+                    @click="viewWorkOrder(dialogModel.workIds)"
+                  >
+                    <i class="el-icon-document" /> 查看工单
+                  </el-button>
+                </div>
+                <div v-else style="color: #909399; font-size: 13px; padding: 10px 0;">
+                  无关联工单
+                </div>
+              </div>
             </div>
           </el-card>
         </el-aside>
@@ -210,7 +241,7 @@
             <div slot="header" class="clearfix">
               <span>巡查轨迹</span>
               <el-button type="primary" size="mini" style="padding:5px; float:right; margin-right: 10px" :icon="dialogFormShowBtnIconFile" @click="btnFormShowFile">{{ btnFormShowFileTitle }}</el-button>
-              <el-button v-if="btnvisiblexcgj" type="primary" size="mini" :icon="dialogFormShowBtnIcon" style="padding:5px; float:right; margin-right: 10px" @click="btnFormShowBtn1">{{ dialogFormShowBtn1 }}</el-button>
+              <!-- <el-button v-if="btnvisiblexcgj" type="primary" size="mini" :icon="dialogFormShowBtnIcon" style="padding:5px; float:right; margin-right: 10px" @click="btnFormShowBtn1">{{ dialogFormShowBtn1 }}</el-button> -->
             </div>
             <!-- 查看巡视轨迹地图 -->
             <div v-show="dialogFormShowMap" id="amapContainer" class="box-cardhchild" />
@@ -749,41 +780,45 @@
      openFile(url) {
        window.open(url)
      },
-     btnFormShowBtn1() {
-     this.dialogFormVisiblexcgj = true
-       if (this.workIds > 0 || this.workIds !== null) {
-         this.btnvisiblexcgj = true
-         // 请求获取详细信息
-         request({
-           url: '/workorderbaseApp/selectAppWorkorderbaseById',
-           method: 'post',
-           data: {
-             fWorkorderid: this.workIds
-           }
-         })
-           .then(res => {
-             this.loadingdialog = false
-             if (res.status === 200) {
-               console.log(res.data)
-               this.dialogModelxsxc = res.data.tWoWorkorderbase
-               // this.dialogModel = res.data.tWoWorkorderbase
-               this.dialogModelList = res.data.tWoWorkordertaskdealinfos
-               for (var i = 0; i < this.dialogModelList.length; i++) {
-                 for (var j = 0; j < this.dialogModelList[i].imgList.length; j++) {
-                   this.srcList.push(this.dialogModelList[i].imgList[j].fFileurl)
-                 }
-               }
-             } else {
-               this.$message.error('加载失败:' + res.data)
-             }
-           })
-           .catch(err => {
-             this.loadingdialog = false
-             this.$message.error(err || '加载失败')
-           })
-       } else {
-         this.btnvisiblexcgj = false
-       }
+     viewWorkOrder(workId) {
+      this.workIds = workId
+      this.dialogFormVisiblexcgj = true
+      if (workId > 0 || workId !== null) {
+        this.btnvisiblexcgj = true
+        // 请求获取详细信息
+        request({
+          url: '/workorderbaseApp/selectAppWorkorderbaseById',
+          method: 'post',
+          data: {
+            fWorkorderid: workId
+          }
+        })
+          .then(res => {
+            this.loadingdialog = false
+            if (res.status === 200) {
+              console.log(res.data)
+              this.dialogModelxsxc = res.data.tWoWorkorderbase
+              // this.dialogModel = res.data.tWoWorkorderbase
+              this.dialogModelList = res.data.tWoWorkordertaskdealinfos
+              for (var i = 0; i < this.dialogModelList.length; i++) {
+                for (var j = 0; j < this.dialogModelList[i].imgList.length; j++) {
+                  this.srcList.push(this.dialogModelList[i].imgList[j].fFileurl)
+                }
+              }
+            } else {
+              this.$message.error('加载失败:' + res.data)
+            }
+          })
+          .catch(err => {
+            this.loadingdialog = false
+            this.$message.error(err || '加载失败')
+          })
+      } else {
+        this.btnvisiblexcgj = false
+      }
+    },
+    btnFormShowBtn1() {
+      this.viewWorkOrder(this.workIds)
     },
      btnFormShowBtn() {
        if (this.dialogFormShowForm) {
@@ -849,7 +884,7 @@
 
            // 请求获取详细信息
            request({
-             url: '/t-zgzs-patrol-track/selectTzgzsPatrolTrackById',
+             url: '/lhgyWork/selectPatrolTrackById',
              method: 'post',
              data: {
                id: obj.id
@@ -858,22 +893,38 @@
              .then(res => {
                this.loadingdialog = false
                if (res.status === 200) {
-                 this.dialogModel = res.data
-                 const mapARRS = res.data.totalCoordinatesGc.split(';')
-                 const arrsi = []
-                 mapARRS.forEach((item, index) => {
-                   if (item != '') {
-                     arrsi.push(item)
-                   }
-                 })
-                 const arrsis = []
-                 arrsi.forEach((item, index) => {
-                   let point = [0, 0]
-                   const x = item.split(',')[0]
-                   const y = item.split(',')[1]
-                   point = [y, x]
-                   arrsis.push(point)
-                 })
+                this.dialogModel = res.data
+
+                // 处理workIds，确保如果是字符串或数字，转换为数组格式方便显示多个按钮
+                if (this.dialogModel.workIds) {
+                  if (typeof this.dialogModel.workIds === 'string') {
+                    // 如果是字符串，尝试分割成数组
+                    if (this.dialogModel.workIds.includes(',')) {
+                      this.dialogModel.workIds = this.dialogModel.workIds.split(',').map(id => parseInt(id.trim()))
+                    } else {
+                      this.dialogModel.workIds = [parseInt(this.dialogModel.workIds)]
+                    }
+                  } else if (typeof this.dialogModel.workIds === 'number') {
+                    // 如果是数字，转换为数组
+                    this.dialogModel.workIds = [this.dialogModel.workIds]
+                  }
+                }
+
+                const mapARRS = res.data.totalCoordinatesGc.split(';')
+                const arrsi = []
+                mapARRS.forEach((item, index) => {
+                  if (item != '') {
+                    arrsi.push(item)
+                  }
+                })
+                const arrsis = []
+                arrsi.forEach((item, index) => {
+                  let point = [0, 0]
+                  const x = item.split(',')[0]
+                  const y = item.split(',')[1]
+                  point = [y, x]
+                  arrsis.push(point)
+                })
 
                  // 绘制轨迹
                  const polyline = new AMap.Polyline({
@@ -1308,7 +1359,8 @@
          datas = this.page
        }
        request({
-         url: '/t-zgzs-patrol-track/selectTzgzsPatroTrackByPageList',
+        //  url: '/t-zgzs-patrol-track/selectTzgzsPatroTrackByPageList',
+        url: '/lhgyWork/selectPatrolTrackByPage',
          method: 'post',
          data: this.page
        })

wxproject/greenland/pages/inspectionDetailMap/inspectionDetailMap.js

@@ -46,8 +46,6 @@ Page({
       console.log(options.images, 'options.images');
 
       const key = 'detailMapInfo';
-    
-
       let images = wx.getStorageInfo(key)
       let arr = options.url.split(",")
       let LineArr = options.dates.split(";")