遥测数据功能

src/views/remote/degree-log/RemoteDegreeLog.vue

@@ -109,7 +109,9 @@ export default {
       advanced: false,
       visible: true,
       // 查询参数
-      queryParam: {},
+      queryParam: {
+        sbId: this.$route.query.sbId
+      },
       // 表头
       columns: [
         {
@@ -284,7 +286,9 @@ export default {
       this.selectedRows = selectedRows
     },
     resetSearchForm () {
-      this.queryParam = {}
+      this.queryParam = {
+        sbId: this.$route.query.sbId
+      }
       this.$refs.table.refresh(true)
     },
     doExport () {

src/views/remote/degree/RemoteDegree.vue

@@ -102,6 +102,7 @@ export default {
       visible: true,
       // 查询参数
       queryParam: {
+        sbId: this.$route.query.sbId
       },
       // 表头
       columns: [
@@ -273,6 +274,7 @@ export default {
     },
     resetSearchForm () {
       this.queryParam = {
+        sbId: this.$route.query.sbId
       }
       this.$refs.table.refresh(true)
     },

src/views/remote/degree/modules/BaseForm.vue

@@ -59,12 +59,14 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input-number
-              style="width: 100%"
-              :min="0"
-              :formatter="BaseTool.Amount.formatter"
-              :parser="BaseTool.Amount.parser"
-              v-decorator="['type', {rules: [{required: true, message: '类型不能为空'}]}]" />
+            <a-select v-decorator="['type', {initialValue:1, rules: [{required: true, message: '类型不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in map"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </row-item>
         <row-item>

src/views/remote/degree/modules/Detail.vue

@@ -74,6 +74,7 @@ export default {
     handleCancel () {
       this.visible = false
       this.confirmLoading = false
+      this.$emit('ok')
     }
   }
 }

src/views/remote/degree/modules/RemoteDegreeSelectModal.vue

@@ -17,14 +17,14 @@
               </a-form-item>
             </a-col>
             <a-col :md="6 || 24" :sm="24">
-                            <span class="table-page-search-submitButtons">
-                                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                                <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
-                                  {{ advanced ? '收起' : '展开' }}
-                                  <a-icon :type="advanced ? 'up' : 'down'" />
-                                </a>
-                            </span>
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a>
+              </span>
             </a-col>
           </a-row>
         </a-form>
@@ -44,11 +44,11 @@
         :rowSelection="options.rowSelection"
         showPagination="auto"
       >
-                <span slot="action" slot-scope="record1">
-                  <template>
-                    <a @click="handleView(record1)">查看</a>
-                  </template>
-                </span>
+        <span slot="action" slot-scope="record1">
+          <template>
+            <a @click="handleView(record1)">查看</a>
+          </template>
+        </span>
       </s-table>
       <detail ref="detailModal" />
     </a-card>
@@ -188,7 +188,8 @@ export default {
 
       options: {
         alert: {
-          show: true, clear: () => {
+          show: true,
+          clear: () => {
             this.selectedRowKeys = []
           }
         },
@@ -211,7 +212,8 @@ export default {
       if (!this.optionAlertShow) {
         this.options = {
           alert: {
-            show: true, clear: () => {
+            show: true,
+            clear: () => {
               this.selectedRowKeys = []
             }
           },
@@ -311,7 +313,6 @@ export default {
         this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
         this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
       }
-
     }
   }
 }

src/views/remote/measure/RemoteMeasure.vue

@@ -12,14 +12,14 @@
           </a-row>
           <a-row :gutter="48">
             <a-col :md="24 || 24" :sm="24" style="text-align: right">
-                            <span class="table-page-search-submitButtons">
-                              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                              <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
-                                  {{ advanced ? '收起' : '展开' }}
-                                  <a-icon :type="advanced ? 'up' : 'down'" />
-                              </a>
-                            </span>
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a>
+              </span>
             </a-col>
           </a-row>
         </a-form>
@@ -29,8 +29,12 @@
         <a-row>
           <a-col :md="16">
             <a-button v-if="$auth('remote-measures-add')" type="primary" icon="plus" @click="handleAdd()">新增</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('remote-measures-export')" type="primary" icon="download"
-                      @click="doExport">导出
+            <a-button
+              style="margin-left: 8px"
+              v-if="$auth('remote-measures-export')"
+              type="primary"
+              icon="download"
+              @click="doExport">导出
             </a-button>
             <a-button style="margin-left:8px;" type="primary" @click="doImport">
               <a-icon type="upload"/>
@@ -63,19 +67,20 @@
         :rowSelection="options.rowSelection"
         showPagination="auto"
       >
-                <span slot="action" slot-scope="record">
-                  <template>
-                    <a @click="handleView(record)">查看</a>
-                    <operation-button
-                      v-if="$auth('remote-measures-edit')" @click="handleEdit(record)"
-                    >修改</operation-button>
-                    <operation-button
-                      v-if="$auth('remote-measures-del')"
-                      :type="2"
-                      title="是否要删除该条数据？"
-                      @confirm="batchDelete(record.id)">删除</operation-button>
-                  </template>
-                </span>
+        <span slot="action" slot-scope="record">
+          <template>
+            <a @click="handleView(record)">查看</a>
+            <operation-button
+              v-if="$auth('remote-measures-edit')"
+              @click="handleEdit(record)"
+            >修改</operation-button>
+            <operation-button
+              v-if="$auth('remote-measures-del')"
+              :type="2"
+              title="是否要删除该条数据？"
+              @confirm="batchDelete(record.id)">删除</operation-button>
+          </template>
+        </span>
       </s-table>
     </div>
     <import-form-add ref="importModal" @ok="handleOk"/>
@@ -111,7 +116,9 @@ export default {
       visible: true,
       map: {},
       // 查询参数
-      queryParam: {},
+      queryParam: {
+        sbId: this.$route.query.sbId
+      },
       // 表头
       columns: [
         {
@@ -135,7 +142,10 @@ export default {
         },
         {
           title: '类型',
-          dataIndex: 'type'
+          dataIndex: 'type',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.map, text)
+          }
         },
         {
           title: '描述',
@@ -193,7 +203,8 @@ export default {
 
       options: {
         alert: {
-          show: true, clear: () => {
+          show: true,
+          clear: () => {
             this.selectedRowKeys = []
           }
         },
@@ -215,7 +226,8 @@ export default {
       if (!this.optionAlertShow) {
         this.options = {
           alert: {
-            show: true, clear: () => {
+            show: true,
+            clear: () => {
               this.selectedRowKeys = []
             }
           },
@@ -285,7 +297,9 @@ export default {
       this.selectedRows = selectedRows
     },
     resetSearchForm () {
-      this.queryParam = {}
+      this.queryParam = {
+        sbId: this.$route.query.sbId
+      }
       this.$refs.table.refresh(true)
     },
     doExport () {

src/views/remote/measure/modules/BaseForm.vue

@@ -59,12 +59,14 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input-number
-              style="width: 100%"
-              :min="0"
-              :formatter="BaseTool.Amount.formatter"
-              :parser="BaseTool.Amount.parser"
-              v-decorator="['type', {rules: [{required: true, message: '类型不能为空'}]}]"/>
+            <a-select v-decorator="['type', {initialValue:1, rules: [{required: true, message: '类型不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in map"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </row-item>
         <row-item>

src/views/remote/measure/modules/Detail.vue

@@ -73,6 +73,7 @@ export default {
     handleCancel () {
       this.visible = false
       this.confirmLoading = false
+      this.$emit('ok')
     }
   }
 }

src/views/sb/info/SbInfo.vue

@@ -22,7 +22,7 @@
                       <a-input v-model.trim="queryParam.keyword" placeholder="名称/设备新号"/>
                     </a-form-item>
                   </a-col>
-<!--                  <a-col :md="6" :sm="24">
+                  <!--                  <a-col :md="6" :sm="24">
                     <a-form-item label="设备旧号">
                       <a-input v-model="queryParam.zbh" placeholder="设备旧号"/>
                     </a-form-item>
@@ -122,7 +122,7 @@
             <div class="table-operator" style="margin-bottom: 8px;">
               <a-button v-if="$auth('sb-infos-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
               <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-<!--              <a-button style="margin-left:8px;" type="primary" @click="doImport">
+              <!--              <a-button style="margin-left:8px;" type="primary" @click="doImport">
                 <a-icon type="upload"/>
                 新增导入
               </a-button>-->
@@ -317,12 +317,12 @@ export default {
           width: 200,
           dataIndex: 'name'
         },
-       /* {
+        /* {
           title: '设备旧号',
           dataIndex: 'zbh',
           width: 120,
           checked: true
-        },*/
+        }, */
         {
           title: '设备类型',
           checked: true,
@@ -388,7 +388,7 @@ export default {
           checked: true
         },
 
-        /*{
+        /* {
           title: '是否显示',
           dataIndex: 'isShow',
           width: 120,
@@ -396,7 +396,7 @@ export default {
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.isShowMap, text)
           }
-        },*/
+        }, */
 
         {
           title: '是否子设备',

src/views/sb/info/SbInfoRemote.vue

@@ -0,0 +1,17 @@
+<template>
+  <SbInfo :use-type="6"/>
+</template>
+
+<script>
+import SbInfo from './SbInfo'
+export default {
+  name: 'SbInfoRemote',
+  components: {
+    SbInfo
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sb/info/modules/Detail.vue

@@ -22,7 +22,7 @@
                 <a-button style="margin-left: 20px" type="default" @click="handleViewCheckJob2(1)">点检任务</a-button>
               </a-badge>
 
-              <a-badge :count="numCheckStandard2" title="保养标准" :number-style="{ backgroundColor: '#52c41a' }">
+<!--              <a-badge :count="numCheckStandard2" title="保养标准" :number-style="{ backgroundColor: '#52c41a' }">
                 <a-button style="margin-left: 20px" type="default" @ok="handleOk" @click="handleViewCheck(2)">保养标准</a-button>
               </a-badge>
               <a-badge :count="numCheckjob2" title="保养任务" :number-style="{ backgroundColor: '#52c41a' }">
@@ -34,7 +34,7 @@
               </a-badge>
               <a-badge :count="numCheckjob3" title="润滑任务" :number-style="{ backgroundColor: '#52c41a' }">
                 <a-button style="margin-left: 20px" type="default" @click="handleViewCheckJob3(3)">润滑任务</a-button>
-              </a-badge>
+              </a-badge>-->
               <a-button v-show="model.useType==4" style="margin-left: 20px" type="default" @click="handleMeasure()">检定记录</a-button>
               <!-- <a-button style="margin-left: 20px" type="default" @click="handleViewTree()">设备树</a-button>
               <a-button style="margin-left: 20px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
@@ -89,6 +89,11 @@
                 停机记录
               </a-button>
             </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRouter(7)" block>
+                遥测点位
+              </a-button>
+            </a-col>
             <a-col :span="10">
               <a-button shape="round" @click="handleViewTree()" block>设备树</a-button>
             </a-col>
@@ -97,7 +102,7 @@
                 检点日历
               </a-button>
             </a-col>
-            <a-col :span="10">
+<!--            <a-col :span="10">
               <a-button shape="round" @click="handleTuiCalendar(2)" block>
                 保养日历
               </a-button>
@@ -106,7 +111,7 @@
               <a-button shape="round" @click="handleTuiCalendar(3)" block>
                 润滑日历
               </a-button>
-            </a-col>
+            </a-col>-->
             <a-col :span="10">
               <a-button shape="round" @click="handleRepairReportSbInfo()" block>
                 工单分析
@@ -537,6 +542,9 @@ export default {
       if (keyNum === 6) {
         routeUrl = this.$router.resolve({ path: '/stop/log', query: { id: id } })
       }
+      if (keyNum === 7) {
+        routeUrl = this.$router.resolve({ path: '/remote/measure', query: { sbId: id } })
+      }
       window.open(routeUrl.href, '_blank')
     },
     handleMeasure (record) {

src/views/sb/status-log/SbStatusLog.vue

@@ -235,6 +235,7 @@ export default {
     },
     resetSearchForm () {
       this.queryParam = {
+        sbId: this.$route.query.id
       }
       this.$refs.table.refresh(true)
     },