vue2-client 1.2.67 → 1.2.70

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -219,6 +219,12 @@ export default {
     }
   },
   methods: {
+    refreshTable () {
+      this.$refs.xTable.refresh(true)
+    },
+    clearRowKeys () {
+      this.$refs.xTable.clearRowKeys()
+    },
     getColumnsJsonBySource () {
       this.mainLoading = true
       post(commonApi.getColumnsJson, { queryObject: this.queryParamsJson }).then(res => {

package/src/base-client/components/common/XTable/XTable.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <custom-columns-drawer
-      :visible.sync="visible"
+      :columns-meta="jsonData"
       :columns.sync="tableColumns"
-      :columns-meta="jsonData"/>
+      :visible.sync="visible"/>
     <a-row :gutter="48">
       <a-col>
         <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
@@ -22,7 +22,7 @@
             <a-button @click="showDrawer">
               <a-icon :style="iconStyle" type="table" />
             </a-button>
-            <a-button @click="exports" v-if="!buttonState || buttonState.export">
+            <a-button v-if="!buttonState || buttonState.export" @click="exports">
               <a-icon :style="iconStyle" type="cloud-download"/>
             </a-button>
           </a-button-group>
@@ -31,37 +31,37 @@
     </a-row>
     <s-table
       ref="table"
-      size="default"
-      :rowKey="rowKey"
+      :alert="true"
       :columns="tableColumns"
       :data="loadData"
-      :alert="true"
+      :rowKey="rowKey"
       :rowSelection="rowSelection"
-      showPagination="auto"
       :scroll="{ x: scrollXWidth, y: scrollYWidth }"
+      showPagination="auto"
+      size="default"
     >
       <template
         v-for="(item, index) in tableColumns"
         :slot="item.dataIndex"
         slot-scope="text, record">
         <!-- 文本溢出省略(ellipsis) -->
-        <span :key="index" v-if="item.slotType === 'ellipsis'">
+        <span v-if="item.slotType === 'ellipsis'" :key="index">
           <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
         </span>
         <!-- 徽标(badge) -->
-        <span :key="index" v-else-if="item.slotType === 'badge'">
+        <span v-else-if="item.slotType === 'badge'" :key="index">
           <x-badge :badge-key="item.slotKeyMap" :value="text" />
         </span>
         <!-- 日期(date) -->
-        <span :key="index" v-else-if="item.slotType === 'date'">
+        <span v-else-if="item.slotType === 'date'" :key="index">
           {{ format(text,'yyyy-MM-dd') }}
         </span>
         <!-- 日期时间(datetime) -->
-        <span :key="index" v-else-if="item.slotType === 'dateTime'">
+        <span v-else-if="item.slotType === 'dateTime'" :key="index">
           {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
         </span>
         <!-- 操作列(action) -->
-        <span :key="index" v-else-if="item.slotType === 'action'">
+        <span v-else-if="item.slotType === 'action'" :key="index">
           <a @click="action(record)">{{ item.slotValue }}</a>
         </span>
       </template>
@@ -206,6 +206,8 @@ export default {
         if (item.dataIndex === 'action') {
           item.fixed = 'right'
           item.width = 70
+        } else {
+          item.sorter = true
         }
         if (item.width) {
           totalWidth = totalWidth + item.width

package/src/base-client/components/iot/DeviceBrandDetailsView/DeviceBrandDetailsView.vue

@@ -190,7 +190,7 @@ export default {
   },
   props: {
     brandId: {
-      type: String || Number,
+      type: Number,
       required: true
     },
     visible: {

package/src/base-client/components/iot/DeviceDetailsView/DeviceDetailsView.vue

@@ -96,8 +96,7 @@ export default {
         { key: '2', tab: '抄表' },
         { key: '3', tab: '指令' },
         { key: '4', tab: '异常' },
-        { key: '5', tab: '指令操作' },
-        { key: '6', tab: '设备位置' }
+        { key: '5', tab: '指令操作' }
       ],
       // 设备详情加载
       loadDeviceDetails: true

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsException.vue

@@ -1,57 +1,57 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      v-if="tabActiveKey === '1'"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      @onSubmit="onSubmit"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-  export default {
-    name: 'DeviceDetailsException',
-    components: {
-      XFormTable
-    },
-    data () {
-      return {
-        // 选中的异常编号
-        selectSingularId: undefined,
-        tabActiveKey: undefined,
-        fixedQueryForm: {},
-        // 查询配置文件名
-        queryParamsName: 'deviceToExceptionQueryParams',
-        // 是否显示设置设备参数详情抽屉
-        detailVisible: false
-      }
-    },
-    props: {
-      deviceId: {
-        type: Number,
-        required: true
-      }
-    },
-    mounted () {
-      this.initView()
-    },
-    methods: {
-      initView () {
-        this.tabActiveKey = '1'
-        this.fixedQueryForm['e_f_device_id'] = this.deviceId
-      },
-      onSubmit (res) {
-        res.form['e_f_device_id'] = this.deviceId
-        this.$emit('onSubmit', res)
-      },
-      toDetail (record, id) {
-        // this.selectSingularId = record.id + ''
-        // this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      v-if="tabActiveKey === '1'"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @onSubmit="onSubmit"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+  export default {
+    name: 'DeviceDetailsException',
+    components: {
+      XFormTable
+    },
+    data () {
+      return {
+        // 选中的异常编号
+        selectSingularId: undefined,
+        tabActiveKey: undefined,
+        fixedQueryForm: {},
+        // 查询配置文件名
+        queryParamsName: 'deviceToExceptionQueryParams',
+        // 是否显示设置设备参数详情抽屉
+        detailVisible: false
+      }
+    },
+    props: {
+      deviceId: {
+        type: Number,
+        required: true
+      }
+    },
+    mounted () {
+      this.initView()
+    },
+    methods: {
+      initView () {
+        this.tabActiveKey = '1'
+        this.fixedQueryForm['e_f_device_id'] = this.deviceId
+      },
+      onSubmit (res) {
+        res.form['e_f_device_id'] = this.deviceId
+        this.$emit('onSubmit', res)
+      },
+      toDetail (record, id) {
+        // this.selectSingularId = record.id + ''
+        // this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsMain.vue

@@ -119,7 +119,7 @@
       </a-col>
       <a-col :span="12">
         <a-card :bordered="false" title="设备位置" :loading="loading">
-          <AmapPointRendering :markers="details" :describeList="describeList" :mapStyle="{width: '100%',height: '381px',border: '2px solid lightgray','border-radius': '5px'}"/>
+          <AmapPointRendering :markers="details.f_install_lng_lat" :describeList="describeList" :mapStyle="{width: '100%',height: '381px',border: '2px solid lightgray','border-radius': '5px'}"/>
         </a-card>
       </a-col>
     </a-row>

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsRead.vue

@@ -1,131 +1,131 @@
-<template>
-  <div>
-    <x-form-table
-      :logicName="logicName"
-      :logicParam="logicParam"
-      :fixedQueryForm="fixedQueryForm"
-      @onSubmit="onSubmit"
-      @action="toDetail">
-    </x-form-table>
-  </div>
-</template>
-<script>
-
-  import { STable, Ellipsis } from '@vue2-client/components'
-  import { formatDate } from '@vue2-client/utils/util'
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-  export default {
-    name: 'DeviceDetailsInstruct',
-    components: {
-      STable,
-      Ellipsis,
-      XFormTable
-    },
-    props: {
-      deviceId: {
-        type: Number,
-        required: true
-      }
-    },
-    data () {
-      return {
-        selectInstructId: undefined,
-        startForm: {},
-        fixedQueryForm: {},
-        detailsViewVisible: false,
-        // 加载数据方法 必须为 Promise 对象
-        selectedRowKeys: [],
-        selectedRows: [],
-        logicName: 'getIotRead',
-        logicParam: null,
-        // 默认表格数据
-        defaultData: {
-          data: [],
-          pageSize: 0,
-          pageNo: 0,
-          totalPage: 0,
-          totalCount: 0
-        },
-        isShowUserFiles: false
-      }
-    },
-    computed: {
-      rowSelection () {
-        return {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      }
-    },
-    mounted () {
-      this.initView()
-    },
-    methods: {
-      initView () {
-        this.logicParam = {
-          id: this.deviceId
-        }
-        this.fixedQueryForm['d_id'] = this.deviceId
-      },
-      onSubmit (res) {
-        res.form['d_id'] = this.deviceId
-        this.$emit('onSubmit', res)
-      },
-      refresh () {
-        this.$refs.table.refresh(true)
-      },
-      onSelectChange (selectedRowKeys, selectedRows) {
-        this.selectedRowKeys = selectedRowKeys
-        this.selectedRows = selectedRows
-      },
-      format (date, format) {
-        return formatDate(date, format)
-      },
-      toDetail (record) {
-        this.selectInstructId = record.id + ''
-        this.detailsViewVisible = true
-      }
-    }
-  }
-</script>
-
-<style lang='less' scoped>
-  .detail-layout {
-    margin-left: 44px
-  }
-  .text {
-    color: rgba(0, 0, 0, .45)
-  }
-
-  .heading {
-    color: rgba(0, 0, 0, .85);
-    font-size: 20px
-  }
-
-  .no-data {
-    color: rgba(0, 0, 0, .25);
-    text-align: center;
-    line-height: 64px;
-    font-size: 16px
-
-    /*i {*/
-    /*  font-size: 24px*/
-    /*  margin-right: 16px*/
-    /*  position: relative*/
-    /*  top: 3px*/
-    /*}*/
-  }
-
-  .mobile {
-    .detail-layout {
-      margin-left: unset
-    }
-    .text {
-
-    }
-    .status-list {
-      text-align: left
-    }
-  }
-</style>
+<template>
+  <div>
+    <x-form-table
+      :logicName="logicName"
+      :logicParam="logicParam"
+      :fixedQueryForm="fixedQueryForm"
+      @onSubmit="onSubmit"
+      @action="toDetail">
+    </x-form-table>
+  </div>
+</template>
+<script>
+
+  import { STable, Ellipsis } from '@vue2-client/components'
+  import { formatDate } from '@vue2-client/utils/util'
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+  export default {
+    name: 'DeviceDetailsInstruct',
+    components: {
+      STable,
+      Ellipsis,
+      XFormTable
+    },
+    props: {
+      deviceId: {
+        type: Number,
+        required: true
+      }
+    },
+    data () {
+      return {
+        selectInstructId: undefined,
+        startForm: {},
+        fixedQueryForm: {},
+        detailsViewVisible: false,
+        // 加载数据方法 必须为 Promise 对象
+        selectedRowKeys: [],
+        selectedRows: [],
+        logicName: 'getIotRead',
+        logicParam: null,
+        // 默认表格数据
+        defaultData: {
+          data: [],
+          pageSize: 0,
+          pageNo: 0,
+          totalPage: 0,
+          totalCount: 0
+        },
+        isShowUserFiles: false
+      }
+    },
+    computed: {
+      rowSelection () {
+        return {
+          selectedRowKeys: this.selectedRowKeys,
+          onChange: this.onSelectChange
+        }
+      }
+    },
+    mounted () {
+      this.initView()
+    },
+    methods: {
+      initView () {
+        this.logicParam = {
+          id: this.deviceId
+        }
+        this.fixedQueryForm['d_id'] = this.deviceId
+      },
+      onSubmit (res) {
+        res.form['d_id'] = this.deviceId
+        this.$emit('onSubmit', res)
+      },
+      refresh () {
+        this.$refs.table.refresh(true)
+      },
+      onSelectChange (selectedRowKeys, selectedRows) {
+        this.selectedRowKeys = selectedRowKeys
+        this.selectedRows = selectedRows
+      },
+      format (date, format) {
+        return formatDate(date, format)
+      },
+      toDetail (record) {
+        this.selectInstructId = record.id + ''
+        this.detailsViewVisible = true
+      }
+    }
+  }
+</script>
+
+<style lang='less' scoped>
+  .detail-layout {
+    margin-left: 44px
+  }
+  .text {
+    color: rgba(0, 0, 0, .45)
+  }
+
+  .heading {
+    color: rgba(0, 0, 0, .85);
+    font-size: 20px
+  }
+
+  .no-data {
+    color: rgba(0, 0, 0, .25);
+    text-align: center;
+    line-height: 64px;
+    font-size: 16px
+
+    /*i {*/
+    /*  font-size: 24px*/
+    /*  margin-right: 16px*/
+    /*  position: relative*/
+    /*  top: 3px*/
+    /*}*/
+  }
+
+  .mobile {
+    .detail-layout {
+      margin-left: unset
+    }
+    .text {
+
+    }
+    .status-list {
+      text-align: left
+    }
+  }
+</style>