统计计量/单元信息

src/api/base/workUnit.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询统计单元信息列表
+export function listWorkUnit(query) {
+  return request({
+    url: '/base/workUnit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询统计单元信息详细
+export function getWorkUnit(objId) {
+  return request({
+    url: '/base/workUnit/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增统计单元信息
+export function addWorkUnit(data) {
+  return request({
+    url: '/base/workUnit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改统计单元信息
+export function updateWorkUnit(data) {
+  return request({
+    url: '/base/workUnit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除统计单元信息
+export function delWorkUnit(objId) {
+  return request({
+    url: '/base/workUnit/' + objId,
+    method: 'delete'
+  })
+}
+//查询统计单元信息信息下拉结构
+export function getWorkUnitTrees(){
+  return request({
+    url: '/base/workUnit/workUnitTree',
+    method: 'post'
+  })
+}

src/views/base/workUnit/index.vue

@@ -0,0 +1,361 @@
+<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="workUnitName">
+        <el-input
+          v-model="queryParams.workUnitName"
+          placeholder="请输入统计单元名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="统计区域" prop="workUnitAddress">
+        <el-input
+          v-model="queryParams.workUnitAddress"
+          placeholder="请输入统计区域"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产线/工位" prop="productLineCode">
+        <el-input
+          v-model="queryParams.productLineCode"
+          placeholder="请输入产线/工位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="统计单元类型" prop="workUnitType">
+        <el-select v-model="queryParams.workUnitType" placeholder="请选择统计单元类型" clearable>
+          <el-option
+            v-for="dict in dict.type.work_unit_type"
+            :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="['base:workUnit:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="workUnitList"
+      row-key="workUnitCode"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+
+      <el-table-column label="统计单元编号" prop="workUnitCode" />
+      <el-table-column label="父级编号" align="center" prop="parentId" />
+      <el-table-column label="统计单元名称" align="center" prop="workUnitName" />
+      <el-table-column label="统计区域" align="center" prop="workUnitAddress" />
+      <el-table-column label="产线/工位" align="center" prop="productLineCode" />
+      <el-table-column label="统计单元类型" align="center" prop="workUnitType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="启用标识" align="center" prop="isFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createdBy" />
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" />
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{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="['base:workUnit:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['base:workUnit:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:workUnit:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改统计单元信息对话框 -->
+    <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="workUnitCode">
+          <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />
+        </el-form-item>
+        <el-form-item label="父级编号" prop="parentId">
+          <treeselect v-model="form.parentId" :options="workUnitOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
+        </el-form-item>
+        <el-form-item label="统计单元名称" prop="workUnitName">
+          <el-input v-model="form.workUnitName" placeholder="请输入统计单元名称" />
+        </el-form-item>
+        <el-form-item label="统计区域" prop="workUnitAddress">
+          <el-input v-model="form.workUnitAddress" placeholder="请输入统计区域" />
+        </el-form-item>
+        <el-form-item label="产线/工位" prop="productLineCode">
+          <el-input v-model="form.productLineCode" placeholder="请输入产线/工位" />
+        </el-form-item>
+        <el-form-item label="统计单元类型" prop="workUnitType">
+          <el-select v-model="form.workUnitType" placeholder="请选择统计单元类型">
+            <el-option
+              v-for="dict in dict.type.work_unit_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </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 { listWorkUnit, getWorkUnit, delWorkUnit, addWorkUnit, updateWorkUnit } from "@/api/base/workUnit";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "WorkUnit",
+  dicts: ['is_flag', 'work_unit_type'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 统计单元信息表格数据
+      workUnitList: [],
+      // 统计单元信息树选项
+      workUnitOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        objId: null,
+        workUnitCode: null,
+        parentId: null,
+        workUnitName: null,
+        workUnitAddress: null,
+        ancestors: null,
+        workUnitSort: null,
+        productLineCode: null,
+        workUnitType: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        workUnitCode: [
+          { required: true, message: "统计单元编号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询统计单元信息列表 */
+    getList() {
+      this.loading = true;
+      listWorkUnit(this.queryParams).then(response => {
+        this.workUnitList = this.handleTree(response.data, "workUnitCode", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换统计单元信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.workUnitCode,
+        label: node.workUnitName,
+        children: node.children
+      };
+    },
+	/** 查询统计单元信息下拉树结构 */
+    getTreeselect() {
+      listWorkUnit().then(response => {
+        this.workUnitOptions = [];
+        const data = { workUnitCode: 0, workUnitName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "workUnitCode", "parentId");
+        this.workUnitOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        workUnitCode: null,
+        parentId: null,
+        workUnitName: null,
+        workUnitAddress: null,
+        ancestors: null,
+        workUnitSort: null,
+        productLineCode: null,
+        workUnitType: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.workUnitCode) {
+        this.form.parentId = row.workUnitCode;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加统计单元信息";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.parentId;
+      }
+      getWorkUnit(row.objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改统计单元信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateWorkUnit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWorkUnit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除统计单元信息编号为"' + row.objId + '"的数据项？').then(function() {
+        return delWorkUnit(row.objId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/report/pointDnb/index.vue

@@ -329,7 +329,9 @@ export default {
 
     /** 查询计量设备下拉树结构 */
     getDeptTrees() {
+
       getMonitorInfoTree().then(response => {
+        console.log(response)
         this.deptOptions = response.data;
       });
     },