Forráskód Böngészése

质量月报 - 删除多余文件

wangggziwen 1 éve
szülő
commit
6755bae8a0

+ 0 - 698
ui/src/views/production/s0501/index.vue

@@ -1,698 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="正构烷烃" prop="p">
-        <el-input
-          v-model="queryParams.p"
-          placeholder="请输入正构烷烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="异构烷烃" prop="i">
-        <el-input
-          v-model="queryParams.i"
-          placeholder="请输入异构烷烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="烯烃" prop="o">
-        <el-input
-          v-model="queryParams.o"
-          placeholder="请输入烯烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环烷烃" prop="n">
-        <el-input
-          v-model="queryParams.n"
-          placeholder="请输入环烷烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="芳烃" prop="a">
-        <el-input
-          v-model="queryParams.a"
-          placeholder="请输入芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="正构烷烃+异构烷烃" prop="pI">
-        <el-input
-          v-model="queryParams.pI"
-          placeholder="请输入正构烷烃+异构烷烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="密度" prop="density2">
-        <el-input
-          v-model="queryParams.density2"
-          placeholder="请输入密度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="初馏点" prop="ibp">
-        <el-input
-          v-model="queryParams.ibp"
-          placeholder="请输入初馏点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="5%" prop="five">
-        <el-input
-          v-model="queryParams.five"
-          placeholder="请输入5%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="10%" prop="ten">
-        <el-input
-          v-model="queryParams.ten"
-          placeholder="请输入10%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="30%" prop="thrity">
-        <el-input
-          v-model="queryParams.thrity"
-          placeholder="请输入30%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="50%" prop="fifty">
-        <el-input
-          v-model="queryParams.fifty"
-          placeholder="请输入50%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="70%" prop="seventy">
-        <el-input
-          v-model="queryParams.seventy"
-          placeholder="请输入70%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="90%" prop="ninety">
-        <el-input
-          v-model="queryParams.ninety"
-          placeholder="请输入90%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="95%" prop="ninetyFive">
-        <el-input
-          v-model="queryParams.ninetyFive"
-          placeholder="请输入95%"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="终馏点" prop="fbp">
-        <el-input
-          v-model="queryParams.fbp"
-          placeholder="请输入终馏点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总硫" prop="totalSulfur">
-        <el-input
-          v-model="queryParams.totalSulfur"
-          placeholder="请输入总硫"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s0501:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s0501:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s0501:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s0501:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s0501:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s0501List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="正构烷烃" align="center" prop="p" :show-overflow-tooltip="true"/>
-      <el-table-column label="异构烷烃" align="center" prop="i" :show-overflow-tooltip="true"/>
-      <el-table-column label="烯烃" align="center" prop="o" :show-overflow-tooltip="true"/>
-      <el-table-column label="环烷烃" align="center" prop="n" :show-overflow-tooltip="true"/>
-      <el-table-column label="芳烃" align="center" prop="a" :show-overflow-tooltip="true"/>
-      <el-table-column label="正构烷烃+异构烷烃" align="center" prop="pI" :show-overflow-tooltip="true"/>
-      <el-table-column label="密度" align="center" prop="density2" :show-overflow-tooltip="true"/>
-      <el-table-column label="初馏点" align="center" prop="ibp" :show-overflow-tooltip="true"/>
-      <el-table-column label="5%" align="center" prop="five" :show-overflow-tooltip="true"/>
-      <el-table-column label="10%" align="center" prop="ten" :show-overflow-tooltip="true"/>
-      <el-table-column label="30%" align="center" prop="thrity" :show-overflow-tooltip="true"/>
-      <el-table-column label="50%" align="center" prop="fifty" :show-overflow-tooltip="true"/>
-      <el-table-column label="70%" align="center" prop="seventy" :show-overflow-tooltip="true"/>
-      <el-table-column label="90%" align="center" prop="ninety" :show-overflow-tooltip="true"/>
-      <el-table-column label="95%" align="center" prop="ninetyFive" :show-overflow-tooltip="true"/>
-      <el-table-column label="终馏点" align="center" prop="fbp" :show-overflow-tooltip="true"/>
-      <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s0501:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s0501: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"
-    />
-
-    <!-- 添加或修改质量月报S0501对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="正构烷烃" prop="p">
-          <el-input v-model="form.p" placeholder="请输入正构烷烃" />
-        </el-form-item>
-        <el-form-item label="异构烷烃" prop="i">
-          <el-input v-model="form.i" placeholder="请输入异构烷烃" />
-        </el-form-item>
-        <el-form-item label="烯烃" prop="o">
-          <el-input v-model="form.o" placeholder="请输入烯烃" />
-        </el-form-item>
-        <el-form-item label="环烷烃" prop="n">
-          <el-input v-model="form.n" placeholder="请输入环烷烃" />
-        </el-form-item>
-        <el-form-item label="芳烃" prop="a">
-          <el-input v-model="form.a" placeholder="请输入芳烃" />
-        </el-form-item>
-        <el-form-item label="正构烷烃+异构烷烃" prop="pI">
-          <el-input v-model="form.pI" placeholder="请输入正构烷烃+异构烷烃" />
-        </el-form-item>
-        <el-form-item label="密度" prop="density2">
-          <el-input v-model="form.density2" placeholder="请输入密度" />
-        </el-form-item>
-        <el-form-item label="初馏点" prop="ibp">
-          <el-input v-model="form.ibp" placeholder="请输入初馏点" />
-        </el-form-item>
-        <el-form-item label="5%" prop="five">
-          <el-input v-model="form.five" placeholder="请输入5%" />
-        </el-form-item>
-        <el-form-item label="10%" prop="ten">
-          <el-input v-model="form.ten" placeholder="请输入10%" />
-        </el-form-item>
-        <el-form-item label="30%" prop="thrity">
-          <el-input v-model="form.thrity" placeholder="请输入30%" />
-        </el-form-item>
-        <el-form-item label="50%" prop="fifty">
-          <el-input v-model="form.fifty" placeholder="请输入50%" />
-        </el-form-item>
-        <el-form-item label="70%" prop="seventy">
-          <el-input v-model="form.seventy" placeholder="请输入70%" />
-        </el-form-item>
-        <el-form-item label="90%" prop="ninety">
-          <el-input v-model="form.ninety" placeholder="请输入90%" />
-        </el-form-item>
-        <el-form-item label="95%" prop="ninetyFive">
-          <el-input v-model="form.ninetyFive" placeholder="请输入95%" />
-        </el-form-item>
-        <el-form-item label="终馏点" prop="fbp">
-          <el-input v-model="form.fbp" placeholder="请输入终馏点" />
-        </el-form-item>
-        <el-form-item label="总硫" prop="totalSulfur">
-          <el-input v-model="form.totalSulfur" placeholder="请输入总硫" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS0501, getS0501, delS0501, addS0501, updateS0501, exportS0501, importTemplate} from "@/api/production/s0501";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S0501",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S0501表格数据
-      s0501List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s0501/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        p: null,
-        i: null,
-        o: null,
-        n: null,
-        a: null,
-        pI: null,
-        density2: null,
-        ibp: null,
-        five: null,
-        ten: null,
-        thrity: null,
-        fifty: null,
-        seventy: null,
-        ninety: null,
-        ninetyFive: null,
-        fbp: null,
-        totalSulfur: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S0501列表 */
-    getList() {
-      this.loading = true;
-      listS0501(this.queryParams).then(response => {
-        this.s0501List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        p: null,
-        i: null,
-        o: null,
-        n: null,
-        a: null,
-        pI: null,
-        density2: null,
-        ibp: null,
-        five: null,
-        ten: null,
-        thrity: null,
-        fifty: null,
-        seventy: null,
-        ninety: null,
-        ninetyFive: null,
-        fbp: null,
-        totalSulfur: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S0501";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS0501(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S0501";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS0501(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS0501(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS0501(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S0501数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS0501(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 638
ui/src/views/production/s1301/index.vue

@@ -1,638 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="非芳烃" prop="na">
-        <el-input
-          v-model="queryParams.na"
-          placeholder="请输入非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="苯" prop="benzene">
-        <el-input
-          v-model="queryParams.benzene"
-          placeholder="请输入苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲苯" prop="toluene">
-        <el-input
-          v-model="queryParams.toluene"
-          placeholder="请输入甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙苯" prop="ethylbenzene">
-        <el-input
-          v-model="queryParams.ethylbenzene"
-          placeholder="请输入乙苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="对-二甲苯" prop="pXylene">
-        <el-input
-          v-model="queryParams.pXylene"
-          placeholder="请输入对-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="间-二甲苯" prop="mXylene">
-        <el-input
-          v-model="queryParams.mXylene"
-          placeholder="请输入间-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="邻-二甲苯" prop="oXylene">
-        <el-input
-          v-model="queryParams.oXylene"
-          placeholder="请输入邻-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="苯乙烯" prop="styrene">
-        <el-input
-          v-model="queryParams.styrene"
-          placeholder="请输入苯乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="苯乙炔" prop="phenylacetylene">
-        <el-input
-          v-model="queryParams.phenylacetylene"
-          placeholder="请输入苯乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总芳烃" prop="totalAromatics">
-        <el-input
-          v-model="queryParams.totalAromatics"
-          placeholder="请输入总芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="溴价" prop="brNumber">
-        <el-input
-          v-model="queryParams.brNumber"
-          placeholder="请输入溴价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="双烯值" prop="dieneValue">
-        <el-input
-          v-model="queryParams.dieneValue"
-          placeholder="请输入双烯值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总氮" prop="totalNitrogen">
-        <el-input
-          v-model="queryParams.totalNitrogen"
-          placeholder="请输入总氮"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s1301:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s1301:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s1301:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s1301:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s1301:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s1301List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="非芳烃" align="center" prop="na" :show-overflow-tooltip="true"/>
-      <el-table-column label="苯" align="center" prop="benzene" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲苯" align="center" prop="toluene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙苯" align="center" prop="ethylbenzene" :show-overflow-tooltip="true"/>
-      <el-table-column label="对-二甲苯" align="center" prop="pXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="间-二甲苯" align="center" prop="mXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="邻-二甲苯" align="center" prop="oXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="苯乙烯" align="center" prop="styrene" :show-overflow-tooltip="true"/>
-      <el-table-column label="苯乙炔" align="center" prop="phenylacetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="总芳烃" align="center" prop="totalAromatics" :show-overflow-tooltip="true"/>
-      <el-table-column label="溴价" align="center" prop="brNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="双烯值" align="center" prop="dieneValue" :show-overflow-tooltip="true"/>
-      <el-table-column label="总氮" align="center" prop="totalNitrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s1301:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s1301: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"
-    />
-
-    <!-- 添加或修改质量月报S1301对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="非芳烃" prop="na">
-          <el-input v-model="form.na" placeholder="请输入非芳烃" />
-        </el-form-item>
-        <el-form-item label="苯" prop="benzene">
-          <el-input v-model="form.benzene" placeholder="请输入苯" />
-        </el-form-item>
-        <el-form-item label="甲苯" prop="toluene">
-          <el-input v-model="form.toluene" placeholder="请输入甲苯" />
-        </el-form-item>
-        <el-form-item label="乙苯" prop="ethylbenzene">
-          <el-input v-model="form.ethylbenzene" placeholder="请输入乙苯" />
-        </el-form-item>
-        <el-form-item label="对-二甲苯" prop="pXylene">
-          <el-input v-model="form.pXylene" placeholder="请输入对-二甲苯" />
-        </el-form-item>
-        <el-form-item label="间-二甲苯" prop="mXylene">
-          <el-input v-model="form.mXylene" placeholder="请输入间-二甲苯" />
-        </el-form-item>
-        <el-form-item label="邻-二甲苯" prop="oXylene">
-          <el-input v-model="form.oXylene" placeholder="请输入邻-二甲苯" />
-        </el-form-item>
-        <el-form-item label="苯乙烯" prop="styrene">
-          <el-input v-model="form.styrene" placeholder="请输入苯乙烯" />
-        </el-form-item>
-        <el-form-item label="苯乙炔" prop="phenylacetylene">
-          <el-input v-model="form.phenylacetylene" placeholder="请输入苯乙炔" />
-        </el-form-item>
-        <el-form-item label="总芳烃" prop="totalAromatics">
-          <el-input v-model="form.totalAromatics" placeholder="请输入总芳烃" />
-        </el-form-item>
-        <el-form-item label="溴价" prop="brNumber">
-          <el-input v-model="form.brNumber" placeholder="请输入溴价" />
-        </el-form-item>
-        <el-form-item label="双烯值" prop="dieneValue">
-          <el-input v-model="form.dieneValue" placeholder="请输入双烯值" />
-        </el-form-item>
-        <el-form-item label="总氮" prop="totalNitrogen">
-          <el-input v-model="form.totalNitrogen" placeholder="请输入总氮" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS1301, getS1301, delS1301, addS1301, updateS1301, exportS1301, importTemplate} from "@/api/production/s1301";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S1301",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S1301表格数据
-      s1301List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s1301/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        na: null,
-        benzene: null,
-        toluene: null,
-        ethylbenzene: null,
-        pXylene: null,
-        mXylene: null,
-        oXylene: null,
-        styrene: null,
-        phenylacetylene: null,
-        totalAromatics: null,
-        brNumber: null,
-        dieneValue: null,
-        totalNitrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S1301列表 */
-    getList() {
-      this.loading = true;
-      listS1301(this.queryParams).then(response => {
-        this.s1301List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        na: null,
-        benzene: null,
-        toluene: null,
-        ethylbenzene: null,
-        pXylene: null,
-        mXylene: null,
-        oXylene: null,
-        styrene: null,
-        phenylacetylene: null,
-        totalAromatics: null,
-        brNumber: null,
-        dieneValue: null,
-        totalNitrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S1301";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS1301(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S1301";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS1301(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS1301(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS1301(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S1301数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS1301(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 473
ui/src/views/production/s2002/index.vue

@@ -1,473 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="化学需氧量" prop="cod">
-        <el-input
-          v-model="queryParams.cod"
-          placeholder="请输入化学需氧量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="pH值" prop="ph">
-        <el-input
-          v-model="queryParams.ph"
-          placeholder="请输入pH值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s2002:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s2002:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s2002:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s2002:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s2002:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s2002List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="化学需氧量" align="center" prop="cod" :show-overflow-tooltip="true"/>
-      <el-table-column label="pH值" align="center" prop="ph" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s2002:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s2002: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"
-    />
-
-    <!-- 添加或修改质量月报S2002对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="化学需氧量" prop="cod">
-          <el-input v-model="form.cod" placeholder="请输入化学需氧量" />
-        </el-form-item>
-        <el-form-item label="pH值" prop="ph">
-          <el-input v-model="form.ph" placeholder="请输入pH值" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS2002, getS2002, delS2002, addS2002, updateS2002, exportS2002, importTemplate} from "@/api/production/s2002";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S2002",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S2002表格数据
-      s2002List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s2002/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        cod: null,
-        ph: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S2002列表 */
-    getList() {
-      this.loading = true;
-      listS2002(this.queryParams).then(response => {
-        this.s2002List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        cod: null,
-        ph: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S2002";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS2002(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S2002";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS2002(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS2002(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS2002(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S2002数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS2002(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 473
ui/src/views/production/s2005/index.vue

@@ -1,473 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="pH值" prop="ph">
-        <el-input
-          v-model="queryParams.ph"
-          placeholder="请输入pH值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油层比例" prop="oilRatio">
-        <el-input
-          v-model="queryParams.oilRatio"
-          placeholder="请输入油层比例"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s2005:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s2005:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s2005:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s2005:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s2005:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s2005List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="pH值" align="center" prop="ph" :show-overflow-tooltip="true"/>
-      <el-table-column label="油层比例" align="center" prop="oilRatio" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s2005:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s2005: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"
-    />
-
-    <!-- 添加或修改质量月报S2005对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="pH值" prop="ph">
-          <el-input v-model="form.ph" placeholder="请输入pH值" />
-        </el-form-item>
-        <el-form-item label="油层比例" prop="oilRatio">
-          <el-input v-model="form.oilRatio" placeholder="请输入油层比例" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS2005, getS2005, delS2005, addS2005, updateS2005, exportS2005, importTemplate} from "@/api/production/s2005";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S2005",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S2005表格数据
-      s2005List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s2005/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        ph: null,
-        oilRatio: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S2005列表 */
-    getList() {
-      this.loading = true;
-      listS2005(this.queryParams).then(response => {
-        this.s2005List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        ph: null,
-        oilRatio: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S2005";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS2005(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S2005";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS2005(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS2005(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS2005(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S2005数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS2005(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 458
ui/src/views/production/s2007/index.vue

@@ -1,458 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="运动粘度,50℃" prop="viscosity">
-        <el-input
-          v-model="queryParams.viscosity"
-          placeholder="请输入运动粘度,50℃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s2007:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s2007:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s2007:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s2007:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s2007:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s2007List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="运动粘度,50℃" align="center" prop="viscosity" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s2007:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s2007: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"
-    />
-
-    <!-- 添加或修改质量月报S2007对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="运动粘度,50℃" prop="viscosity">
-          <el-input v-model="form.viscosity" placeholder="请输入运动粘度,50℃" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS2007, getS2007, delS2007, addS2007, updateS2007, exportS2007, importTemplate} from "@/api/production/s2007";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S2007",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S2007表格数据
-      s2007List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s2007/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        viscosity: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S2007列表 */
-    getList() {
-      this.loading = true;
-      listS2007(this.queryParams).then(response => {
-        this.s2007List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        viscosity: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S2007";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS2007(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S2007";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS2007(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS2007(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS2007(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S2007数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS2007(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 488
ui/src/views/production/s2011/index.vue

@@ -1,488 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="密度" prop="density1">
-        <el-input
-          v-model="queryParams.density1"
-          placeholder="请输入密度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="初馏点" prop="ibp">
-        <el-input
-          v-model="queryParams.ibp"
-          placeholder="请输入初馏点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="终馏点" prop="fbp">
-        <el-input
-          v-model="queryParams.fbp"
-          placeholder="请输入终馏点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s2011:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s2011:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s2011:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s2011:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s2011:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s2011List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="密度" align="center" prop="density1" :show-overflow-tooltip="true"/>
-      <el-table-column label="初馏点" align="center" prop="ibp" :show-overflow-tooltip="true"/>
-      <el-table-column label="终馏点" align="center" prop="fbp" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s2011:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s2011: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"
-    />
-
-    <!-- 添加或修改质量月报S2011对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="密度" prop="density1">
-          <el-input v-model="form.density1" placeholder="请输入密度" />
-        </el-form-item>
-        <el-form-item label="初馏点" prop="ibp">
-          <el-input v-model="form.ibp" placeholder="请输入初馏点" />
-        </el-form-item>
-        <el-form-item label="终馏点" prop="fbp">
-          <el-input v-model="form.fbp" placeholder="请输入终馏点" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS2011, getS2011, delS2011, addS2011, updateS2011, exportS2011, importTemplate} from "@/api/production/s2011";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S2011",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S2011表格数据
-      s2011List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s2011/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        density1: null,
-        ibp: null,
-        fbp: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S2011列表 */
-    getList() {
-      this.loading = true;
-      listS2011(this.queryParams).then(response => {
-        this.s2011List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        density1: null,
-        ibp: null,
-        fbp: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S2011";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS2011(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S2011";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS2011(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS2011(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS2011(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S2011数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS2011(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 473
ui/src/views/production/s2400/index.vue

@@ -1,473 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="化学需氧量" prop="cod">
-        <el-input
-          v-model="queryParams.cod"
-          placeholder="请输入化学需氧量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="pH值" prop="ph">
-        <el-input
-          v-model="queryParams.ph"
-          placeholder="请输入pH值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s2400:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s2400:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s2400:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s2400:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s2400:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s2400List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="化学需氧量" align="center" prop="cod" :show-overflow-tooltip="true"/>
-      <el-table-column label="pH值" align="center" prop="ph" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s2400:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s2400: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"
-    />
-
-    <!-- 添加或修改质量月报S2400对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="化学需氧量" prop="cod">
-          <el-input v-model="form.cod" placeholder="请输入化学需氧量" />
-        </el-form-item>
-        <el-form-item label="pH值" prop="ph">
-          <el-input v-model="form.ph" placeholder="请输入pH值" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS2400, getS2400, delS2400, addS2400, updateS2400, exportS2400, importTemplate} from "@/api/production/s2400";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S2400",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S2400表格数据
-      s2400List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s2400/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        cod: null,
-        ph: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S2400列表 */
-    getList() {
-      this.loading = true;
-      listS2400(this.queryParams).then(response => {
-        this.s2400List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        cod: null,
-        ph: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S2400";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS2400(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S2400";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS2400(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS2400(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS2400(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S2400数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS2400(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 488
ui/src/views/production/s3004/index.vue

@@ -1,488 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢氧化钠" prop="naOh">
-        <el-input
-          v-model="queryParams.naOh"
-          placeholder="请输入氢氧化钠"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="碳酸钠" prop="na2Co3">
-        <el-input
-          v-model="queryParams.na2Co3"
-          placeholder="请输入碳酸钠"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="硫化钠" prop="na2S">
-        <el-input
-          v-model="queryParams.na2S"
-          placeholder="请输入硫化钠"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s3004:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s3004:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s3004:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s3004:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s3004:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s3004List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢氧化钠" align="center" prop="naOh" :show-overflow-tooltip="true"/>
-      <el-table-column label="碳酸钠" align="center" prop="na2Co3" :show-overflow-tooltip="true"/>
-      <el-table-column label="硫化钠" align="center" prop="na2S" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s3004:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s3004: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"
-    />
-
-    <!-- 添加或修改质量月报S3004对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="氢氧化钠" prop="naOh">
-          <el-input v-model="form.naOh" placeholder="请输入氢氧化钠" />
-        </el-form-item>
-        <el-form-item label="碳酸钠" prop="na2Co3">
-          <el-input v-model="form.na2Co3" placeholder="请输入碳酸钠" />
-        </el-form-item>
-        <el-form-item label="硫化钠" prop="na2S">
-          <el-input v-model="form.na2S" placeholder="请输入硫化钠" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS3004, getS3004, delS3004, addS3004, updateS3004, exportS3004, importTemplate} from "@/api/production/s3004";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S3004",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S3004表格数据
-      s3004List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s3004/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        naOh: null,
-        na2Co3: null,
-        na2S: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S3004列表 */
-    getList() {
-      this.loading = true;
-      listS3004(this.queryParams).then(response => {
-        this.s3004List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        naOh: null,
-        na2Co3: null,
-        na2S: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S3004";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS3004(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S3004";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS3004(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS3004(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS3004(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S3004数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS3004(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 593
ui/src/views/production/s3009/index.vue

@@ -1,593 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-        <el-input
-          v-model="queryParams.carbonMonoxide"
-          placeholder="请输入一氧化碳含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环丙烷" prop="cycPropane">
-        <el-input
-          v-model="queryParams.cycPropane"
-          placeholder="请输入环丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢气" prop="hydrogen">
-        <el-input
-          v-model="queryParams.hydrogen"
-          placeholder="请输入氢气"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s3009:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s3009:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s3009:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s3009:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s3009:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s3009List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="一氧化碳含量" align="center" prop="carbonMonoxide" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="环丙烷" align="center" prop="cycPropane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s3009:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s3009: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"
-    />
-
-    <!-- 添加或修改质量月报S3009对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-          <el-input v-model="form.carbonMonoxide" placeholder="请输入一氧化碳含量" />
-        </el-form-item>
-        <el-form-item label="甲烷" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯" />
-        </el-form-item>
-        <el-form-item label="丙烷" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷" />
-        </el-form-item>
-        <el-form-item label="环丙烷" prop="cycPropane">
-          <el-input v-model="form.cycPropane" placeholder="请输入环丙烷" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="丙二烯" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯" />
-        </el-form-item>
-        <el-form-item label="乙炔" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔" />
-        </el-form-item>
-        <el-form-item label="氢气" prop="hydrogen">
-          <el-input v-model="form.hydrogen" placeholder="请输入氢气" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS3009, getS3009, delS3009, addS3009, updateS3009, exportS3009, importTemplate} from "@/api/production/s3009";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S3009",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S3009表格数据
-      s3009List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s3009/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        hydrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S3009列表 */
-    getList() {
-      this.loading = true;
-      listS3009(this.queryParams).then(response => {
-        this.s3009List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        hydrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S3009";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS3009(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S3009";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS3009(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS3009(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS3009(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S3009数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS3009(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 593
ui/src/views/production/s3010/index.vue

@@ -1,593 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔含量	" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔含量	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-        <el-input
-          v-model="queryParams.carbonMonoxide"
-          placeholder="请输入一氧化碳含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷	" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷	" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环丙烷	" prop="cycPropane">
-        <el-input
-          v-model="queryParams.cycPropane"
-          placeholder="请输入环丙烷	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯	" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯	" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢气" prop="hydrogen">
-        <el-input
-          v-model="queryParams.hydrogen"
-          placeholder="请输入氢气"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s3010:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s3010:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s3010:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s3010:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s3010:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s3010List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔含量	" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="一氧化碳含量" align="center" prop="carbonMonoxide" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷	" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷	" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="环丙烷	" align="center" prop="cycPropane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯	" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯	" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s3010:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s3010: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"
-    />
-
-    <!-- 添加或修改质量月报S3010对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="乙炔含量	" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔含量	" />
-        </el-form-item>
-        <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-          <el-input v-model="form.carbonMonoxide" placeholder="请输入一氧化碳含量" />
-        </el-form-item>
-        <el-form-item label="甲烷	" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷	" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯" />
-        </el-form-item>
-        <el-form-item label="丙烷	" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷	" />
-        </el-form-item>
-        <el-form-item label="环丙烷	" prop="cycPropane">
-          <el-input v-model="form.cycPropane" placeholder="请输入环丙烷	" />
-        </el-form-item>
-        <el-form-item label="丙烯	" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯	" />
-        </el-form-item>
-        <el-form-item label="丙二烯	" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯	" />
-        </el-form-item>
-        <el-form-item label="氢气" prop="hydrogen">
-          <el-input v-model="form.hydrogen" placeholder="请输入氢气" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS3010, getS3010, delS3010, addS3010, updateS3010, exportS3010, importTemplate} from "@/api/production/s3010";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S3010",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S3010表格数据
-      s3010List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s3010/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        acetylene: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        hydrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S3010列表 */
-    getList() {
-      this.loading = true;
-      listS3010(this.queryParams).then(response => {
-        this.s3010List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        acetylene: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        hydrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S3010";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS3010(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S3010";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS3010(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS3010(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS3010(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S3010数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS3010(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 593
ui/src/views/production/s3011/index.vue

@@ -1,593 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-        <el-input
-          v-model="queryParams.carbonMonoxide"
-          placeholder="请输入一氧化碳含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷	" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷	" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环丙烷	" prop="cycPropane">
-        <el-input
-          v-model="queryParams.cycPropane"
-          placeholder="请输入环丙烷	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯	" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯	" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯	"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢气" prop="hydrogen">
-        <el-input
-          v-model="queryParams.hydrogen"
-          placeholder="请输入氢气"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s3011:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s3011:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s3011:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s3011:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s3011:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s3011List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="一氧化碳含量" align="center" prop="carbonMonoxide" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷	" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷	" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="环丙烷	" align="center" prop="cycPropane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯	" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯	" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s3011:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s3011: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"
-    />
-
-    <!-- 添加或修改质量月报S3011对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-          <el-input v-model="form.carbonMonoxide" placeholder="请输入一氧化碳含量" />
-        </el-form-item>
-        <el-form-item label="甲烷	" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷	" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯" />
-        </el-form-item>
-        <el-form-item label="丙烷	" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷	" />
-        </el-form-item>
-        <el-form-item label="环丙烷	" prop="cycPropane">
-          <el-input v-model="form.cycPropane" placeholder="请输入环丙烷	" />
-        </el-form-item>
-        <el-form-item label="丙烯	" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯	" />
-        </el-form-item>
-        <el-form-item label="丙二烯	" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯	" />
-        </el-form-item>
-        <el-form-item label="乙炔" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔" />
-        </el-form-item>
-        <el-form-item label="氢气" prop="hydrogen">
-          <el-input v-model="form.hydrogen" placeholder="请输入氢气" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS3011, getS3011, delS3011, addS3011, updateS3011, exportS3011, importTemplate} from "@/api/production/s3011";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S3011",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S3011表格数据
-      s3011List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s3011/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        hydrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S3011列表 */
-    getList() {
-      this.loading = true;
-      listS3011(this.queryParams).then(response => {
-        this.s3011List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        hydrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S3011";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS3011(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S3011";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS3011(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS3011(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS3011(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S3011数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS3011(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 593
ui/src/views/production/s3012/index.vue

@@ -1,593 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔含量" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-        <el-input
-          v-model="queryParams.carbonMonoxide"
-          placeholder="请输入一氧化碳含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环丙烷" prop="cycPropane">
-        <el-input
-          v-model="queryParams.cycPropane"
-          placeholder="请输入环丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢气" prop="hydrogen">
-        <el-input
-          v-model="queryParams.hydrogen"
-          placeholder="请输入氢气"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s3012:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s3012:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s3012:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s3012:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s3012:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s3012List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔含量" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="一氧化碳含量" align="center" prop="carbonMonoxide" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="环丙烷" align="center" prop="cycPropane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s3012:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s3012: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"
-    />
-
-    <!-- 添加或修改质量月报S3012对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="乙炔含量" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔含量" />
-        </el-form-item>
-        <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-          <el-input v-model="form.carbonMonoxide" placeholder="请输入一氧化碳含量" />
-        </el-form-item>
-        <el-form-item label="甲烷" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯" />
-        </el-form-item>
-        <el-form-item label="丙烷" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷" />
-        </el-form-item>
-        <el-form-item label="环丙烷" prop="cycPropane">
-          <el-input v-model="form.cycPropane" placeholder="请输入环丙烷" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="丙二烯" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯" />
-        </el-form-item>
-        <el-form-item label="氢气" prop="hydrogen">
-          <el-input v-model="form.hydrogen" placeholder="请输入氢气" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS3012, getS3012, delS3012, addS3012, updateS3012, exportS3012, importTemplate} from "@/api/production/s3012";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S3012",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S3012表格数据
-      s3012List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s3012/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        acetylene: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        hydrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S3012列表 */
-    getList() {
-      this.loading = true;
-      listS3012(this.queryParams).then(response => {
-        this.s3012List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        acetylene: null,
-        carbonMonoxide: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        hydrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S3012";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS3012(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S3012";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS3012(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS3012(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS3012(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S3012数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS3012(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 488
ui/src/views/production/s3022/index.vue

@@ -1,488 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢氧化钠" prop="naoh">
-        <el-input
-          v-model="queryParams.naoh"
-          placeholder="请输入氢氧化钠"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="碳酸钠" prop="na2co3">
-        <el-input
-          v-model="queryParams.na2co3"
-          placeholder="请输入碳酸钠"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="硫化钠" prop="na2s">
-        <el-input
-          v-model="queryParams.na2s"
-          placeholder="请输入硫化钠"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s3022:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s3022:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s3022:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s3022:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s3022:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s3022List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢氧化钠" align="center" prop="naoh" :show-overflow-tooltip="true"/>
-      <el-table-column label="碳酸钠" align="center" prop="na2co3" :show-overflow-tooltip="true"/>
-      <el-table-column label="硫化钠" align="center" prop="na2s" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s3022:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s3022: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"
-    />
-
-    <!-- 添加或修改质量月报S3022对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="氢氧化钠" prop="naoh">
-          <el-input v-model="form.naoh" placeholder="请输入氢氧化钠" />
-        </el-form-item>
-        <el-form-item label="碳酸钠" prop="na2co3">
-          <el-input v-model="form.na2co3" placeholder="请输入碳酸钠" />
-        </el-form-item>
-        <el-form-item label="硫化钠" prop="na2s">
-          <el-input v-model="form.na2s" placeholder="请输入硫化钠" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS3022, getS3022, delS3022, addS3022, updateS3022, exportS3022, importTemplate} from "@/api/production/s3022";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S3022",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S3022表格数据
-      s3022List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s3022/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        naoh: null,
-        na2co3: null,
-        na2s: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S3022列表 */
-    getList() {
-      this.loading = true;
-      listS3022(this.queryParams).then(response => {
-        this.s3022List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        naoh: null,
-        na2co3: null,
-        na2s: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S3022";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS3022(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S3022";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS3022(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS3022(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS3022(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S3022数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS3022(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 518
ui/src/views/production/s4012/index.vue

@@ -1,518 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s4012:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s4012:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s4012:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s4012:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s4012:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s4012List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s4012:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s4012: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"
-    />
-
-    <!-- 添加或修改质量月报S4012对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="甲烷" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯" />
-        </el-form-item>
-        <el-form-item label="丙烷" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS4012, getS4012, delS4012, addS4012, updateS4012, exportS4012, importTemplate} from "@/api/production/s4012";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S4012",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S4012表格数据
-      s4012List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s4012/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        propylene: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S4012列表 */
-    getList() {
-      this.loading = true;
-      listS4012(this.queryParams).then(response => {
-        this.s4012List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        propylene: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S4012";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS4012(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S4012";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS4012(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS4012(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS4012(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S4012数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS4012(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 533
ui/src/views/production/s4013/index.vue

@@ -1,533 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷和乙烷含量" prop="methaneEthane">
-        <el-input
-          v-model="queryParams.methaneEthane"
-          placeholder="请输入甲烷和乙烷含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯含量" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔含量" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-        <el-input
-          v-model="queryParams.carbonMonoxide"
-          placeholder="请输入一氧化碳含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="二氧化碳含量" prop="carbonDioxide">
-        <el-input
-          v-model="queryParams.carbonDioxide"
-          placeholder="请输入二氧化碳含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s4013:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s4013:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s4013:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s4013:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s4013:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s4013List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷和乙烷含量" align="center" prop="methaneEthane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯含量" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔含量" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="一氧化碳含量" align="center" prop="carbonMonoxide" :show-overflow-tooltip="true"/>
-      <el-table-column label="二氧化碳含量" align="center" prop="carbonDioxide" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s4013:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s4013: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"
-    />
-
-    <!-- 添加或修改质量月报S4013对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="甲烷和乙烷含量" prop="methaneEthane">
-          <el-input v-model="form.methaneEthane" placeholder="请输入甲烷和乙烷含量" />
-        </el-form-item>
-        <el-form-item label="乙烯含量" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯含量" />
-        </el-form-item>
-        <el-form-item label="乙炔含量" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔含量" />
-        </el-form-item>
-        <el-form-item label="一氧化碳含量" prop="carbonMonoxide">
-          <el-input v-model="form.carbonMonoxide" placeholder="请输入一氧化碳含量" />
-        </el-form-item>
-        <el-form-item label="二氧化碳含量" prop="carbonDioxide">
-          <el-input v-model="form.carbonDioxide" placeholder="请输入二氧化碳含量" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS4013, getS4013, delS4013, addS4013, updateS4013, exportS4013, importTemplate} from "@/api/production/s4013";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S4013",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S4013表格数据
-      s4013List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s4013/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        ethane: null,
-        methaneEthane: null,
-        ethylene: null,
-        acetylene: null,
-        carbonMonoxide: null,
-        carbonDioxide: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S4013列表 */
-    getList() {
-      this.loading = true;
-      listS4013(this.queryParams).then(response => {
-        this.s4013List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        ethane: null,
-        methaneEthane: null,
-        ethylene: null,
-        acetylene: null,
-        carbonMonoxide: null,
-        carbonDioxide: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S4013";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS4013(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S4013";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS4013(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS4013(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS4013(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S4013数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS4013(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 668
ui/src/views/production/s4501/index.vue

@@ -1,668 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="苯" prop="benzene">
-        <el-input
-          v-model="queryParams.benzene"
-          placeholder="请输入苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲苯" prop="toluene">
-        <el-input
-          v-model="queryParams.toluene"
-          placeholder="请输入甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙苯" prop="ethylbenzene">
-        <el-input
-          v-model="queryParams.ethylbenzene"
-          placeholder="请输入乙苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="间-二甲苯" prop="mXylene">
-        <el-input
-          v-model="queryParams.mXylene"
-          placeholder="请输入间-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="邻-二甲苯" prop="oXylene">
-        <el-input
-          v-model="queryParams.oXylene"
-          placeholder="请输入邻-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="对-二甲苯" prop="pXylene">
-        <el-input
-          v-model="queryParams.pXylene"
-          placeholder="请输入对-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C5 非芳烃" prop="c5Na">
-        <el-input
-          v-model="queryParams.c5Na"
-          placeholder="请输入C5 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C6 非芳烃" prop="c6Na">
-        <el-input
-          v-model="queryParams.c6Na"
-          placeholder="请输入C6 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C7 非芳烃" prop="c7Na">
-        <el-input
-          v-model="queryParams.c7Na"
-          placeholder="请输入C7 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C8 非芳烃" prop="c8Na">
-        <el-input
-          v-model="queryParams.c8Na"
-          placeholder="请输入C8 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C9以上" prop="c9">
-        <el-input
-          v-model="queryParams.c9"
-          placeholder="请输入C9以上"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C8 芳烃" prop="c8A">
-        <el-input
-          v-model="queryParams.c8A"
-          placeholder="请输入C8 芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C4 -C5 非芳烃" prop="c4C5Na">
-        <el-input
-          v-model="queryParams.c4C5Na"
-          placeholder="请输入C4 -C5 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C6 -C8 非芳烃" prop="c6C8Na">
-        <el-input
-          v-model="queryParams.c6C8Na"
-          placeholder="请输入C6 -C8 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C4-C8非芳烃" prop="c4C8Na">
-        <el-input
-          v-model="queryParams.c4C8Na"
-          placeholder="请输入C4-C8非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s4501:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s4501:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s4501:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s4501:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s4501:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s4501List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="苯" align="center" prop="benzene" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲苯" align="center" prop="toluene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙苯" align="center" prop="ethylbenzene" :show-overflow-tooltip="true"/>
-      <el-table-column label="间-二甲苯" align="center" prop="mXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="邻-二甲苯" align="center" prop="oXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="对-二甲苯" align="center" prop="pXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="C5 非芳烃" align="center" prop="c5Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C6 非芳烃" align="center" prop="c6Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C7 非芳烃" align="center" prop="c7Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C8 非芳烃" align="center" prop="c8Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C9以上" align="center" prop="c9" :show-overflow-tooltip="true"/>
-      <el-table-column label="C8 芳烃" align="center" prop="c8A" :show-overflow-tooltip="true"/>
-      <el-table-column label="C4 -C5 非芳烃" align="center" prop="c4C5Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C6 -C8 非芳烃" align="center" prop="c6C8Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C4-C8非芳烃" align="center" prop="c4C8Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s4501:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s4501: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"
-    />
-
-    <!-- 添加或修改质量月报S4501对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="苯" prop="benzene">
-          <el-input v-model="form.benzene" placeholder="请输入苯" />
-        </el-form-item>
-        <el-form-item label="甲苯" prop="toluene">
-          <el-input v-model="form.toluene" placeholder="请输入甲苯" />
-        </el-form-item>
-        <el-form-item label="乙苯" prop="ethylbenzene">
-          <el-input v-model="form.ethylbenzene" placeholder="请输入乙苯" />
-        </el-form-item>
-        <el-form-item label="间-二甲苯" prop="mXylene">
-          <el-input v-model="form.mXylene" placeholder="请输入间-二甲苯" />
-        </el-form-item>
-        <el-form-item label="邻-二甲苯" prop="oXylene">
-          <el-input v-model="form.oXylene" placeholder="请输入邻-二甲苯" />
-        </el-form-item>
-        <el-form-item label="对-二甲苯" prop="pXylene">
-          <el-input v-model="form.pXylene" placeholder="请输入对-二甲苯" />
-        </el-form-item>
-        <el-form-item label="C5 非芳烃" prop="c5Na">
-          <el-input v-model="form.c5Na" placeholder="请输入C5 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C6 非芳烃" prop="c6Na">
-          <el-input v-model="form.c6Na" placeholder="请输入C6 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C7 非芳烃" prop="c7Na">
-          <el-input v-model="form.c7Na" placeholder="请输入C7 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C8 非芳烃" prop="c8Na">
-          <el-input v-model="form.c8Na" placeholder="请输入C8 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C9以上" prop="c9">
-          <el-input v-model="form.c9" placeholder="请输入C9以上" />
-        </el-form-item>
-        <el-form-item label="C8 芳烃" prop="c8A">
-          <el-input v-model="form.c8A" placeholder="请输入C8 芳烃" />
-        </el-form-item>
-        <el-form-item label="C4 -C5 非芳烃" prop="c4C5Na">
-          <el-input v-model="form.c4C5Na" placeholder="请输入C4 -C5 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C6 -C8 非芳烃" prop="c6C8Na">
-          <el-input v-model="form.c6C8Na" placeholder="请输入C6 -C8 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C4-C8非芳烃" prop="c4C8Na">
-          <el-input v-model="form.c4C8Na" placeholder="请输入C4-C8非芳烃" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS4501, getS4501, delS4501, addS4501, updateS4501, exportS4501, importTemplate} from "@/api/production/s4501";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S4501",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S4501表格数据
-      s4501List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s4501/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        benzene: null,
-        toluene: null,
-        ethylbenzene: null,
-        mXylene: null,
-        oXylene: null,
-        pXylene: null,
-        c5Na: null,
-        c6Na: null,
-        c7Na: null,
-        c8Na: null,
-        c9: null,
-        c8A: null,
-        c4C5Na: null,
-        c6C8Na: null,
-        c4C8Na: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S4501列表 */
-    getList() {
-      this.loading = true;
-      listS4501(this.queryParams).then(response => {
-        this.s4501List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        benzene: null,
-        toluene: null,
-        ethylbenzene: null,
-        mXylene: null,
-        oXylene: null,
-        pXylene: null,
-        c5Na: null,
-        c6Na: null,
-        c7Na: null,
-        c8Na: null,
-        c9: null,
-        c8A: null,
-        c4C5Na: null,
-        c6C8Na: null,
-        c4C8Na: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S4501";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS4501(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S4501";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS4501(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS4501(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS4501(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S4501数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS4501(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 518
ui/src/views/production/s5001/index.vue

@@ -1,518 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环丙烷" prop="cycPropane">
-        <el-input
-          v-model="queryParams.cycPropane"
-          placeholder="请输入环丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲基乙炔" prop="methylacetylene">
-        <el-input
-          v-model="queryParams.methylacetylene"
-          placeholder="请输入甲基乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s5001:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s5001:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s5001:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s5001:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s5001:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s5001List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="环丙烷" align="center" prop="cycPropane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s5001:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s5001: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"
-    />
-
-    <!-- 添加或修改质量月报S5001对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="丙烷" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷" />
-        </el-form-item>
-        <el-form-item label="环丙烷" prop="cycPropane">
-          <el-input v-model="form.cycPropane" placeholder="请输入环丙烷" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="丙二烯" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯" />
-        </el-form-item>
-        <el-form-item label="甲基乙炔" prop="methylacetylene">
-          <el-input v-model="form.methylacetylene" placeholder="请输入甲基乙炔" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS5001, getS5001, delS5001, addS5001, updateS5001, exportS5001, importTemplate} from "@/api/production/s5001";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S5001",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S5001表格数据
-      s5001List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s5001/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        methylacetylene: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S5001列表 */
-    getList() {
-      this.loading = true;
-      listS5001(this.queryParams).then(response => {
-        this.s5001List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        propane: null,
-        cycPropane: null,
-        propylene: null,
-        propadiene: null,
-        methylacetylene: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S5001";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS5001(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S5001";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS5001(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS5001(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS5001(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S5001数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS5001(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 623
ui/src/views/production/s5003/index.vue

@@ -1,623 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯含量" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲基乙炔" prop="methylacetylene">
-        <el-input
-          v-model="queryParams.methylacetylene"
-          placeholder="请输入甲基乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丁烯+1,3-丁二烯" prop="buteneButadiene">
-        <el-input
-          v-model="queryParams.buteneButadiene"
-          placeholder="请输入丁烯+1,3-丁二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯和甲基乙炔含量" prop="propadieneMethylacetylene">
-        <el-input
-          v-model="queryParams.propadieneMethylacetylene"
-          placeholder="请输入丙二烯和甲基乙炔含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总量" prop="totals">
-        <el-input
-          v-model="queryParams.totals"
-          placeholder="请输入总量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="烷烃含量" prop="paraffine">
-        <el-input
-          v-model="queryParams.paraffine"
-          placeholder="请输入烷烃含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯含量" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲醇含量" prop="methanol">
-        <el-input
-          v-model="queryParams.methanol"
-          placeholder="请输入甲醇含量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s5003:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s5003:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s5003:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s5003:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s5003:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s5003List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯含量" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丁烯+1,3-丁二烯" align="center" prop="buteneButadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯和甲基乙炔含量" align="center" prop="propadieneMethylacetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="总量" align="center" prop="totals" :show-overflow-tooltip="true"/>
-      <el-table-column label="烷烃含量" align="center" prop="paraffine" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯含量" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲醇含量" align="center" prop="methanol" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s5003:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s5003: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"
-    />
-
-    <!-- 添加或修改质量月报S5003对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="甲烷" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯含量" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯含量" />
-        </el-form-item>
-        <el-form-item label="丙烷" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷" />
-        </el-form-item>
-        <el-form-item label="丙二烯" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯" />
-        </el-form-item>
-        <el-form-item label="甲基乙炔" prop="methylacetylene">
-          <el-input v-model="form.methylacetylene" placeholder="请输入甲基乙炔" />
-        </el-form-item>
-        <el-form-item label="丁烯+1,3-丁二烯" prop="buteneButadiene">
-          <el-input v-model="form.buteneButadiene" placeholder="请输入丁烯+1,3-丁二烯" />
-        </el-form-item>
-        <el-form-item label="丙二烯和甲基乙炔含量" prop="propadieneMethylacetylene">
-          <el-input v-model="form.propadieneMethylacetylene" placeholder="请输入丙二烯和甲基乙炔含量" />
-        </el-form-item>
-        <el-form-item label="总量" prop="totals">
-          <el-input v-model="form.totals" placeholder="请输入总量" />
-        </el-form-item>
-        <el-form-item label="烷烃含量" prop="paraffine">
-          <el-input v-model="form.paraffine" placeholder="请输入烷烃含量" />
-        </el-form-item>
-        <el-form-item label="丙烯含量" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯含量" />
-        </el-form-item>
-        <el-form-item label="甲醇含量" prop="methanol">
-          <el-input v-model="form.methanol" placeholder="请输入甲醇含量" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS5003, getS5003, delS5003, addS5003, updateS5003, exportS5003, importTemplate} from "@/api/production/s5003";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S5003",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S5003表格数据
-      s5003List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s5003/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        propadiene: null,
-        methylacetylene: null,
-        buteneButadiene: null,
-        propadieneMethylacetylene: null,
-        totals: null,
-        paraffine: null,
-        propylene: null,
-        methanol: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S5003列表 */
-    getList() {
-      this.loading = true;
-      listS5003(this.queryParams).then(response => {
-        this.s5003List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        propadiene: null,
-        methylacetylene: null,
-        buteneButadiene: null,
-        propadieneMethylacetylene: null,
-        totals: null,
-        paraffine: null,
-        propylene: null,
-        methanol: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S5003";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS5003(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S5003";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS5003(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS5003(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS5003(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S5003数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS5003(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 533
ui/src/views/production/s5010/index.vue

@@ -1,533 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1,2-丁二烯" prop="butadiene12">
-        <el-input
-          v-model="queryParams.butadiene12"
-          placeholder="请输入1,2-丁二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1,3-丁二烯" prop="butadiene13">
-        <el-input
-          v-model="queryParams.butadiene13"
-          placeholder="请输入1,3-丁二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲基乙炔" prop="methylacetylene">
-        <el-input
-          v-model="queryParams.methylacetylene"
-          placeholder="请输入甲基乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s5010:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s5010:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s5010:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s5010:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s5010:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s5010List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="1,2-丁二烯" align="center" prop="butadiene12" :show-overflow-tooltip="true"/>
-      <el-table-column label="1,3-丁二烯" align="center" prop="butadiene13" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s5010:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s5010: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"
-    />
-
-    <!-- 添加或修改质量月报S5010对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="丙二烯" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯" />
-        </el-form-item>
-        <el-form-item label="乙炔" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔" />
-        </el-form-item>
-        <el-form-item label="1,2-丁二烯" prop="butadiene12">
-          <el-input v-model="form.butadiene12" placeholder="请输入1,2-丁二烯" />
-        </el-form-item>
-        <el-form-item label="1,3-丁二烯" prop="butadiene13">
-          <el-input v-model="form.butadiene13" placeholder="请输入1,3-丁二烯" />
-        </el-form-item>
-        <el-form-item label="甲基乙炔" prop="methylacetylene">
-          <el-input v-model="form.methylacetylene" placeholder="请输入甲基乙炔" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS5010, getS5010, delS5010, addS5010, updateS5010, exportS5010, importTemplate} from "@/api/production/s5010";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S5010",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S5010表格数据
-      s5010List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s5010/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        butadiene12: null,
-        butadiene13: null,
-        methylacetylene: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S5010列表 */
-    getList() {
-      this.loading = true;
-      listS5010(this.queryParams).then(response => {
-        this.s5010List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        butadiene12: null,
-        butadiene13: null,
-        methylacetylene: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S5010";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS5010(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S5010";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS5010(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS5010(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS5010(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S5010数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS5010(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 533
ui/src/views/production/s5012/index.vue

@@ -1,533 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙二烯" prop="propadiene">
-        <el-input
-          v-model="queryParams.propadiene"
-          placeholder="请输入丙二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙炔" prop="acetylene">
-        <el-input
-          v-model="queryParams.acetylene"
-          placeholder="请输入乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1,2-丁二烯" prop="butadiene12">
-        <el-input
-          v-model="queryParams.butadiene12"
-          placeholder="请输入1,2-丁二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1,3-丁二烯" prop="butadiene13">
-        <el-input
-          v-model="queryParams.butadiene13"
-          placeholder="请输入1,3-丁二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲基乙炔" prop="methylacetylene">
-        <el-input
-          v-model="queryParams.methylacetylene"
-          placeholder="请输入甲基乙炔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s5012:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s5012:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s5012:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s5012:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s5012:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s5012List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙炔" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="1,2-丁二烯" align="center" prop="butadiene12" :show-overflow-tooltip="true"/>
-      <el-table-column label="1,3-丁二烯" align="center" prop="butadiene13" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s5012:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s5012: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"
-    />
-
-    <!-- 添加或修改质量月报S5012对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="丙二烯" prop="propadiene">
-          <el-input v-model="form.propadiene" placeholder="请输入丙二烯" />
-        </el-form-item>
-        <el-form-item label="乙炔" prop="acetylene">
-          <el-input v-model="form.acetylene" placeholder="请输入乙炔" />
-        </el-form-item>
-        <el-form-item label="1,2-丁二烯" prop="butadiene12">
-          <el-input v-model="form.butadiene12" placeholder="请输入1,2-丁二烯" />
-        </el-form-item>
-        <el-form-item label="1,3-丁二烯" prop="butadiene13">
-          <el-input v-model="form.butadiene13" placeholder="请输入1,3-丁二烯" />
-        </el-form-item>
-        <el-form-item label="甲基乙炔" prop="methylacetylene">
-          <el-input v-model="form.methylacetylene" placeholder="请输入甲基乙炔" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS5012, getS5012, delS5012, addS5012, updateS5012, exportS5012, importTemplate} from "@/api/production/s5012";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S5012",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S5012表格数据
-      s5012List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s5012/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        butadiene12: null,
-        butadiene13: null,
-        methylacetylene: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S5012列表 */
-    getList() {
-      this.loading = true;
-      listS5012(this.queryParams).then(response => {
-        this.s5012List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        propylene: null,
-        propadiene: null,
-        acetylene: null,
-        butadiene12: null,
-        butadiene13: null,
-        methylacetylene: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S5012";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS5012(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S5012";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS5012(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS5012(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS5012(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S5012数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS5012(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 758
ui/src/views/production/s6101/index.vue

@@ -1,758 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="苯" prop="benzene">
-        <el-input
-          v-model="queryParams.benzene"
-          placeholder="请输入苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲苯" prop="toluene">
-        <el-input
-          v-model="queryParams.toluene"
-          placeholder="请输入甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="双环戊二烯" prop="dcpd">
-        <el-input
-          v-model="queryParams.dcpd"
-          placeholder="请输入双环戊二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙苯" prop="ethylbenzene">
-        <el-input
-          v-model="queryParams.ethylbenzene"
-          placeholder="请输入乙苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="间-二甲苯" prop="mXylene">
-        <el-input
-          v-model="queryParams.mXylene"
-          placeholder="请输入间-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="邻-二甲苯" prop="oXylene">
-        <el-input
-          v-model="queryParams.oXylene"
-          placeholder="请输入邻-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="对-二甲苯" prop="pXylene">
-        <el-input
-          v-model="queryParams.pXylene"
-          placeholder="请输入对-二甲苯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="苯乙烯" prop="styrene">
-        <el-input
-          v-model="queryParams.styrene"
-          placeholder="请输入苯乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C5 非芳烃" prop="c5Na">
-        <el-input
-          v-model="queryParams.c5Na"
-          placeholder="请输入C5 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C6 非芳烃" prop="c6Na">
-        <el-input
-          v-model="queryParams.c6Na"
-          placeholder="请输入C6 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C7 非芳烃" prop="c7Na">
-        <el-input
-          v-model="queryParams.c7Na"
-          placeholder="请输入C7 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C8 非芳烃" prop="c8Na">
-        <el-input
-          v-model="queryParams.c8Na"
-          placeholder="请输入C8 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C9以上" prop="c9">
-        <el-input
-          v-model="queryParams.c9"
-          placeholder="请输入C9以上"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C8 芳烃" prop="c8A">
-        <el-input
-          v-model="queryParams.c8A"
-          placeholder="请输入C8 芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C4 -C5 非芳烃" prop="c4C5Na">
-        <el-input
-          v-model="queryParams.c4C5Na"
-          placeholder="请输入C4 -C5 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C6 -C8 非芳烃" prop="c6C8Na">
-        <el-input
-          v-model="queryParams.c6C8Na"
-          placeholder="请输入C6 -C8 非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C4-C8非芳烃" prop="c4C8Na">
-        <el-input
-          v-model="queryParams.c4C8Na"
-          placeholder="请输入C4-C8非芳烃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="密度" prop="density1">
-        <el-input
-          v-model="queryParams.density1"
-          placeholder="请输入密度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="溴价" prop="brNumber">
-        <el-input
-          v-model="queryParams.brNumber"
-          placeholder="请输入溴价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总硫" prop="totalSulfur">
-        <el-input
-          v-model="queryParams.totalSulfur"
-          placeholder="请输入总硫"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总氮" prop="totalNitrogen">
-        <el-input
-          v-model="queryParams.totalNitrogen"
-          placeholder="请输入总氮"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s6101:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s6101:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s6101:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s6101:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s6101:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s6101List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="苯" align="center" prop="benzene" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲苯" align="center" prop="toluene" :show-overflow-tooltip="true"/>
-      <el-table-column label="双环戊二烯" align="center" prop="dcpd" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙苯" align="center" prop="ethylbenzene" :show-overflow-tooltip="true"/>
-      <el-table-column label="间-二甲苯" align="center" prop="mXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="邻-二甲苯" align="center" prop="oXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="对-二甲苯" align="center" prop="pXylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="苯乙烯" align="center" prop="styrene" :show-overflow-tooltip="true"/>
-      <el-table-column label="C5 非芳烃" align="center" prop="c5Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C6 非芳烃" align="center" prop="c6Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C7 非芳烃" align="center" prop="c7Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C8 非芳烃" align="center" prop="c8Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C9以上" align="center" prop="c9" :show-overflow-tooltip="true"/>
-      <el-table-column label="C8 芳烃" align="center" prop="c8A" :show-overflow-tooltip="true"/>
-      <el-table-column label="C4 -C5 非芳烃" align="center" prop="c4C5Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C6 -C8 非芳烃" align="center" prop="c6C8Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="C4-C8非芳烃" align="center" prop="c4C8Na" :show-overflow-tooltip="true"/>
-      <el-table-column label="密度" align="center" prop="density1" :show-overflow-tooltip="true"/>
-      <el-table-column label="溴价" align="center" prop="brNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
-      <el-table-column label="总氮" align="center" prop="totalNitrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s6101:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s6101: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"
-    />
-
-    <!-- 添加或修改质量月报S6101对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="苯" prop="benzene">
-          <el-input v-model="form.benzene" placeholder="请输入苯" />
-        </el-form-item>
-        <el-form-item label="甲苯" prop="toluene">
-          <el-input v-model="form.toluene" placeholder="请输入甲苯" />
-        </el-form-item>
-        <el-form-item label="双环戊二烯" prop="dcpd">
-          <el-input v-model="form.dcpd" placeholder="请输入双环戊二烯" />
-        </el-form-item>
-        <el-form-item label="乙苯" prop="ethylbenzene">
-          <el-input v-model="form.ethylbenzene" placeholder="请输入乙苯" />
-        </el-form-item>
-        <el-form-item label="间-二甲苯" prop="mXylene">
-          <el-input v-model="form.mXylene" placeholder="请输入间-二甲苯" />
-        </el-form-item>
-        <el-form-item label="邻-二甲苯" prop="oXylene">
-          <el-input v-model="form.oXylene" placeholder="请输入邻-二甲苯" />
-        </el-form-item>
-        <el-form-item label="对-二甲苯" prop="pXylene">
-          <el-input v-model="form.pXylene" placeholder="请输入对-二甲苯" />
-        </el-form-item>
-        <el-form-item label="苯乙烯" prop="styrene">
-          <el-input v-model="form.styrene" placeholder="请输入苯乙烯" />
-        </el-form-item>
-        <el-form-item label="C5 非芳烃" prop="c5Na">
-          <el-input v-model="form.c5Na" placeholder="请输入C5 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C6 非芳烃" prop="c6Na">
-          <el-input v-model="form.c6Na" placeholder="请输入C6 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C7 非芳烃" prop="c7Na">
-          <el-input v-model="form.c7Na" placeholder="请输入C7 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C8 非芳烃" prop="c8Na">
-          <el-input v-model="form.c8Na" placeholder="请输入C8 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C9以上" prop="c9">
-          <el-input v-model="form.c9" placeholder="请输入C9以上" />
-        </el-form-item>
-        <el-form-item label="C8 芳烃" prop="c8A">
-          <el-input v-model="form.c8A" placeholder="请输入C8 芳烃" />
-        </el-form-item>
-        <el-form-item label="C4 -C5 非芳烃" prop="c4C5Na">
-          <el-input v-model="form.c4C5Na" placeholder="请输入C4 -C5 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C6 -C8 非芳烃" prop="c6C8Na">
-          <el-input v-model="form.c6C8Na" placeholder="请输入C6 -C8 非芳烃" />
-        </el-form-item>
-        <el-form-item label="C4-C8非芳烃" prop="c4C8Na">
-          <el-input v-model="form.c4C8Na" placeholder="请输入C4-C8非芳烃" />
-        </el-form-item>
-        <el-form-item label="密度" prop="density1">
-          <el-input v-model="form.density1" placeholder="请输入密度" />
-        </el-form-item>
-        <el-form-item label="溴价" prop="brNumber">
-          <el-input v-model="form.brNumber" placeholder="请输入溴价" />
-        </el-form-item>
-        <el-form-item label="总硫" prop="totalSulfur">
-          <el-input v-model="form.totalSulfur" placeholder="请输入总硫" />
-        </el-form-item>
-        <el-form-item label="总氮" prop="totalNitrogen">
-          <el-input v-model="form.totalNitrogen" placeholder="请输入总氮" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS6101, getS6101, delS6101, addS6101, updateS6101, exportS6101, importTemplate} from "@/api/production/s6101";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S6101",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S6101表格数据
-      s6101List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s6101/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        benzene: null,
-        toluene: null,
-        dcpd: null,
-        ethylbenzene: null,
-        mXylene: null,
-        oXylene: null,
-        pXylene: null,
-        styrene: null,
-        c5Na: null,
-        c6Na: null,
-        c7Na: null,
-        c8Na: null,
-        c9: null,
-        c8A: null,
-        c4C5Na: null,
-        c6C8Na: null,
-        c4C8Na: null,
-        density1: null,
-        brNumber: null,
-        totalSulfur: null,
-        totalNitrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S6101列表 */
-    getList() {
-      this.loading = true;
-      listS6101(this.queryParams).then(response => {
-        this.s6101List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        benzene: null,
-        toluene: null,
-        dcpd: null,
-        ethylbenzene: null,
-        mXylene: null,
-        oXylene: null,
-        pXylene: null,
-        styrene: null,
-        c5Na: null,
-        c6Na: null,
-        c7Na: null,
-        c8Na: null,
-        c9: null,
-        c8A: null,
-        c4C5Na: null,
-        c6C8Na: null,
-        c4C8Na: null,
-        density1: null,
-        brNumber: null,
-        totalSulfur: null,
-        totalNitrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S6101";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS6101(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S6101";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS6101(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS6101(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS6101(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S6101数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS6101(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 473
ui/src/views/production/s6107/index.vue

@@ -1,473 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="化学需氧量" prop="cod">
-        <el-input
-          v-model="queryParams.cod"
-          placeholder="请输入化学需氧量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="pH值" prop="ph">
-        <el-input
-          v-model="queryParams.ph"
-          placeholder="请输入pH值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s6107:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s6107:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s6107:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s6107:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s6107:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s6107List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="化学需氧量" align="center" prop="cod" :show-overflow-tooltip="true"/>
-      <el-table-column label="pH值" align="center" prop="ph" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s6107:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s6107: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"
-    />
-
-    <!-- 添加或修改质量月报S6107对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="化学需氧量" prop="cod">
-          <el-input v-model="form.cod" placeholder="请输入化学需氧量" />
-        </el-form-item>
-        <el-form-item label="pH值" prop="ph">
-          <el-input v-model="form.ph" placeholder="请输入pH值" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS6107, getS6107, delS6107, addS6107, updateS6107, exportS6107, importTemplate} from "@/api/production/s6107";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S6107",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S6107表格数据
-      s6107List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s6107/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        cod: null,
-        ph: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S6107列表 */
-    getList() {
-      this.loading = true;
-      listS6107(this.queryParams).then(response => {
-        this.s6107List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        cod: null,
-        ph: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S6107";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS6107(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S6107";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS6107(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS6107(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS6107(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S6107数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS6107(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 563
ui/src/views/production/s6301/index.vue

@@ -1,563 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="异戊二烯" prop="ic5">
-        <el-input
-          v-model="queryParams.ic5"
-          placeholder="请输入异戊二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="双环戊二烯" prop="dcpd">
-        <el-input
-          v-model="queryParams.dcpd"
-          placeholder="请输入双环戊二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="C5总量" prop="c5">
-        <el-input
-          v-model="queryParams.c5"
-          placeholder="请输入C5总量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="碳五共轭双烯烃+双环戊二烯>=30" prop="c5ConjugatedDienesDcpd30">
-        <el-input
-          v-model="queryParams.c5ConjugatedDienesDcpd30"
-          placeholder="请输入碳五共轭双烯烃+双环戊二烯>=30"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="间戊二烯+环戊二烯" prop="pentadieneCycc5">
-        <el-input
-          v-model="queryParams.pentadieneCycc5"
-          placeholder="请输入间戊二烯+环戊二烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="碳五共轭双烯烃+双环戊二烯>=40" prop="c5ConjugatedDienesDcpd40">
-        <el-input
-          v-model="queryParams.c5ConjugatedDienesDcpd40"
-          placeholder="请输入碳五共轭双烯烃+双环戊二烯>=40"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总硫" prop="totalSulfur">
-        <el-input
-          v-model="queryParams.totalSulfur"
-          placeholder="请输入总硫"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="硅" prop="silicon">
-        <el-input
-          v-model="queryParams.silicon"
-          placeholder="请输入硅"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:s6301:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:s6301:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:s6301:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:s6301:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:s6301:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="s6301List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="异戊二烯" align="center" prop="ic5" :show-overflow-tooltip="true"/>
-      <el-table-column label="双环戊二烯" align="center" prop="dcpd" :show-overflow-tooltip="true"/>
-      <el-table-column label="C5总量" align="center" prop="c5" :show-overflow-tooltip="true"/>
-      <el-table-column label="碳五共轭双烯烃+双环戊二烯>=30" align="center" prop="c5ConjugatedDienesDcpd30" :show-overflow-tooltip="true"/>
-      <el-table-column label="间戊二烯+环戊二烯" align="center" prop="pentadieneCycc5" :show-overflow-tooltip="true"/>
-      <el-table-column label="碳五共轭双烯烃+双环戊二烯>=40" align="center" prop="c5ConjugatedDienesDcpd40" :show-overflow-tooltip="true"/>
-      <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
-      <el-table-column label="硅" align="center" prop="silicon" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:s6301:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:s6301: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"
-    />
-
-    <!-- 添加或修改质量月报S6301对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="异戊二烯" prop="ic5">
-          <el-input v-model="form.ic5" placeholder="请输入异戊二烯" />
-        </el-form-item>
-        <el-form-item label="双环戊二烯" prop="dcpd">
-          <el-input v-model="form.dcpd" placeholder="请输入双环戊二烯" />
-        </el-form-item>
-        <el-form-item label="C5总量" prop="c5">
-          <el-input v-model="form.c5" placeholder="请输入C5总量" />
-        </el-form-item>
-        <el-form-item label="碳五共轭双烯烃+双环戊二烯>=30" prop="c5ConjugatedDienesDcpd30">
-          <el-input v-model="form.c5ConjugatedDienesDcpd30" placeholder="请输入碳五共轭双烯烃+双环戊二烯>=30" />
-        </el-form-item>
-        <el-form-item label="间戊二烯+环戊二烯" prop="pentadieneCycc5">
-          <el-input v-model="form.pentadieneCycc5" placeholder="请输入间戊二烯+环戊二烯" />
-        </el-form-item>
-        <el-form-item label="碳五共轭双烯烃+双环戊二烯>=40" prop="c5ConjugatedDienesDcpd40">
-          <el-input v-model="form.c5ConjugatedDienesDcpd40" placeholder="请输入碳五共轭双烯烃+双环戊二烯>=40" />
-        </el-form-item>
-        <el-form-item label="总硫" prop="totalSulfur">
-          <el-input v-model="form.totalSulfur" placeholder="请输入总硫" />
-        </el-form-item>
-        <el-form-item label="硅" prop="silicon">
-          <el-input v-model="form.silicon" placeholder="请输入硅" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listS6301, getS6301, delS6301, addS6301, updateS6301, exportS6301, importTemplate} from "@/api/production/s6301";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "S6301",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报S6301表格数据
-      s6301List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/s6301/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        ic5: null,
-        dcpd: null,
-        c5: null,
-        c5ConjugatedDienesDcpd30: null,
-        pentadieneCycc5: null,
-        c5ConjugatedDienesDcpd40: null,
-        totalSulfur: null,
-        silicon: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报S6301列表 */
-    getList() {
-      this.loading = true;
-      listS6301(this.queryParams).then(response => {
-        this.s6301List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        ic5: null,
-        dcpd: null,
-        c5: null,
-        c5ConjugatedDienesDcpd30: null,
-        pentadieneCycc5: null,
-        c5ConjugatedDienesDcpd40: null,
-        totalSulfur: null,
-        silicon: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报S6301";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getS6301(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报S6301";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateS6301(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addS6301(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delS6301(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报S6301数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportS6301(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>

+ 0 - 548
ui/src/views/production/z404/index.vue

@@ -1,548 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="装置名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入装置名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样点" prop="samplePoint">
-        <el-input
-          v-model="queryParams.samplePoint"
-          placeholder="请输入采样点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="采样日期" prop="sampleDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.sampleDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择采样日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
-        <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲烷" prop="methane">
-        <el-input
-          v-model="queryParams.methane"
-          placeholder="请输入甲烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烷" prop="ethane">
-        <el-input
-          v-model="queryParams.ethane"
-          placeholder="请输入乙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乙烯" prop="ethylene">
-        <el-input
-          v-model="queryParams.ethylene"
-          placeholder="请输入乙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烷" prop="propane">
-        <el-input
-          v-model="queryParams.propane"
-          placeholder="请输入丙烷"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="丙烯" prop="propylene">
-        <el-input
-          v-model="queryParams.propylene"
-          placeholder="请输入丙烯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="未知组分" prop="unknown">
-        <el-input
-          v-model="queryParams.unknown"
-          placeholder="请输入未知组分"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="氢气" prop="hydrogen">
-        <el-input
-          v-model="queryParams.hydrogen"
-          placeholder="请输入氢气"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" 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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['production:z404:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['production:z404:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:z404:remove']"
-        >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:z404:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['production:z404:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="z404List" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="装置名称" align="center" prop="locationName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样点" align="center" prop="samplePoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="sampleDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sampleDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="甲烷" align="center" prop="methane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烷" align="center" prop="ethane" :show-overflow-tooltip="true"/>
-      <el-table-column label="乙烯" align="center" prop="ethylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烷" align="center" prop="propane" :show-overflow-tooltip="true"/>
-      <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
-      <el-table-column label="未知组分" align="center" prop="unknown" :show-overflow-tooltip="true"/>
-      <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门id" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" 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="['production:z404:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['production:z404: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"
-    />
-
-    <!-- 添加或修改质量月报Z404对话框 -->
-    <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="id">
-          <el-input v-model="form.id" placeholder="请输入更新时间" />
-        </el-form-item>
-        <el-form-item label="装置名称" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入装置名称" />
-        </el-form-item>
-        <el-form-item label="采样点" prop="samplePoint">
-          <el-input v-model="form.samplePoint" placeholder="请输入采样点" />
-        </el-form-item>
-        <el-form-item label="采样日期" prop="sampleDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.sampleDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择采样日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="样品名称" prop="sampleName">
-          <el-input v-model="form.sampleName" placeholder="请输入样品名称" />
-        </el-form-item>
-        <el-form-item label="甲烷" prop="methane">
-          <el-input v-model="form.methane" placeholder="请输入甲烷" />
-        </el-form-item>
-        <el-form-item label="乙烷" prop="ethane">
-          <el-input v-model="form.ethane" placeholder="请输入乙烷" />
-        </el-form-item>
-        <el-form-item label="乙烯" prop="ethylene">
-          <el-input v-model="form.ethylene" placeholder="请输入乙烯" />
-        </el-form-item>
-        <el-form-item label="丙烷" prop="propane">
-          <el-input v-model="form.propane" placeholder="请输入丙烷" />
-        </el-form-item>
-        <el-form-item label="丙烯" prop="propylene">
-          <el-input v-model="form.propylene" placeholder="请输入丙烯" />
-        </el-form-item>
-        <el-form-item label="未知组分" prop="unknown">
-          <el-input v-model="form.unknown" placeholder="请输入未知组分" />
-        </el-form-item>
-        <el-form-item label="氢气" prop="hydrogen">
-          <el-input v-model="form.hydrogen" placeholder="请输入氢气" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listZ404, getZ404, delZ404, addZ404, updateZ404, exportZ404, importTemplate} from "@/api/production/z404";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "Z404",
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 质量月报Z404表格数据
-      z404List: [],
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      clientHeight:300,
-      // 是否显示弹出层
-      open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/z404/importData"
-        },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        propylene: null,
-        unknown: null,
-        hydrogen: null,
-        deptId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
-  created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询质量月报Z404列表 */
-    getList() {
-      this.loading = true;
-      listZ404(this.queryParams).then(response => {
-        this.z404List = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        locationName: null,
-        samplePoint: null,
-        sampleDate: null,
-        sampleName: null,
-        methane: null,
-        ethane: null,
-        ethylene: null,
-        propane: null,
-        propylene: null,
-        unknown: null,
-        hydrogen: null,
-        deptId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: 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 = "添加质量月报Z404";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getZ404(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质量月报Z404";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateZ404(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addZ404(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delZ404(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有质量月报Z404数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportZ404(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
-  }
-};
-</script>