vue2-client 1.2.49 → 1.2.50

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>

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

@@ -117,11 +117,7 @@ export default {
   },
   props: {
     typeId: {
-      type: String,
-      required: true
-    },
-    typeName: {
-      type: String,
+      type: String || Number,
       required: true
     },
     visible: {

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

@@ -9,7 +9,6 @@
     <a-spin :spinning="loadInstructDetails">
       <meter-details-view
         :visible.sync="detailVisible"
-        :select-org-name="selectOrgName"
         :userid="selectUserId"
         v-if="selectUserId && isShowUserFiles"
       />
@@ -217,11 +216,7 @@ export default {
   },
   props: {
     instructid: {
-      type: String,
-      required: true
-    },
-    selectOrgName: {
-      type: String,
+      type: String || Number,
       required: true
     },
     visible: {
@@ -236,7 +231,7 @@ export default {
   methods: {
     // 初始化组件
     initView () {
-      this.getInstruct(this.instructid, this.selectOrgName)
+      this.getInstruct(this.instructid)
     },
     // 获取查询配置JSON
     getColumnsJson () {
@@ -254,11 +249,10 @@ export default {
       callback(query(requestParameters))
     },
     // 获取指令详情信息
-    getInstruct (instructId, selectOrgName) {
+    getInstruct (instructId) {
       this.loadInstructDetails = true
       return post(InstructDetailsViewApi.getInstructDetails, {
-        id: instructId,
-        orgName: selectOrgName
+        id: instructId
       })
         .then(res => {
           this.details = res
@@ -313,10 +307,9 @@ export default {
         onOk () {
           return post(InstructDetailsViewApi.againSendInstruct, {
             id: id,
-            orgName: _this.selectOrgName,
             username: _this.currUser.username
           }).then(res => {
-            _this.getInstruct(id, _this.selectOrgName)
+            _this.getInstruct(id)
             if (res.nums === 1) {
               _this.$message.success('操作成功')
             } else {
@@ -338,10 +331,9 @@ export default {
         onOk () {
           return post(InstructDetailsViewApi.cancelSendInstruct, {
             id: id,
-            orgName: _this.selectOrgName,
             username: _this.currUser.username
           }).then(res => {
-            _this.getInstruct(id, _this.selectOrgName)
+            _this.getInstruct(id)
             if (res.nums === 1) {
               _this.$message.success('操作成功')
             } else {

package/src/base-client/components/iot/InstructDetailsView/index.md

@@ -29,7 +29,6 @@ export default {
 ```html
 <instruct-details-view
   :visible.sync="detailVisible"
-  :select-org-name="selectOrgName"
   :instructid="selectInstructId"
   :isShowUserFiles="isShowUserFiles"
   v-if="selectInstructId" />
@@ -40,6 +39,5 @@ export default {
 | 参数              | 说明          | 类型      | 默认值   |
 |-----------------|-------------|---------|-------|
 | visible         | 是否显示        | Boolean | false |
-| selectOrgName   | 燃气公司客户名     | String  | null  |
 | instructid      | 指令ID        | String  | null  |
 | isShowUserFiles | 是否允许跳转到档案详情 | Boolean | true  |

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

@@ -233,11 +233,7 @@ export default {
   },
   props: {
     logid: {
-      type: String,
-      required: true
-    },
-    selectOrgName: {
-      type: String,
+      type: String || Number,
       required: true
     },
     visible: {
@@ -248,17 +244,16 @@ export default {
   methods: {
     // 初始化组件
     initView () {
-      this.getLog(this.logid, this.selectOrgName)
+      this.getLog(this.logid)
     },
     onClose () {
       this.$emit('update:visible', false)
     },
     // 获取日志详情信息
-    getLog (logId, selectOrgName) {
+    getLog (logId) {
       this.loadLogDetails = true
       return post(LogDetailsViewApi.getLogDetails, {
-        id: logId,
-        orgName: selectOrgName
+        id: logId
       })
         .then(res => {
           this.details = res
@@ -274,8 +269,7 @@ export default {
         pageNo: 1,
         pageSize: 500,
         dataId: this.logid,
-        type: '异常处理',
-        orgName: this.selectOrgName
+        type: '异常处理'
       })
         .then(res => {
           this.eventList = res.data.reverse()
@@ -289,10 +283,9 @@ export default {
       return post(LogDetailsViewApi.updateLogStatusData, {
         id: _this.logid,
         status: status,
-        orgName: _this.selectOrgName,
         username: _this.currUser.name
       }).then(res => {
-        _this.getLog(_this.logid, _this.selectOrgName)
+        _this.getLog(_this.logid)
         if (res.nums === 1) {
           _this.$message.success('操作成功')
         } else {

package/src/base-client/components/iot/LogDetailsView/index.md

@@ -29,7 +29,6 @@ export default {
 ```html
 <log-details-view
   :visible.sync="detailVisible"
-  :select-org-name="selectOrgName"
   :logid="selectLogId"
   v-if="selectLogId" />
 ```
@@ -39,5 +38,4 @@ export default {
 | 参数            | 说明      | 类型      | 默认值   |
 |---------------|---------|---------|-------|
 | visible       | 是否显示    | Boolean | false |
-| selectOrgName | 燃气公司客户名 | String  | null  |
 | logid         | 日志ID    | String  | null  |

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

@@ -54,7 +54,7 @@
                 <p>指令将在 定时器轮询/表具上报 后重新生成</p>
                 <p style="color: red">此操作不可撤销</p>
               </template>
-              <a-button type="primary" class="business" @click="againOpenAccount(details.id,selectOrgName)" :disabled="againOpenAccountBtnHide()">重新开户</a-button>
+              <a-button type="primary" class="business" @click="againOpenAccount(details.id)" :disabled="againOpenAccountBtnHide()">重新开户</a-button>
             </a-popover>
             <a-popover title="开阀" placement="bottomLeft">
               <template slot="content">
@@ -62,7 +62,7 @@
                 <p>只有已经开户的表具才可以进行该操作</p>
                 <p>操作后，可以在指令维护界面取消发送</p>
               </template>
-              <a-button type="primary" @click="saveValveControl(details.id,selectOrgName,1,details.f_alias)" :disabled="saveValveControlBtnHide()">开阀</a-button>
+              <a-button type="primary" @click="saveValveControl(details.id,1,details.f_alias)" :disabled="saveValveControlBtnHide()">开阀</a-button>
             </a-popover>
             <a-popover title="关阀" placement="bottomLeft">
               <template slot="content">
@@ -70,7 +70,7 @@
                 <p>只有已经开户的表具才可以进行该操作</p>
                 <p>操作后，可以在指令维护界面取消发送</p>
               </template>
-              <a-button type="danger" @click="saveValveControl(details.id,selectOrgName,0,details.f_alias)" :disabled="saveValveControlBtnHide()">关阀</a-button>
+              <a-button type="danger" @click="saveValveControl(details.id,0,details.f_alias)" :disabled="saveValveControlBtnHide()">关阀</a-button>
             </a-popover>
           </a-button-group>
         </template>
@@ -80,12 +80,12 @@
               <a-tab-pane :key="value.key" :tab="value.tab"/>
             </template>
           </a-tabs>
-          <meter-details-main :userid="userid" :select-org-name="selectOrgName" :details="details" v-if="tabActiveKey === '1'"/>
-          <meter-details-count :userid="userid" :select-org-name="selectOrgName" v-else-if="tabActiveKey === '2'"/>
-          <meter-details-sell-gas :userid="userid" :select-org-name="selectOrgName" v-else-if="tabActiveKey === '3'"/>
-          <meter-details-hand-plan :userid="userid" :select-org-name="selectOrgName" v-else-if="tabActiveKey === '4'"/>
-          <meter-details-exception :userid="userid" :select-org-name="selectOrgName" v-else-if="tabActiveKey === '5'"/>
-          <meter-details-instruct :userid="userid" :select-org-name="selectOrgName" v-else-if="tabActiveKey === '6'"/>
+          <meter-details-main :userid="userid" :details="details" v-if="tabActiveKey === '1'"/>
+          <meter-details-count :userid="userid" v-else-if="tabActiveKey === '2'"/>
+          <meter-details-sell-gas :userid="userid" v-else-if="tabActiveKey === '3'"/>
+          <meter-details-hand-plan :userid="userid" v-else-if="tabActiveKey === '4'"/>
+          <meter-details-exception :userid="userid" v-else-if="tabActiveKey === '5'"/>
+          <meter-details-instruct :userid="userid" v-else-if="tabActiveKey === '6'"/>
         </template>
       </a-page-header>
     </a-spin>
@@ -153,11 +153,7 @@ export default {
   },
   props: {
     userid: {
-      type: String,
-      required: true
-    },
-    selectOrgName: {
-      type: String,
+      type: String || Number,
       required: true
     },
     visible: {
@@ -169,7 +165,7 @@ export default {
     // 初始化组件
     initView () {
       this.tabActiveKey = '1'
-      this.getUserFiles(this.userid, this.selectOrgName)
+      this.getUserFiles(this.userid)
     },
     onClose () {
       this.$emit('update:visible', false)
@@ -187,11 +183,10 @@ export default {
       }
     },
     // 获取档案详情信息
-    getUserFiles (userId, selectOrgName) {
+    getUserFiles (userId) {
       this.loadUserFilesDetails = true
       return post(MeterDetailsViewApi.getUserFilesDetails, {
-        id: userId,
-        orgName: selectOrgName
+        id: userId
       })
         .then(res => {
           if (res.f_sendsuccess === undefined) {
@@ -209,7 +204,7 @@ export default {
       this.tabActiveKey = key
     },
     // 重新开户
-    againOpenAccount (id, selectOrgName) {
+    againOpenAccount (id) {
       const _this = this
       this.$confirm({
         title: '您确定要对档案进行重新开户吗？',
@@ -220,10 +215,9 @@ export default {
         onOk () {
           return post(MeterDetailsViewApi.againOpenAccount, {
             id: id,
-            orgName: selectOrgName,
             username: _this.currUser.username
           }).then(res => {
-            _this.getUserFiles(id, selectOrgName)
+            _this.getUserFiles(id)
             if (res.nums === 1) {
               _this.$message.success('操作成功')
             } else {
@@ -234,7 +228,7 @@ export default {
       })
     },
     // 开关阀
-    saveValveControl (id, selectOrgName, isOpen, alias) {
+    saveValveControl (id, isOpen, alias) {
       const _this = this
       let type
       if (isOpen === 1) {
@@ -251,12 +245,11 @@ export default {
         onOk () {
           return post(MeterDetailsViewApi.saveValveControl, {
             id: id,
-            orgName: selectOrgName,
             isOpenValue: isOpen,
             aliasValue: alias,
             username: _this.currUser.username
           }).then(res => {
-            _this.getUserFiles(id, selectOrgName)
+            _this.getUserFiles(id)
             if (res.nums > 0) {
               _this.$message.success('生成成功')
             } else {

package/src/base-client/components/iot/MeterDetailsView/index.md

@@ -29,7 +29,6 @@ export default {
 ```html
 <meter-details-view
   :visible.sync="detailVisible"
-  :select-org-name="selectOrgName"
   :userid="selectUserId"
   v-if="selectUserId" />
 ```
@@ -39,5 +38,4 @@ export default {
 | 参数            | 说明      | 类型      | 默认值   |
 |---------------|---------|---------|-------|
 | visible       | 是否显示    | Boolean | false |
-| selectOrgName | 燃气公司客户名 | String  | null  |
 | userid        | 表档案ID   | String  | null  |

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsCount.vue

@@ -89,10 +89,6 @@
       ARow
     },
     props: {
-      selectOrgName: {
-        type: String,
-        required: true
-      },
       userid: {
         type: String,
         required: true
@@ -117,7 +113,6 @@
         fetch(MeterDetailsViewApi.getGasConsumptionData, {
           method: 'POST',
           body: JSON.stringify({
-            orgName: this.selectOrgName,
             userId: this.userid
           })
         })

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsException.vue

@@ -77,10 +77,6 @@ export default {
     STable
   },
   props: {
-    selectOrgName: {
-      type: String,
-      required: true
-    },
     userid: {
       type: String,
       required: true
@@ -92,7 +88,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadExceptionData: parameter => {
         const queryParams = {
-          orgName: this.selectOrgName,
           userId: this.userid
         }
         const requestParameters = Object.assign({}, parameter, queryParams)

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsHandPlan.vue

@@ -169,10 +169,6 @@ export default {
     STable
   },
   props: {
-    selectOrgName: {
-      type: String,
-      required: true
-    },
     userid: {
       type: String,
       required: true
@@ -185,7 +181,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadHandData: parameter => {
         const queryParams = {
-          orgName: this.selectOrgName,
           userId: this.userid
         }
         const requestParameters = Object.assign({}, parameter, queryParams)
@@ -193,7 +188,6 @@ export default {
       },
       loadMetereadData: parameter => {
         const queryParams = {
-          orgName: this.selectOrgName,
           userId: this.userid
         }
         const requestParameters = Object.assign({}, parameter, queryParams)

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

@@ -49,7 +49,6 @@
     </a-row>
     <instruct-details-view
       :visible.sync="detailsViewVisible"
-      :select-org-name="selectOrgName"
       :instructid="selectInstructId"
       :isShowUserFiles="isShowUserFiles"
       v-if="selectInstructId"
@@ -127,10 +126,6 @@ export default {
     Ellipsis
   },
   props: {
-    selectOrgName: {
-      type: String,
-      required: true
-    },
     userid: {
       type: String,
       required: true
@@ -144,7 +139,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadInstructData: parameter => {
         const queryParams = {
-          orgName: this.selectOrgName,
           userId: this.userid
         }
         const requestParameters = Object.assign({}, parameter, queryParams)

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsMain.vue

@@ -117,10 +117,6 @@
   export default {
     name: 'MeterDetailsMain',
     props: {
-      selectOrgName: {
-        type: String,
-        required: true
-      },
       userid: {
         type: String,
         required: true
@@ -151,8 +147,7 @@
       getWorkFlow () {
         this.loading = true
         return post(MeterDetailsViewApi.getWorkFlowList, {
-          id: this.userid,
-          orgName: this.selectOrgName
+          id: this.userid
         }).then(res => {
             this.workList = []
             for (let i = 0, len = res.length; i < len; i++) {