Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr

god-ui/src/views/pzhmyManage/jobSop/index.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+      <el-form-item label="设备名称" prop="equipName">
+        <el-input
+          v-model="queryParams.equipName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备类型" prop="equipType">
+        <el-input
+          v-model="queryParams.equipType"
+          placeholder="请输入设备类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="作业类型" prop="totalNum">
+        <el-input
+          v-model="queryParams.totalNum"
+          placeholder="请输入作业类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数据操作" prop="onlineNum">
+        <el-input
+          v-model="queryParams.onlineNum"
+          placeholder="请输入数据操作"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="最后修改日期" prop="addDate">
+        <el-date-picker clearable
+          v-model="queryParams.addDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择最后修改日期">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pzhmyManage:equip:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pzhmyManage:equip:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pzhmyManage:equip:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="equipList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备名称" align="center" prop="equipName" />
+      <el-table-column label="设备类型" align="center" prop="equipType" />
+      <el-table-column label="作业类型" align="center" prop="totalNum" />
+      <el-table-column label="数据操作" align="center" prop="onlineNum" />
+<!--      <el-table-column label="工作数量" align="center" prop="workNum" />-->
+<!--      <el-table-column label="类别编号" align="center" prop="typeOrder" />-->
+<!--      <el-table-column label="生产厂商" align="center" prop="factory" />-->
+      <el-table-column label="SOP内容" align="center" prop="remark" />
+      <el-table-column label="最后修改时间" align="center" prop="addDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.addDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="数据类型" align="center" prop="dataType" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['pzhmyManage:equip:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pzhmyManage:equip:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改基础信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="98px">
+        <el-form-item label="设备名称" prop="equipName">
+          <el-input v-model="form.equipName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="设备类型" prop="equipType">
+          <el-input v-model="form.equipType" placeholder="请输入设备类型" />
+        </el-form-item>
+        <el-form-item label="作业类型" prop="totalNum">
+          <el-input v-model="form.totalNum" placeholder="请输入作业类型" />
+        </el-form-item>
+        <el-form-item label="数据操作" prop="onlineNum">
+          <el-input v-model="form.onlineNum" placeholder="请输入数据操作" />
+        </el-form-item>
+<!--        <el-form-item label="工作数量" prop="workNum">-->
+<!--          <el-input v-model="form.workNum" placeholder="请输入工作数量" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="类别编号" prop="typeOrder">-->
+<!--          <el-input v-model="form.typeOrder" placeholder="请输入类别编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="生产厂商" prop="factory">-->
+<!--          <el-input v-model="form.factory" placeholder="请输入生产厂商" />-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="最后修改时间" prop="addDate">
+          <el-date-picker clearable
+            v-model="form.addDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择最后修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="SOP内容" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEquip, getEquip, delEquip, addEquip, updateEquip } from "@/api/pzhmyManage/equip";
+
+export default {
+  //攀枝花煤业，作业SOP数据
+  name: "JobSOP",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 基础信息表格数据
+      equipList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        equipName: null,
+        equipType: null,
+        totalNum: null,
+        onlineNum: null,
+        workNum: null,
+        typeOrder: null,
+        factory: null,
+        addDate: null,
+        dataType: "作业SOP"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询基础信息列表 */
+    getList() {
+      this.loading = true;
+      listEquip(this.queryParams).then(response => {
+        this.equipList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        equipName: null,
+        equipType: null,
+        totalNum: null,
+        onlineNum: null,
+        workNum: null,
+        typeOrder: null,
+        factory: null,
+        remark: null,
+        addDate: null,
+        dataType: 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 = "添加作业SOP信息";
+      this.form.dataType = "作业SOP";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getEquip(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改作业SOP信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEquip(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addEquip(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除作业SOP信息编号为"' + ids + '"的数据项？').then(function() {
+        return delEquip(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('pzhmyManage/equip/export', {
+        ...this.queryParams
+      }, `equip_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

god-ui/src/views/pzhmyManage/repairExamine/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="员工名称" prop="userName">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+      <el-form-item label="员工姓名" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入员工名称"
+          placeholder="请输入员工姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,46 +17,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训内容" prop="trainInfo">
+      <el-form-item label="维保设备数量" prop="trainInfo">
         <el-input
           v-model="queryParams.trainInfo"
-          placeholder="请输入培训内容"
+          placeholder="请输入维保设备数量"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="内容分类" prop="trainType">
+      <el-form-item label="维保合格率" prop="trainType">
         <el-input
           v-model="queryParams.trainType"
-          placeholder="请输入内容分类"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否签到" prop="isSign">
-        <el-select v-model="queryParams.isSign" placeholder="请选择是否签到" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="考核情况" prop="checkInfo">
-        <el-select v-model="queryParams.checkInfo" clearable placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="部门人数" prop="deptNum">
-        <el-input
-          v-model="queryParams.deptNum"
-          placeholder="请输入部门人数"
+          placeholder="请输入维保合格率"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -105,18 +77,18 @@
 
     <el-table v-loading="loading" :data="trainList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="员工名称" align="center" prop="userName" />
+      <el-table-column label="员工姓名" align="center" prop="userName" />
       <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="培训内容" align="center" prop="trainInfo" />
-      <el-table-column label="内容分类" align="center" prop="trainType" />
-      <el-table-column label="是否签到" align="center" prop="isSign">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSign"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="考核情况" align="center" prop="checkInfo" />
-      <el-table-column label="部门人数" align="center" prop="deptNum" />
-      <el-table-column label="培训时间" align="center" prop="remark" width="180">
+      <el-table-column label="设备维保数量" align="center" prop="trainInfo" />
+      <el-table-column label="维保合格率" align="center" prop="trainType" />
+<!--      <el-table-column label="是否签到" align="center" prop="isSign">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSign"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="考核得分" align="center" prop="checkInfo" />
+<!--      <el-table-column label="部门人数" align="center" prop="deptNum" />-->
+      <el-table-column label="考核时间" align="center" prop="remark" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.remark, '{y}-{m}-{d}') }}</span>
         </template>
@@ -151,50 +123,43 @@
 
     <!-- 添加或修改人员培训数据对话框 -->
     <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="userName">
-          <el-input v-model="form.userName" placeholder="请输入员工名称" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="98px">
+        <el-form-item label="员工姓名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入员工姓名" />
         </el-form-item>
         <el-form-item label="部门名称" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入部门名称" />
         </el-form-item>
-        <el-form-item label="培训内容" prop="trainInfo">
+        <el-form-item label="设备维保数量" prop="trainInfo">
           <el-input v-model="form.trainInfo" placeholder="请输入培训内容" />
         </el-form-item>
-        <el-form-item label="内容分类" prop="trainType">
+        <el-form-item label="维保合格率" prop="trainType">
           <el-input v-model="form.trainType" placeholder="请输入内容分类" />
         </el-form-item>
-        <el-form-item label="是否签到" prop="isSign">
-          <el-radio-group v-model="form.isSign">
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
+<!--        <el-form-item label="是否签到" prop="isSign">-->
+<!--          <el-radio-group v-model="form.isSign">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.sys_yes_no"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+        <el-form-item label="考核得分" prop="checkInfo">
+          <el-input v-model="form.checkInfo" placeholder="请输入考核得分" />
         </el-form-item>
-        <el-form-item label="考核情况" prop="checkInfo">
-          <el-select v-model="form.checkInfo" clearable placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="部门人数" prop="deptNum">
-          <el-input v-model="form.deptNum" placeholder="请输入部门人数" />
-        </el-form-item>
-        <el-form-item label="数据类型" prop="dataType">
-          <el-input v-model="form.dataType" placeholder="请输入数据类型" />
-        </el-form-item>
-        <el-form-item label="培训时间" prop="remark">
+<!--        <el-form-item label="部门人数" prop="deptNum">-->
+<!--          <el-input v-model="form.deptNum" placeholder="请输入部门人数" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="数据类型" prop="dataType">-->
+<!--          <el-input v-model="form.dataType" placeholder="请输入数据类型" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="考核时间" prop="remark">
           <el-date-picker clearable
                           v-model="form.remark"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          placeholder="请选择培训时间">
+                          placeholder="请选择考核时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -212,7 +177,7 @@ import { listTrain, getTrain, delTrain, addTrain, updateTrain } from "@/api/pzhm
 export default {
   //设备维修人员考核数据
   name: "RepairExamine",
-  dicts: ['sys_yes_no'],
+  // dicts: ['sys_yes_no'],
   data() {
     return {
       options: [{
@@ -292,7 +257,7 @@ export default {
         isSign: null,
         checkInfo: null,
         deptNum: null,
-        dataType: "人员培训"
+        dataType: null
       };
       this.resetForm("form");
     },
@@ -316,8 +281,8 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加人员培训数据";
-      this.form.dataType = "人员培训";
+      this.title = "添加设备维修人员考核数据";
+      this.form.dataType = "人员考核";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -326,7 +291,7 @@ export default {
       getTrain(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改人员培训数据";
+        this.title = "修改设备维修人员考核数据";
       });
     },
     /** 提交按钮 */
@@ -352,7 +317,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除人员培训数据编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除设备维修人员考核数据编号为"' + ids + '"的数据项？').then(function() {
         return delTrain(ids);
       }).then(() => {
         this.getList();