页面调整

src/pages/sys/commandlog/index.vue

@@ -16,19 +16,23 @@
                       el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
                   el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
                   el-button(@click="reSet()" size='mini' type="primary" icon="el-icon-refresh-right") 重置
-          table-list(:tableColums='tableHeader' :tableData='dataList' :showOpr='false'  :opNum='2')
+          table-list(:tableColums='tableHeader' :tableData='dataList' :showOpr='true'  :opNum='2')
             template(#comSource='data')
               font(v-if='data.scope.comSource == 1') 算法
               font(v-if='data.scope.comSource == 2') 人工
             template(#comType='data' )
               font(v-if='data.scope.comType == 1') 自动
               font(v-if='data.scope.comType == 2') 手动
+            template(#operation="data")
+              el-button(type="text"  size="mini" @click="queryHandle(data.scope.id)") 详情
       el-footer.box_footer
         el-pagination(@size-change="sizeChangeHandle" background  @current-change="currentChangeHandle" :current-page="pageIndex" :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage" layout="total, sizes, prev, pager, next, jumper")
+        query-detail(v-if="queryDetailVisible" ref="queryView" @refreshdatalist="getDataList")
 </template>
 
 <script>
 import tableList from '@/pages/components/tableList'
+import queryDetail from './query-detail'
 
 export default {
   filters: {
@@ -50,7 +54,6 @@ export default {
         { label: '被控设备', prop: 'resourceName' },
         { label: '操作时间', prop: 'createTime' },
         { label: '指令内容', prop: 'comMark' }
-        // {label:'操作',prop:''},
       ],
       tableOption: {
         border: false, //是否边框
@@ -66,11 +69,13 @@ export default {
       pageIndex: 1,
       pageSize: 10,
       totalPage: 0,
+      queryDetailVisible: false,
       dataListLoading: false
     }
   },
   components: {
-    tableList
+    tableList,
+    queryDetail
   },
   watch: {
     totalPage() {
@@ -100,6 +105,13 @@ export default {
       this.pageIndex = 1
       this.getDataList()
     },
+    //详情
+    queryHandle(id) {
+      this.queryDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.queryView.init(id)
+      })
+    },
     // 获取数据列表
     getDataList(sort, order) {
       // console.log(sort,'---',order)

src/pages/sys/commandlog/query-detail.vue

+<template lang="pug">
+  <div class='m_i_dialog'>
+    <el-dialog  width="60%" :close-on-click-modal='false' :visible.sync='visible' :modal-append-to-body='false'>
+      .title-bold(slot='title') 指令详情
+      <div style="height:300px;">
+        <div class="m_i_dialog_lift">
+          <div class="header_title">基本信息</div>
+          <el-form :model='dataForm'  ref='dataForm' :inline='true'  label-width="100px">
+            <el-form-item label='资源点名称:' prop='resourceName'>
+              <el-input  size="medium" :title='dataForm.resourceName' v-model='dataForm.resourceName' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='资源点编码:' prop='code'>
+              <el-input  size="medium" v-model='dataForm.code' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='资源点类型:' prop='type'>
+              <el-input  size="medium" v-model='dataForm.type' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='资源点状态:' prop='status'>
+              <el-input  size="medium" v-model='dataForm.status' readonly></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="m_i_dialog_right">
+          <div class="header_title">运行信息</div>
+          <el-form :model='dataForm' ref='dataForm' :inline='true'  label-width="100px" style='padding-left: 20px;'>
+            <el-form-item label='操作员:' prop='createUserName'>
+              <el-input  size="medium" v-model='dataForm.createUserName' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='执行完成时间:' prop='createTime'>
+              <el-input  size="medium" v-model='dataForm.createTime' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='执行结果:' prop='result'>
+              <el-input  size="medium" v-model='dataForm.result' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='指令类型:' prop='comType'>
+              <el-input v-if="dataForm.comType==1" value="自动" size="medium" readonly></el-input>
+              <el-input v-if="dataForm.comType==2" value="手动" size="medium" readonly></el-input>
+            </el-form-item>
+            <el-form-item label='指令来源:' prop='comSource'>
+              <el-input v-if="dataForm.comSource==1" value="算法" size="medium" readonly></el-input>
+              <el-input v-if="dataForm.comSource==2" value="人工" size="medium" readonly></el-input>
+            </el-form-item>
+            <el-form-item label='部署位置:' prop='deployLocation'>
+              <el-input  size="medium" :title='dataForm.deployLocation' v-model='dataForm.deployLocation' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='附属信息:' prop='attachedInfo'>
+              <el-input  size="medium" :title='dataForm.attachedInfo' v-model='dataForm.attachedInfo' readonly></el-input>
+            </el-form-item>
+            <el-form-item label='指令内容:' prop='comMark'>
+              <el-input type="textarea" resize="none" readonly v-model="dataForm.comMark"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <span class="dialog-footer" slot='footer'>
+        <el-button type="primary" @click='visible = false'>关闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  computed: {
+    ...mapState('d2admin/user', ['info'])
+  },
+  data() {
+    return {
+      visible: false,
+      dataForm: {}
+    }
+  },
+  methods: {
+    init(id) {
+      // console.log(res)
+      this.visible = true
+
+      this.$http({
+        url: this.$http.adornUrl(`/sysCommandLog/getId/` + id),
+        method: 'get',
+        params: this.$http.adornParams()
+      }).then((data) => {
+        if (data && data.code === 0) {
+          this.dataForm = data.bean
+          console.log('dataForm:', this.dataForm)
+          this.dataForm.result == 1
+            ? (this.dataForm.result = '成功')
+            : (this.dataForm.result = '失败')
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.m_i_dialog_lift {
+  width: 364px;
+  height: 450px;
+  background: rgba(255, 255, 255, 1);
+  border: 1px solid rgba(23, 41, 71, 0.08);
+
+  float: left;
+  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2);
+  .header_title {
+    height: 40px;
+    width: 344px;
+    background: #eef8ff;
+    line-height: 40px;
+    padding-left: 20px;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+  .el-form-item {
+    margin: 10px 0 0 0;
+  }
+}
+.m_i_dialog_right {
+  width: 670px;
+  height: 450px;
+  float: left;
+  background: rgba(255, 255, 255, 1);
+  border: 1px solid rgba(23, 41, 71, 0.08);
+  margin-left: 20px;
+  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2);
+  .header_title {
+    height: 40px;
+    width: 650px;
+    background: #eef8ff;
+    line-height: 40px;
+    padding-left: 20px;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+  .el-form-item {
+    margin: 10px 0 0 0;
+  }
+  .el-textarea {
+    width: 267%;
+  }
+}
+</style>

src/pages/sys/point/add-or-update.vue

@@ -344,6 +344,8 @@ export default {
         if (this.dataForm.modeTypes) {
           console.log('111111:')
           this.dataForm.modeTypes = this.dataForm.modeTypes.split(',')
+        } else {
+          this.dataForm.modeTypes = []
         }
       }
       console.log('dataForm:', this.dataForm)