vue2-client 0.1.0 → 1.1.0

package/src/{components → base-client/components/iot}/MeterDetailsView/part/MeterDetailsInstruct.vue

@@ -1,278 +1,237 @@
-<template>
-  <div>
-    <a-row :gutter="32">
-      <a-col :span="24">
-        <a-card
-          title="指令明细"
-          style="margin-bottom: 24px"
-          :bordered="false"
-          showPagination="auto">
-          <a-button @click="refresh()" type="primary" style="margin-bottom: 10px;">刷新</a-button>
-          <s-table
-            ref="table"
-            size="default"
-            rowKey="id"
-            :columns="InstructColumns"
-            :data="loadInstructData"
-            :alert="true"
-            :pageSize="5"
-            :rowSelection="rowSelection"
-            showPagination="auto"
-          >
-            <span slot="f_instruct_state" slot-scope="text">
-              <a-badge :status="text | statusTypeFilter" :text="text | statusFilter" />
-            </span>
-            <span slot="f_receive_state" slot-scope="text">
-              <ellipsis :length="30" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
-            </span>
-            <span slot="f_instruct_title" slot-scope="text">
-              <ellipsis :length="8" tooltip>{{ text }}</ellipsis>
-            </span>
-            <span slot="f_instruct_date" slot-scope="text">
-              {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
-            </span>
-            <span slot="f_send_date" slot-scope="text">
-              {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
-            </span>
-            <span slot="f_callback_date" slot-scope="text">
-              {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
-            </span>
-
-            <span slot="action" slot-scope="text, record">
-              <template>
-                <a @click="toDetail(record)">详情</a>
-              </template>
-            </span>
-          </s-table>
-        </a-card>
-      </a-col>
-    </a-row>
-    <instruct-details-view
-      :visible.sync="detailsViewVisible"
-      :instructid="selectInstructId"
-      v-if="selectInstructId"
-    />
-  </div>
-</template>
-<script>
-
-import Vue from 'vue'
-import { businessApi } from '@/vue2-client/api/business'
-import { STable, Ellipsis } from '@/components'
-import { timeCompare, formatDate } from '@/utils/util'
-import InstructDetailsView from '@/vue2-client/components/InstructDetailsView'
-
-const InstructColumns = [
-  {
-    title: '指令编号',
-    dataIndex: 'id'
-  },
-  {
-    title: '指令类型',
-    dataIndex: 'f_instruct_type'
-  },
-  {
-    title: '指令说明',
-    dataIndex: 'f_instruct_title',
-    scopedSlots: { customRender: 'f_instruct_title' }
-  },
-  {
-    title: '指令状态',
-    dataIndex: 'f_instruct_state',
-    scopedSlots: { customRender: 'f_instruct_state' }
-  },
-  {
-    title: '响应结果',
-    dataIndex: 'f_receive_state',
-    scopedSlots: { customRender: 'f_receive_state' }
-  },
-  {
-    title: '生成时间',
-    dataIndex: 'f_instruct_date',
-    sorter: (a, b) => timeCompare(a.f_instruct_date, b.f_instruct_date),
-    scopedSlots: { customRender: 'f_instruct_date' }
-  },
-  {
-    title: '发送时间',
-    dataIndex: 'f_send_date',
-    sorter: (a, b) => timeCompare(a.f_send_date, b.f_send_date),
-    scopedSlots: { customRender: 'f_send_date' }
-  },
-  {
-    title: '响应时间',
-    dataIndex: 'f_callback_date',
-    sorter: (a, b) => timeCompare(a.f_callback_date, b.f_callback_date),
-    scopedSlots: { customRender: 'f_callback_date' }
-  },
-  {
-    title: '关联业务编号',
-    dataIndex: 'f_data_id'
-  },
-  {
-    title: '操作人',
-    dataIndex: 'f_inputtor'
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    width: '150px',
-    scopedSlots: { customRender: 'action' }
-  }
-]
-
-const statusMap = {
-  '待发送': {
-    status: 'default',
-    text: '待发送'
-  },
-  '已发送': {
-    status: 'processing',
-    text: '已发送'
-  },
-  '执行成功': {
-    status: 'success',
-    text: '执行成功'
-  },
-  '发送成功': {
-    status: 'success',
-    text: '发送成功'
-  },
-  '执行失败': {
-    status: 'error',
-    text: '执行失败'
-  },
-  '忽略冗余': {
-    status: 'default',
-    text: '忽略冗余'
-  },
-  '已延迟': {
-    status: 'default',
-    text: '已延迟'
-  },
-  '无响应': {
-    status: 'default',
-    text: '无响应'
-  },
-  '响应超时': {
-    status: 'default',
-    text: '响应超时'
-  }
-}
-
-export default {
-  name: 'MeterDetailsInstruct',
-  components: {
-    STable,
-    Ellipsis,
-    InstructDetailsView
-  },
-  props: {
-    userid: {
-      type: String,
-      required: true
-    }
-  },
-  data () {
-    this.InstructColumns = InstructColumns
-    return {
-      selectInstructId: undefined,
-      detailsViewVisible: false,
-      // 加载数据方法 必须为 Promise 对象
-      loadInstructData: parameter => {
-        const queryParams = {
-          id: this.userid
-        }
-        const requestParameters = Object.assign({}, parameter, queryParams)
-        return this.getSimpleInstruct(requestParameters)
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-      // 默认表格数据
-      defaultData: {
-        data: [],
-        pageSize: 0,
-        pageNo: 0,
-        totalPage: 0,
-        totalCount: 0
-      }
-    }
-  },
-  filters: {
-    statusFilter (type) {
-      return statusMap[type] ? statusMap[type].text : type
-    },
-    statusTypeFilter (type) {
-      return statusMap[type] ? statusMap[type].status : 'default'
-    }
-  },
-  computed: {
-    rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: this.onSelectChange
-      }
-    }
-  },
-  methods: {
-    refresh () {
-      this.$refs.table.refresh(true)
-    },
-    getSimpleInstruct (requestParameters) {
-      return Vue.resetpost(businessApi.getSimpleInstructList, requestParameters).then(res => {
-        return res
-      })
-    },
-    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>
+    <a-row :gutter="32">
+      <a-col :span="24">
+        <a-card
+          title="指令明细"
+          style="margin-bottom: 24px"
+          :bordered="false"
+          showPagination="auto">
+          <a-button @click="refresh()" type="primary" style="margin-bottom: 10px;">刷新</a-button>
+          <s-table
+            ref="table"
+            size="default"
+            rowKey="id"
+            :columns="InstructColumns"
+            :data="loadInstructData"
+            :alert="true"
+            :pageSize="5"
+            :rowSelection="rowSelection"
+            showPagination="auto"
+          >
+            <span slot="f_instruct_state" slot-scope="text">
+              <x-badge badge-key="instructStateMap" :value="text" />
+            </span>
+            <span slot="f_receive_state" slot-scope="text">
+              <ellipsis :length="30" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+            </span>
+            <span slot="f_instruct_title" slot-scope="text">
+              <ellipsis :length="8" tooltip>{{ text }}</ellipsis>
+            </span>
+            <span slot="f_instruct_date" slot-scope="text">
+              {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
+            </span>
+            <span slot="f_send_date" slot-scope="text">
+              {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
+            </span>
+            <span slot="f_callback_date" slot-scope="text">
+              {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
+            </span>
+
+            <span slot="action" slot-scope="text, record">
+              <template>
+                <a @click="toDetail(record)">详情</a>
+              </template>
+            </span>
+          </s-table>
+        </a-card>
+      </a-col>
+    </a-row>
+    <instruct-details-view
+      :visible.sync="detailsViewVisible"
+      :select-org-name="selectOrgName"
+      :instructid="selectInstructId"
+      :isShowUserFiles="isShowUserFiles"
+      v-if="selectInstructId"
+    />
+  </div>
+</template>
+<script>
+
+import { MeterDetailsViewApi } from '@/services/api/MeterDetailsViewApi'
+import { STable, Ellipsis } from '@/components'
+import { timeCompare, formatDate } from '@/utils/util'
+import { post } from '@/services/api/restTools'
+
+const InstructColumns = [
+  {
+    title: '指令编号',
+    dataIndex: 'id'
+  },
+  {
+    title: '指令类型',
+    dataIndex: 'f_instruct_type'
+  },
+  {
+    title: '指令说明',
+    dataIndex: 'f_instruct_title',
+    scopedSlots: { customRender: 'f_instruct_title' }
+  },
+  {
+    title: '指令状态',
+    dataIndex: 'f_instruct_state',
+    scopedSlots: { customRender: 'f_instruct_state' }
+  },
+  {
+    title: '响应结果',
+    dataIndex: 'f_receive_state',
+    scopedSlots: { customRender: 'f_receive_state' }
+  },
+  {
+    title: '生成时间',
+    dataIndex: 'f_instruct_date',
+    sorter: (a, b) => timeCompare(a.f_instruct_date, b.f_instruct_date),
+    scopedSlots: { customRender: 'f_instruct_date' }
+  },
+  {
+    title: '发送时间',
+    dataIndex: 'f_send_date',
+    sorter: (a, b) => timeCompare(a.f_send_date, b.f_send_date),
+    scopedSlots: { customRender: 'f_send_date' }
+  },
+  {
+    title: '响应时间',
+    dataIndex: 'f_callback_date',
+    sorter: (a, b) => timeCompare(a.f_callback_date, b.f_callback_date),
+    scopedSlots: { customRender: 'f_callback_date' }
+  },
+  {
+    title: '关联业务编号',
+    dataIndex: 'f_data_id'
+  },
+  {
+    title: '操作人',
+    dataIndex: 'f_inputtor'
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: '150px',
+    scopedSlots: { customRender: 'action' }
+  }
+]
+
+export default {
+  name: 'MeterDetailsInstruct',
+  components: {
+    STable,
+    Ellipsis
+  },
+  props: {
+    selectOrgName: {
+      type: String,
+      required: true
+    },
+    userid: {
+      type: String,
+      required: true
+    }
+  },
+  data () {
+    this.InstructColumns = InstructColumns
+    return {
+      selectInstructId: undefined,
+      detailsViewVisible: false,
+      // 加载数据方法 必须为 Promise 对象
+      loadInstructData: parameter => {
+        const queryParams = {
+          orgName: this.selectOrgName,
+          userId: this.userid
+        }
+        const requestParameters = Object.assign({}, parameter, queryParams)
+        return this.getSimpleInstruct(requestParameters)
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      // 默认表格数据
+      defaultData: {
+        data: [],
+        pageSize: 0,
+        pageNo: 0,
+        totalPage: 0,
+        totalCount: 0
+      },
+      isShowUserFiles: false
+    }
+  },
+  computed: {
+    rowSelection () {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: this.onSelectChange
+      }
+    }
+  },
+  methods: {
+    refresh () {
+      this.$refs.table.refresh(true)
+    },
+    getSimpleInstruct (requestParameters) {
+      return post(MeterDetailsViewApi.getInstructList, requestParameters).then(res => {
+        return res
+      })
+    },
+    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>