소스 검색

修改bug

chenrui 2 년 전
부모
커밋
62fdfb6ab3
3개의 변경된 파일44개의 추가작업 그리고 24개의 파일을 삭제
  1. 10 1
      src/api/handDevice.js
  2. 24 20
      src/views/power/equipment/addEquipmentModal.vue
  3. 10 3
      src/views/power/equipment/equipmentManagement.vue

+ 10 - 1
src/api/handDevice.js

@@ -26,7 +26,7 @@ export const handDeviceDetail = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'get'
   })
 }
 // 设备管理  删除
@@ -38,3 +38,12 @@ export const handDeviceDel = (params) => {
     method: 'get'
   })
 }
+// 设备管理  编辑
+export const handDeviceEdit = (params) => {
+  const url = `/handDevice/modify`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 24 - 20
src/views/power/equipment/addEquipmentModal.vue

@@ -45,7 +45,7 @@
 <script>
 import { VSelect } from '@/components'
 import storeList from '@/views/common/storeList.vue'
-import { handDeviceSave, handDeviceDetail } from '@/api/handDevice'
+import { handDeviceSave, handDeviceDetail, handDeviceEdit } from '@/api/handDevice'
 export default {
   components: { VSelect, storeList },
   props: {
@@ -89,13 +89,21 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(_this.form))
-          handDeviceSave(params).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$emit('confirm', _this.form)
-              _this.isShow = false
-            }
-          })
+          if (!_this.itemId) {
+            handDeviceSave(params).then(res => {
+              if (res.status == 200) {
+                _this.$message.success(res.message)
+                _this.isShow = false
+              }
+            })
+          } else {
+            handDeviceEdit(params).then(res => {
+              if (res.status == 200) {
+                _this.$message.success(res.message)
+                _this.isShow = false
+              }
+            })
+          }
         } else {
           console.log('error submit!!')
           return false
@@ -106,13 +114,11 @@ export default {
     getDetail () {
       handDeviceDetail({ id: this.itemId }).then(res => {
         if (res.status == 200) {
-          this.form.versionType = res.data.versionType
-          this.form.version = res.data.version
-          this.form.publicDate = res.data.publicDate
-          this.form.forceUpgrade = res.data.forceUpgrade ? Number(res.data.forceUpgrade) : null
-          this.form.downloadUrl = res.data.downloadUrl
-          this.form.upgradeContent = res.data.upgradeContent
-          this.form.attachment = res.data.attachment
+          debugger
+          this.form.dealerSn = res.data.dealerSn
+          this.form.deviceCode = res.data.deviceCode
+          this.form.deviceName = res.data.deviceName
+          this.form.enabledFlag = res.data.enabledFlag
         } else {
           this.$refs.ruleForm.resetFields()
         }
@@ -127,6 +133,9 @@ export default {
         enabledFlag: '0'//  启用标记
       }
       this.$refs.ruleForm.resetFields()
+    },
+    pageInit (data) {
+      this.getDetail()
     }
   },
   watch: {
@@ -140,11 +149,6 @@ export default {
         this.$emit('close')
         this.reset()
       }
-    },
-    itemId (newValue, oldValue) {
-      if (this.isShow && newValue) { //  编辑
-        this.getDetail()
-      }
     }
   }
 }

+ 10 - 3
src/views/power/equipment/equipmentManagement.vue

@@ -40,7 +40,7 @@
         </a-form>
       </div>
       <div class="table-operator">
-        <a-button type="primary" class="button-error" @click="this.openModal = true">添加设备</a-button>
+        <a-button type="primary" class="button-error" @click="openModal = true">添加设备</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -63,7 +63,7 @@
       </s-table>
     </div>
     <!-- 添加设备 -->
-    <addEquipmentModal :openModal="openModal" :itemId="itemId" @confirm="$refs.table.refresh(true)" @close="openModal=false" />
+    <addEquipmentModal ref="equipmentBox" :openModal="openModal" :itemId="itemId" @confirm="$refs.table.refresh(true)" @close="openModal=false" />
   </a-card>
 </template>
 
@@ -89,6 +89,7 @@ export default {
       },
       addrProvinceList: [],
       openModal: false,
+      itemId: '',
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '设备编码', dataIndex: 'deviceCode', align: 'center', customRender: function (text) { return text || '--' } },
@@ -132,7 +133,13 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
-    handleEdit () {},
+    handleEdit (row) {
+      this.itemId = row.id
+      this.$nextTick(() => {
+        this.openModal = true
+        this.$refs.equipmentBox.pageInit()
+      })
+    },
     handleDel (row) {
       this.$warning({
         title: '提示',