完善

src/views/remote/degree/RemoteDegree.vue

@@ -248,7 +248,9 @@ export default {
     handleAdd () {
       this.visible = false
       const modal = this.$refs.baseModal
-      modal.base()
+      modal.base({
+        ...this.$route.query
+      })
     },
     handleEdit (record) {
       this.visible = false

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

@@ -12,20 +12,10 @@
 
       <a-form-item v-show="false">
         <a-input v-decorator="['id']" type="hidden" />
+        <a-input v-decorator="['sbId']" type="hidden"/>
       </a-form-item>
 
       <row-list :col="2">
-        <row-item>
-
-          <a-form-item
-            label="设备id"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['sbId', {rules: [{required: true, message: '设备id不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
         <row-item>
 
           <a-form-item
@@ -34,7 +24,10 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
+              style="width: 70%"
+              disabled
               v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]" />
+            <a-button style="width: 30%" type="primary" @click="handleSbSelect">选择</a-button>
           </a-form-item>
         </row-item>
         <row-item>
@@ -130,15 +123,20 @@
         </row-item>
       </row-list>
     </a-form>
+    <remote-degree-select-modal ref="remoteDegreeSelectModal" @selected="handleSbSelectd"/>
   </a-card>
 </template>
 
 <script>
 import pick from 'lodash.pick'
 import { addRemoteDegree, updateRemoteDegree } from '@/api/remote/degree'
+import RemoteDegreeSelectModal from './RemoteDegreeSelectModal'
 
 export default {
   name: 'BaseRemoteDegree',
+  components: {
+    RemoteDegreeSelectModal
+  },
   data () {
     return {
       confirmLoading: false,
@@ -158,7 +156,7 @@ export default {
     base (record) {
       this.visible = true
       // 如果是空标识添加
-      if (this.BaseTool.Object.isBlank(record)) {
+      if (this.BaseTool.Object.isBlank(record.id)) {
         this.modalTitle = '添加'
         return
       }
@@ -206,6 +204,23 @@ export default {
         }
       })
     },
+    handleSbSelect () {
+      this.$refs.remoteDegreeSelectModal.base({}, {})
+    },
+    handleSbSelectd (keys, rows) {
+      const [ key ] = keys
+      const [ row ] = rows
+      const { form: { setFieldsValue } } = this
+      this.sbId = key
+      // 日期处理
+      console.log(keys, rows)
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign({
+          'sbId': key,
+          'sbName': row.sbName
+        }))
+      })
+    },
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false

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

@@ -174,7 +174,7 @@ export default {
           ...this.queryParam,
           ...this.extraQueryParam,
           dataScope: {
-            sortBy: 'description',
+            sortBy: 'desc',
             sortName: 'update_time'
           }
         }
@@ -292,7 +292,7 @@ export default {
         this.$message.warn('请至少选择一项信息')
       } else {
         this.confirmLoading = true
-        this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
+        this.$emit('selected', this.selectedRowKeys, this.selectedRows)
         this.confirmLoading = false
         this.visible = false
       }

src/views/remote/measure/RemoteMeasure.vue

@@ -272,7 +272,9 @@ export default {
     handleAdd () {
       this.visible = false
       const modal = this.$refs.baseModal
-      modal.base()
+      modal.base({
+        ...this.$route.query
+      })
     },
     handleEdit (record) {
       this.visible = false

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

@@ -12,29 +12,21 @@
 
       <a-form-item v-show="false">
         <a-input v-decorator="['id']" type="hidden"/>
+        <a-input v-decorator="['sbId']" type="hidden"/>
       </a-form-item>
 
       <row-list :col="2">
         <row-item>
-
-          <a-form-item
-            label="设备id"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['sbId', {rules: [{required: true, message: '设备id不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-
           <a-form-item
             label="设备名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]"/>
+              style="width: 70%"
+              disabled
+              v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]" />
+            <a-button style="width: 30%" type="primary" @click="handleSbSelect">选择</a-button>
           </a-form-item>
         </row-item>
         <row-item>
@@ -130,14 +122,19 @@
         </row-item>
       </row-list>
     </a-form>
+    <remote-measure-select-modal ref="remoteMeasureSelectModal" @selected="handleSbSelectd"/>
   </a-card>
 </template>
 
 <script>
 import pick from 'lodash.pick'
 import { addRemoteMeasure, updateRemoteMeasure } from '@/api/remote/measure'
+import RemoteMeasureSelectModal from './RemoteMeasureSelectModal'
 export default {
   name: 'BaseRemoteMeasure',
+  components: {
+    RemoteMeasureSelectModal
+  },
   data () {
     return {
       confirmLoading: false,
@@ -157,7 +154,7 @@ export default {
     base (record) {
       this.visible = true
       // 如果是空标识添加
-      if (this.BaseTool.Object.isBlank(record)) {
+      if (this.BaseTool.Object.isBlank(record.id)) {
         this.modalTitle = '添加'
         return
       }
@@ -205,6 +202,23 @@ export default {
         }
       })
     },
+    handleSbSelect () {
+      this.$refs.remoteMeasureSelectModal.base({}, {})
+    },
+    handleSbSelectd (keys, rows) {
+      const [ key ] = keys
+      const [ row ] = rows
+      const { form: { setFieldsValue } } = this
+      this.sbId = key
+      // 日期处理
+      console.log(keys, rows)
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign({
+          'sbId': key,
+          'sbName': row.sbName
+        }))
+      })
+    },
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false

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

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     :title="modalTitle"
-    :width="1000"
+    :width="1300"
     :visible="visible"
     :confirmLoading="confirmLoading"
     class="ant-modal2"
@@ -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="record">
+          <template>
+            <a @click="handleView(record)">查看</a>
+          </template>
+        </span>
       </s-table>
       <detail ref="detailModal" />
     </a-card>
@@ -176,7 +176,7 @@ export default {
           ...this.queryParam,
           ...this.extraQueryParam,
           dataScope: {
-            sortBy: 'description',
+            sortBy: 'desc',
             sortName: 'update_time'
           }
         }
@@ -190,7 +190,8 @@ export default {
 
       options: {
         alert: {
-          show: true, clear: () => {
+          show: true,
+          clear: () => {
             this.selectedRowKeys = []
           }
         },
@@ -212,7 +213,8 @@ export default {
       if (!this.optionAlertShow) {
         this.options = {
           alert: {
-            show: true, clear: () => {
+            show: true,
+            clear: () => {
               this.selectedRowKeys = []
             }
           },
@@ -291,7 +293,7 @@ export default {
         this.$message.warn('请至少选择一项信息')
       } else {
         this.confirmLoading = true
-        this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
+        this.$emit('selected', this.selectedRowKeys, this.selectedRows)
         this.confirmLoading = false
         this.visible = false
       }
@@ -312,7 +314,6 @@ export default {
         this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
         this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
       }
-
     }
   }
 }

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

@@ -556,7 +556,7 @@ export default {
         routeUrl = this.$router.resolve({ path: '/stop/log', query: { id: id } })
       }
       if (keyNum === 7) {
-        routeUrl = this.$router.resolve({ path: '/remote/measure', query: { sbId: id } })
+        routeUrl = this.$router.resolve({ path: '/remote/measure', query: { sbId: id, sbName: this.model.name } })
       }
       window.open(routeUrl.href, '_blank')
     },