+ 指令下发工作台页面代码

src/api/cons/machineCmdHis.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询桩机指令下发历史列表
+export function listMachineCmdHis(query) {
+  return request({
+    url: '/cons/machineCmdHis/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询桩机指令下发历史详细
+export function getMachineCmdHis(id) {
+  return request({
+    url: '/cons/machineCmdHis/' + id,
+    method: 'get'
+  })
+}
+
+// 新增桩机指令下发历史
+export function addMachineCmdHis(data) {
+  return request({
+    url: '/cons/machineCmdHis',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改桩机指令下发历史
+export function updateMachineCmdHis(data) {
+  return request({
+    url: '/cons/machineCmdHis',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除桩机指令下发历史
+export function delMachineCmdHis(id) {
+  return request({
+    url: '/cons/machineCmdHis/' + id,
+    method: 'delete'
+  })
+}

src/api/cons/pileMachineInfo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询施工桩机信息列表
+export function listPileMachineInfo(query) {
+  return request({
+    url: '/cons/pileMachineInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listAllPileMachineInfo(query) {
+  return request({
+    url: '/cons/pileMachineInfo/list/all',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询施工桩机信息详细
+export function getPileMachineInfo(id) {
+  return request({
+    url: '/cons/pileMachineInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增施工桩机信息
+export function addPileMachineInfo(data) {
+  return request({
+    url: '/cons/pileMachineInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改施工桩机信息
+export function updatePileMachineInfo(data) {
+  return request({
+    url: '/cons/pileMachineInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除施工桩机信息
+export function delPileMachineInfo(id) {
+  return request({
+    url: '/cons/pileMachineInfo/' + id,
+    method: 'delete'
+  })
+}

src/utils/dict/DictData.js

@@ -15,7 +15,6 @@ export default class DictData {
     let language = localStorage.getItem('language') || process.env.VUE_APP_DEF_LANGUAGE
     // language 转换成首字母大写
     language = language.charAt(0).toUpperCase() + language.slice(1)
-    debugger
     this.label = raw[`dictLabel${language}`] || label
     this.value = value
     this.raw = raw

src/views/cons/machineCmdHis/index.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="指令状态" prop="cmdResult">
+        <el-select v-model="queryParams.cmdResult" placeholder="请选择指令状态" clearable>
+          <el-option
+              v-for="dict in dict.type.cmd_result"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['cons:machineCmdHis:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['cons:machineCmdHis:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['cons:machineCmdHis:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['cons:machineCmdHis:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="machineCmdHisList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id"/>
+      <el-table-column label="指令内容" align="center" prop="cmdContent">
+        <template slot-scope="scope">
+         {{ JSON.stringify(scope.row.cmdContent)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="指令状态" align="center" prop="cmdResult">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.cmd_result" :value="scope.row.cmdResult"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="create_by" align="center" prop="createBy"/>
+      <el-table-column label="update_by" align="center" prop="updateBy"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['cons:machineCmdHis:edit']"
+          >修改
+          </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['cons:machineCmdHis:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+
+    <!-- 添加或修改桩机指令下发历史对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="执行指令桩机" prop="toMachineId">
+          <el-select v-model="form.toMachineId" placeholder="请选择桩机">
+            <el-option
+                v-for="machine in machineList"
+                :key="machine.id"
+                :label="`${machine.machineNum}(${machine.equipment})`"
+                :value="machine.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="指令内容">
+          <vue-json-editor
+              v-model="form.cmdContent"
+              :showBtns="false"
+              mode="code"
+              lang="zh"
+              :expanded-on-start="true"
+          />
+        </el-form-item>
+        <el-form-item label="指令状态" prop="cmdResult">
+          <el-select v-model="form.cmdResult" placeholder="请选择指令状态">
+            <el-option
+                v-for="dict in dict.type.cmd_result"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addMachineCmdHis,
+  delMachineCmdHis,
+  getMachineCmdHis,
+  listMachineCmdHis,
+  updateMachineCmdHis
+} from "@/api/cons/machineCmdHis";
+import vueJsonEditor from 'vue-json-editor';
+import {listAllPileMachineInfo} from "@/api/cons/pileMachineInfo";
+
+export default {
+  name: "MachineCmdHis",
+  components: {vueJsonEditor},
+  dicts: ['cmd_result'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 桩机指令下发历史表格数据
+      machineCmdHisList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cmdResult: null,
+      },
+      machineList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+    this.getMachineList()
+  },
+  methods: {
+    /** 查询桩机指令下发历史列表 */
+    getList() {
+      this.loading = true;
+      listMachineCmdHis(this.queryParams).then(response => {
+        this.machineCmdHisList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getMachineList() {
+      this.loading = true;
+      listAllPileMachineInfo({}).then(response => {
+        this.machineList = response.rows
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        toMachineId: null,
+        cmdContent: null,
+        cmdResult: null,
+        updateTime: null,
+        createTime: null,
+        createBy: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "桩机指令下发";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMachineCmdHis(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改桩机指令下发历史";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMachineCmdHis(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMachineCmdHis(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除桩机指令下发历史编号为"' + ids + '"的数据项？').then(function () {
+        return delMachineCmdHis(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('cons/machineCmdHis/export', {
+        ...this.queryParams
+      }, `machineCmdHis_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/cons/pileMachineInfo/index.vue

@@ -0,0 +1,279 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="桩机编号" prop="machineNum">
+        <el-input
+          v-model="queryParams.machineNum"
+          placeholder="请输入桩机编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备信息" prop="equipment">
+        <el-input
+          v-model="queryParams.equipment"
+          placeholder="请输入设备信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['cons:pileMachineInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['cons:pileMachineInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['cons:pileMachineInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['cons:pileMachineInfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="pileMachineInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="桩机编号" align="center" prop="machineNum" />
+      <el-table-column label="设备信息" align="center" prop="equipment" />
+      <el-table-column label="创建时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['cons:pileMachineInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['cons:pileMachineInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改施工桩机信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="桩机编号" prop="machineNum">
+          <el-input v-model="form.machineNum" placeholder="请输入桩机编号" />
+        </el-form-item>
+        <el-form-item label="设备信息" prop="equipment">
+          <el-input v-model="form.equipment" placeholder="请输入设备信息" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPileMachineInfo, getPileMachineInfo, delPileMachineInfo, addPileMachineInfo, updatePileMachineInfo } from "@/api/cons/pileMachineInfo";
+
+export default {
+  name: "PileMachineInfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 施工桩机信息表格数据
+      pileMachineInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineNum: null,
+        equipment: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        machineNum: [
+          { required: true, message: "桩机编号不能为空", trigger: "blur" }
+        ],
+        equipment: [
+          { required: true, message: "设备信息不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询施工桩机信息列表 */
+    getList() {
+      this.loading = true;
+      listPileMachineInfo(this.queryParams).then(response => {
+        this.pileMachineInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        machineNum: null,
+        equipment: null,
+        updateTime: null,
+        createTime: null,
+        createBy: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加施工桩机信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPileMachineInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改施工桩机信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePileMachineInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPileMachineInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除施工桩机信息编号为"' + ids + '"的数据项？').then(function() {
+        return delPileMachineInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('cons/pileMachineInfo/export', {
+        ...this.queryParams
+      }, `pileMachineInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>