优化

src/views/Platform/presentation/acceptTheReport.vue

@@ -178,7 +178,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped>
   .reportContent {
     padding: 2%;
   }
@@ -202,7 +202,7 @@ export default {
     font-weight: bold;
   }
   .rich>>> table tr td{border:1px solid #ccc;font-size: 15px; color: #606266}
-  .rich>>> table th{border:1px solid #ccc; font-size: 15px; color: #606266}
+  .rich>>> table th{border:1px solid #ccc; font-size: 15px; background: #F0F7FF; color: #606266}
   .rich>>> table {border:1px solid #ccc; border-collapse: collapse;line-height: 30px; text-align: center;font-size: 15px; color: #606266}
 
 </style>

src/views/Platform/presentation/testPresenyL.vue

@@ -98,7 +98,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped>
   .from-creat {
     margin: 3% auto;
     padding: 0 2%;
@@ -117,7 +117,7 @@ export default {
     white-space: pre-line;
     padding-left: 10px;
   }
-  .rich>>> table tr td{border:1px solid #ccc;font-size: 14px; color: #606266}
-  .rich>>> table th{border:1px solid #ccc; font-size: 14px; background: #F0F7FF; color: #606266}
-  .rich>>> table {border:1px solid #ccc; border-collapse: collapse;line-height: 30px; text-align: center;font-size: 14px; color: #606266}
+    .rich>>> table tr td{border:1px solid #ccc;font-size: 15px; color: #606266}
+  .rich>>> table th{border:1px solid #ccc; font-size: 15px; background: #F0F7FF; color: #606266}
+  .rich>>> table {border:1px solid #ccc; border-collapse: collapse;line-height: 30px; text-align: center;font-size: 15px; color: #606266}
 </style>

src/views/projectManage/bugList/bugindex.vue

@@ -136,7 +136,6 @@
                         filterable
                         clearable
                         remote
-                        reserve-keyword
                         :remote-method="remoteMethod"
                         :loading="loading"
                         size="small"
@@ -167,7 +166,6 @@
                         filterable
                         clearable
                         remote
-                        reserve-keyword
                         :remote-method="remoteMethod"
                         :loading="loading"
                         size="small"
@@ -198,7 +196,6 @@
                         filterable
                         clearable
                         remote
-                        reserve-keyword
                         :remote-method="remoteMethod"
                         :loading="loading"
                         size="small"
@@ -594,7 +591,7 @@ export default {
   watch: {
     clickCount(newVal, oldVal) {
       this.drawerShow = false
-      this.$store.state.data.bizId = false
+      // this.$store.state.data.bizId = false
     }
   },
   created() {
@@ -736,7 +733,7 @@ export default {
         JSON.stringify(this.tableData.filter(value => value.id === e)[0])
       )
       this.drawerShow = true
-      this.$store.state.data.bizId = true
+      // this.$store.state.data.bizId = true
     },
     createdDefect() {
       this.modalShow = true

src/views/projectManage/bugList/details/index.vue

@@ -294,12 +294,13 @@
                   <el-select
                     v-model="bug.assigner"
                     filterable
+                    multiple
                     remote
                     placeholder="请输入姓名或邮箱前缀"
                     :remote-method="searchAssigner"
                     :loading="userLoading"
                     @change="bugUpdate(bug,'userInfo')"
-                    @focus="isAssignerFocusOpen?searchAssigner(bug.assigner):null;isAssignerFocusOpen = false"
+                    @focus="isAssignerFocusOpen?searchAssigner(bug.assigner, 1):null"
                   >
                     <el-option
                       v-for="(item,index) in assignerOptions"
@@ -322,13 +323,14 @@
                 <el-form-item label="修复人">
                   <el-select
                     v-model="bug.currentHandler"
+                    multiple
                     filterable
                     remote
                     placeholder="请输入姓名或邮箱前缀"
                     :remote-method="searchCurrentHandler"
                     :loading="userLoading"
                     @change="bugUpdate(bug,'userInfo')"
-                    @focus="isCurrentHandlerOpen?searchCurrentHandler(bug.currentHandler):null;isCurrentHandlerOpen = false"
+                    @focus="isCurrentHandlerOpen?searchCurrentHandler(bug.currentHandler, 1):null"
                   >
                     <el-option
                       v-for="(item,index) in currentHandlerOptions"
@@ -365,7 +367,7 @@
                 <el-form-item label="待测试时间">
                   <div class="tips">
                     <el-tooltip class="item" effect="dark" content="最后一次改成待测试状态的时间" placement="bottom-start">
-                      <i class="el-icon-warning" />
+                      <!-- <i class="el-icon-warning" /> -->
                     </el-tooltip>
                   </div>
                   <div style="padding-left: 15px" class="bug_manage_div"> ：{{ bug.waitTestTime }}</div>
@@ -761,8 +763,6 @@ export default {
     }
   },
   created() {
-    this.$store.state.data.status = true
-    this.$store.state.data.bizId = true
     if (this.type !== 'page') {
       var height = window.innerHeight > document.body.clientHeight ? window.innerHeight : document.body.clientHeight
       height -= 130
@@ -774,33 +774,46 @@ export default {
   },
   mounted() {
     this.bugGetEnum()
-    this.bugGet(this.id, false).then(res => {
-      const assignerItem = {
-        idapName: null,
-        name: this.bug.assignerList,
-        idap: this.bug.assigner
-      }
-      this.assignerOptions.push(assignerItem)
-      for (const i in this.bug.currentHandlerList.split(',')) {
-        const assignerItem = {}
-        assignerItem.idapName = ''
-        assignerItem.name = this.bug.currentHandlerList.split(',')[i]
-        assignerItem.idap = this.bug.currentHandler.split(',')[i]
-        this.currentHandlerOptions.push(assignerItem)
-      }
-      console.log(this.currentHandlerOptions, 'mouned')
-      // const currentHandlerItem = {
-      //   idapName: null,
-      //   name: this.bug.currentHandlerList,
-      //   idap: this.bug.currentHandler
-      // }
-      // this.currentHandlerOptions.push(currentHandlerItem)
-      this.changeWidthOnBlur()
-      releaseList().then(res => {
-        this.appClientList = res.data.appClient // 客户端
-        this.getVersionList(this.bug.appId)
+    this.$nextTick(() => {
+      this.bugGet(this.id, false).then(res => {
+        if (this.bug.assignerList.search(',') !== -1) {
+          const data = this.bug.assignerList.split(',')
+          for (const i in data) {
+            const assignerItem = {}
+            assignerItem.idapName = ''
+            assignerItem.name = this.bug.assignerList.split(',')[i]
+            assignerItem.idap = this.bug.assigner[i]
+            this.assignerOptions.push(assignerItem)
+          }
+        } else {
+          const assignerItem = {}
+          assignerItem.idapName = ''
+          assignerItem.name = this.bug.assignerList
+          assignerItem.idap = this.bug.assigner
+          this.assignerOptions.push(assignerItem)
+        }
+        if (this.bug.currentHandlerList.search(',') !== -1) {
+          for (const i in this.bug.currentHandlerList.split(',')) {
+            const assignerItem = {}
+            assignerItem.idapName = ''
+            assignerItem.name = this.bug.currentHandlerList.split(',')[i]
+            assignerItem.idap = this.bug.currentHandler[i]
+            this.currentHandlerOptions.push(assignerItem)
+          }
+        } else {
+          const assignerItem = {}
+          assignerItem.idapName = ''
+          assignerItem.name = this.bug.currentHandlerList
+          assignerItem.idap = this.bug.currentHandler
+          this.currentHandlerOptions.push(assignerItem)
+        }
+        this.changeWidthOnBlur()
+        releaseList().then(res => {
+          this.appClientList = res.data.appClient // 客户端
+          this.getVersionList(this.bug.appId)
+        })
+        this.RichText()
       })
-      this.RichText()
     })
     this.getCommentList()
     this.getBusinessLinePlatformModule()
@@ -808,36 +821,47 @@ export default {
       this.taskEnumList = res.data // 所属任务
     })
   },
-  destroyed() {
-    this.$store.state.data.status = false
-    this.$store.state.data.bizId = false
-  },
   methods: {
     closeDrawer() {
       this.$emit('close', false)
     },
     init() {
       this.bugGet(this.id, false).then(res => {
-        const assignerItem = {
-          idapName: null,
-          name: this.bug.assignerList,
-          idap: this.bug.assigner
+        console.log(this.bug.currentHandler, 'cdsc')
+        console.log(this.bug.assigner, 'cdssdsc')
+        if (this.bug.assignerList.search(',') !== -1) {
+          for (const i in this.bug.assignerList.split(',')) {
+            const assignerItem = {}
+            assignerItem.idapName = ''
+            assignerItem.name = this.bug.assignerList.split(',')[i]
+            assignerItem.idap = this.bug.assigner[i]
+            this.assignerOptions.push(assignerItem)
+          }
+        } else {
+          const assignerItem = {
+            idapName: null,
+            name: this.bug.assignerList,
+            idap: this.bug.assigner
+          }
+          this.assignerOptions.push(assignerItem)
         }
-        this.assignerOptions.push(assignerItem)
-        for (const i in this.bug.currentHandlerList.split(',')) {
-          const assignerItem = {}
-          assignerItem.idapName = ''
-          assignerItem.name = this.bug.currentHandlerList.split(',')[i]
-          assignerItem.idap = this.bug.currentHandler.split(',')[i]
+        if (this.bug.currentHandlerList.search(',') !== -1) {
+          for (const i in this.bug.currentHandlerList.split(',')) {
+            const assignerItem = {}
+            assignerItem.idapName = ''
+            assignerItem.name = this.bug.currentHandlerList.split(',')[i]
+            assignerItem.idap = this.bug.currentHandler[i]
+            this.currentHandlerOptions.push(assignerItem)
+          }
+        } else {
+          const assignerItem = {
+            idapName: null,
+            name: this.bug.currentHandlerList,
+            idap: this.bug.currentHandler
+          }
           this.currentHandlerOptions.push(assignerItem)
         }
-        console.log(this.currentHandlerOptions, 'mouned')
-        // const currentHandlerItem = {
-        //   idapName: null,
-        //   name: this.bug.currentHandlerList,
-        //   idap: this.bug.currentHandler
-        // }
-        // this.currentHandlerOptions.push(currentHandlerItem)
+
         this.changeWidthOnBlur()
         this.getCommentList()
         releaseList().then(res => {
@@ -1004,6 +1028,8 @@ export default {
           //   }
           // }
           this.bug = res.data
+          this.bug.currentHandler = res.data.currentHandler.split(',')
+          this.bug.assigner = res.data.assigner.split(',')
           this.bugModel = JSON.parse(JSON.stringify(res.data))
           this.bugDescribe = this.bug.bugDescribe
           if (this.bugDescribe !== null) {
@@ -1071,13 +1097,20 @@ export default {
       }
       let objData
       if (form) {
-        objData = { bugBaseInfo: form, user: userData }
+        const data = form
+        data.currentHandler = form.currentHandler.join(',')
+        data.assigner = form.assigner.join(',')
+        objData = { bugBaseInfo: data, user: userData }
       } else {
-        objData = { bugBaseInfo: this.bug, user: userData }
+        const data = form
+        data.currentHandler = form.currentHandler.join(',')
+        data.assigner = form.assigner.join(',')
+        objData = { bugBaseInfo: data, user: userData }
       }
       return bugUpdate(objData).then(res => {
         if (res.code === 200) {
           this.changeWidthOnBlur()
+          this.init()
           this.bugModel = JSON.parse(JSON.stringify(this.bug))
           this.$emit('update', false)
         } else {
@@ -1113,15 +1146,33 @@ export default {
         }))
       })
     },
-    searchAssigner(val) {
-      this.searchUser(val).then(res => {
-        this.assignerOptions = res.data
-      })
+    searchAssigner(val, key) {
+      if (key === 1) {
+        this.assignerOptions = []
+        val.map(item => {
+          this.searchUser(item).then(res => {
+            this.assignerOptions.push(res.data[0])
+          })
+        })
+      } else {
+        this.searchUser(val).then(res => {
+          this.assignerOptions = res.data
+        })
+      }
     },
-    searchCurrentHandler(val) {
-      this.searchUser(val).then(res => {
-        this.currentHandlerOptions = res.data
-      })
+    searchCurrentHandler(val, key) {
+      if (key === 1) {
+        this.currentHandlerOptions = []
+        val.map(item => {
+          this.searchUser(item).then(res => {
+            this.currentHandlerOptions.push(res.data[0])
+          })
+        })
+      } else {
+        this.searchUser(val).then(res => {
+          this.currentHandlerOptions = res.data
+        })
+      }
     },
     bugNameChangeWith(val) {
       if (this.showWordLimit) {
@@ -1451,7 +1502,7 @@ export default {
   margin:10px 0 5px 0;
 }
 .tips {
-  color:#F56C6C;
+  color:#DCDFE6;
   position: absolute;
 }
 .file-dialog {

src/views/projectManage/bugList/file/createdBug.vue

@@ -56,8 +56,8 @@
                 </el-form-item>
 
                 <el-form-item label="责任人" style="width:100%;" prop="assigner">
-                  <el-select v-model="formInline.assigner" multiple filterable remote :remote-method="remoteMethod" :loading="loading" size="small" style="width: 100%" placeholder="请输入姓名或邮箱前缀" @change="getcurrentHandler(formInline.assigner)">
-                    <el-option v-for="item in options" :key="item.idap" :label="item.name" :value="test2(item, 0)">
+                  <el-select v-model="formInline.assigner" multiple filterable remote :remote-method="remoteMethod1" :loading="loading" size="small" style="width: 100%" placeholder="请输入姓名或邮箱前缀" @change="getcurrentHandler(formInline.assigner)">
+                    <el-option v-for="item in options1" :key="item.idap" :label="item.name" :value="test2(item, 0)">
                       <div style="display: flex;justify-content: start;">
                         <div style="min-width:100px;color: #8492a6; font-size: 13px; overflow:hidden">{{ item.deptName }}</div>
                         <div style="min-width:80px">{{ item.name }}</div>
@@ -247,6 +247,7 @@ export default {
       titleName: '',
       loading: false,
       options: [],
+      options1: [],
       test: [], // 人员查询
       form: {},
       formInline: {},
@@ -409,6 +410,24 @@ export default {
         this.options = []
       }
     },
+    remoteMethod1(query) {
+      // 人员查询
+      if (query !== '') {
+        this.loading = true
+        setTimeout(() => {
+          this.loading = false
+          memberQueryMemberInfoByIDAPorName({ memberIDAP: query }).then(res => {
+            const obj = {}
+            this.options1 = res.data.reduce((cur, next) => {
+              obj[next.idap] ? '' : obj[next.idap] = true && cur.push(next)
+              return cur
+            }, [])
+          })
+        }, 200)
+      } else {
+        this.options = []
+      }
+    },
     bugListSelect() {
       this.$set(this.formInline, 'creatorList', this.userNames)
       settingGetBizList({}).then(res => {

src/views/projectManage/dialog_vue.vue

@@ -41,7 +41,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="开发负责人">
-              <el-select v-model="task_form.rdOwner" filterable clearable remote reserve-keyword placeholder="请输入姓名或邮箱前缀" :remote-method="remoteMethod" :loading="loading" style="width: 100%">
+              <el-select v-model="task_form.rdOwner" filterable clearable remote placeholder="请输入姓名或邮箱前缀" :remote-method="remoteMethod" :loading="loading" style="width: 100%">
                 <el-option v-for="item in options" :key="item.idap" :label="item.name" :value="test2(item, 0)">
                   <div style="display: flex;justify-content: start;">
                     <div style="min-width:100px;color: #8492a6; font-size: 13px; overflow:hidden">{{ item.deptName }}</div>
@@ -63,8 +63,8 @@
               <el-cascader v-model="task_form.moduleIds" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width: 20vw" @click.native="bugDataGet" />
             </el-form-item>
             <el-form-item label="测试负责人">
-              <el-select v-model="task_form.qaOwner" filterable clearable remote reserve-keyword placeholder="请输入姓名或邮箱前缀" :remote-method="remoteMethod" :loading="loading" style="width: 20vw">
-                <el-option v-for="item in options" :key="item.idap" :label="item.name" :value="test2(item, 0)">
+              <el-select v-model="task_form.qaOwner" filterable clearable remote placeholder="请输入姓名或邮箱前缀" :remote-method="remoteMethod1" :loading="loading" style="width: 20vw">
+                <el-option v-for="item in options1" :key="item.idap" :label="item.name" :value="test2(item, 0)">
                   <div style="display: flex;justify-content: start;">
                     <div style="min-width:100px;color: #8492a6; font-size: 13px; overflow:hidden">{{ item.deptName }}</div>
                     <div style="min-width:80px">{{ item.name }}</div>
@@ -121,6 +121,7 @@ export default {
       projectId: '', // 项目id
       requireId: '', // 需求id
       options: [], // 员工信息
+      options1: [],
       noTest: [], // 是否免测
       all_bizId: [], // 业务线
       appClient: [], // 涉及业务线
@@ -335,6 +336,23 @@ export default {
         this.options = []
       }
     },
+    remoteMethod1(query) { // 人员查询
+      if (query !== '') {
+        this.loading = true
+        setTimeout(() => {
+          this.loading = false
+          memberQueryMemberInfoByIDAPorName({ memberIDAP: query }).then(res => {
+            const obj = {}
+            this.options1 = res.data.reduce((cur, next) => {
+              obj[next.idap] ? '' : obj[next.idap] = true && cur.push(next)
+              return cur
+            }, [])
+          })
+        }, 200)
+      } else {
+        this.options = []
+      }
+    },
     get_source(e) {
       switch (e) {
         case 1:

src/views/projectManage/projectList/projectIndex.vue

@@ -17,7 +17,19 @@
             </div>
             <div class="Layout">
               <div class="queryName marginLeft">负责人</div>
-              <el-select v-model="form_all.projectOwner" filterable clearable remote reserve-keyword placeholder="请输入姓名或邮箱前缀" :remote-method="remoteMethod" :loading="loading" size="small" @change="query_project(form_all)">
+              <el-select
+                v-model="form_all.projectOwner"
+                filterable
+                clearable
+                remote
+                reserve-keyword
+                placeholder="请输入姓名或邮箱前缀"
+                :remote-method="remoteMethod"
+                :loading="loading"
+                size="small"
+                @focus="optionsClear"
+                @change="query_project(form_all)"
+              >
                 <el-option v-for="item in options" :key="item.idap" style="min-width:300px" :label="item.name" :value="test2(item, 0)">
                   <div class="flex_start">
                     <div class="deptName">{{ item.deptName }}</div>
@@ -58,6 +70,7 @@
                 :remote-method="remoteMethod"
                 :loading="loading"
                 size="small"
+                @focus="optionsClear"
               >
                 <el-option
                   v-for="item in options"
@@ -193,6 +206,7 @@
                 :remote-method="remoteMethod"
                 :loading="loading"
                 style="width: 100%"
+                @focus="optionsClear"
               >
                 <el-option
                   v-for="item in options"
@@ -219,6 +233,7 @@
                 :remote-method="remoteMethod"
                 :loading="loading"
                 style="width: 100%"
+                @focus="optionsClear"
               >
                 <el-option
                   v-for="item in options"
@@ -256,6 +271,7 @@
                 :remote-method="remoteMethod"
                 :loading="loading"
                 style="width: 100%"
+                @focus="optionsClear"
               >
                 <el-option
                   v-for="item in options"
@@ -282,6 +298,7 @@
                 :remote-method="remoteMethod"
                 :loading="loading"
                 style="width: 100%"
+                @focus="optionsClear"
               >
                 <el-option
                   v-for="item in options"
@@ -434,6 +451,9 @@ export default {
         this.options = []
       }
     },
+    optionsClear() {
+      this.options = []
+    },
     link_project(e) {
       this.$router.push({ name: '项目详情', query: { id: e }})
     },

src/views/projectManage/requirement/list/create.vue

@@ -4,7 +4,7 @@
       <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
       <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ title }}</div>
     </div>
-    <el-form :model="form" :rules="rules" label-position="right" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="120px">
       <el-form-item label="需求名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入需求名称" />
       </el-form-item>
@@ -222,64 +222,68 @@ export default {
       this.isVisible = false
     },
     confirm: function() {
-      for (const i in this.form) {
-        if (!this.form[i]) {
-          if (i === 'name') {
-            this.$message.warning('需求名称为空，请输入需求名称')
-            return
-          } else if (i === 'priority') {
-            if (this.form[i] === 0) {
-              break
-            }
-            this.$message.warning('请选择优先级')
-            return
-          } else if (i === 'sourceType') {
-            this.$message.warning('请选择需求来源')
-            return
-          } else if (i === 'bizId') {
-            this.$message.warning('请选择业务线')
-            return
-          } else if (i === 'pm') {
-            this.$message.warning('请填写PM名称')
-            return
-          } else if (i === 'mrdUrl') {
-            this.$message.warning('请输入Prd链接')
-            return
-          } else if (i === 'dependOnRelease') {
-            if (this.form[i] === 0) {
-              break
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          for (const i in this.form) {
+            if (!this.form[i]) {
+              if (i === 'name') {
+                this.$message.warning('需求名称为空，请输入需求名称')
+                return
+              } else if (i === 'priority') {
+                if (this.form[i] === 0) {
+                  break
+                }
+                this.$message.warning('请选择优先级')
+                return
+              } else if (i === 'sourceType') {
+                this.$message.warning('请选择需求来源')
+                return
+              } else if (i === 'bizId') {
+                this.$message.warning('请选择业务线')
+                return
+              } else if (i === 'pm') {
+                this.$message.warning('请填写PM名称')
+                return
+              } else if (i === 'mrdUrl') {
+                this.$message.warning('请输入Prd链接')
+                return
+              } else if (i === 'dependOnRelease') {
+                if (this.form[i] === 0) {
+                  break
+                }
+                return
+              } else if (i === 'referredClientType' && this.form.dependOnRelease === 1) {
+                this.$message.warning('请选择客户端')
+                return
+              }
             }
-            return
-          } else if (i === 'referredClientType' && this.form.dependOnRelease === 1) {
+          }
+          if (this.form.referredClientType && this.form.dependOnRelease === 1 && this.form.referredClientType.length === 0) {
             this.$message.warning('请选择客户端')
             return
           }
+          this.form.creator = localStorage.getItem('username')
+          if (this.title === '新建需求') {
+            createRequirement(this.form)
+              .then(res => {
+                if (res.code === 200) {
+                  this.$emit('confirm', this.form)
+                } else {
+                  this.$message.warning(res.msg)
+                }
+              })
+          } else {
+            updateRequirement(this.form)
+              .then(res => {
+                if (res.code === 200) {
+                  this.$emit('confirm', this.form)
+                } else {
+                  this.$message.warning(res.msg)
+                }
+              })
+          }
         }
-      }
-      if (this.form.referredClientType && this.form.dependOnRelease === 1 && this.form.referredClientType.length === 0) {
-        this.$message.warning('请选择客户端')
-        return
-      }
-      this.form.creator = localStorage.getItem('username')
-      if (this.title === '新建需求') {
-        createRequirement(this.form)
-          .then(res => {
-            if (res.code === 200) {
-              this.$emit('confirm', this.form)
-            } else {
-              this.$message.warning(res.msg)
-            }
-          })
-      } else {
-        updateRequirement(this.form)
-          .then(res => {
-            if (res.code === 200) {
-              this.$emit('confirm', this.form)
-            } else {
-              this.$message.warning(res.msg)
-            }
-          })
-      }
+      })
     },
     searchUser(query) {
       this.userLoading = true

src/views/virtualDevices/HTvehicle.vue

@@ -58,10 +58,10 @@
             <template slot-scope="scope"><span>{{ scope.row.gmtModify }}</span></template>
           </el-table-column> -->
           <el-table-column label="经度" min-width="60px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope"><span>{{ scope.row.deviceLng }}</span></template>
+            <template slot-scope="scope"><span>{{ scope.row.deviceLat }}</span></template>
           </el-table-column>
           <el-table-column label="纬度" min-width="60px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope"><span>{{ scope.row.deviceLat }}</span></template>
+            <template slot-scope="scope"><span>{{ scope.row.deviceLng }}</span></template>
           </el-table-column>
           <el-table-column label="关锁" align="center" min-width="60px" class-name="small-padding fixed-width">
             <template slot-scope="{row}">
@@ -137,9 +137,9 @@
             </tr>
             <tr>
               <th width="12%" height="40" style="background-color:#F1F4F7">经度</th>
-              <td>{{ detailData.deviceLng }}</td>
+              <td>{{ detailData.deviceLat }}</td>
               <th style="background-color:#F1F4F7">纬度 </th>
-              <td> {{ detailData.deviceLat }}</td>
+              <td> {{ detailData.deviceLng }}</td>
             </tr>
             <tr>
               <th width="12%" height="40" style="background-color:#F1F4F7">锁状态</th>