报表-项目列表

.env.development

@@ -4,4 +4,5 @@ VUE_APP_EXAM_WORK_HOST_URL=http://192.168.10.39:8001
 VUE_APP_QUESTIONS_HOST_URL=http://192.168.10.39:8008
 VUE_APP_OE_HOST_URL=http://192.168.10.39:8013
 VUE_APP_MARKING_HOST_URL=http://192.168.10.39:8004
-VUE_APP_DATA_PROCESS_HOST_URL=http://192.168.10.39:8005
+VUE_APP_DATA_PROCESS_HOST_URL=http://192.168.10.39:8005
+VUE_APP_REPORTS_HOST_URL=http://192.168.10.39:8015

src/constants/constants.js

@@ -7,6 +7,7 @@ export const QUESTION_API = "/api/ecs_ques"; //题库API
 export const EXCHANGE_API = "/api/ecs_outlet"; //接口机
 export const PRINT_API = "/api/ecs_prt";
 export const TASK_API = "/api/ctr/task";
+export const REPORTS_API = "/api/ecs_reports";
 
 //考试类型
 export const EXAM_TYPE = [

src/modules/portal/views/home/HomeSide.vue

@@ -90,6 +90,11 @@ const routesToMenu = [
     path: "/print",
     name: "印刷管理",
     groupCode: "PRINT_MENUS"
+  },
+  {
+    path: "/reports",
+    name: "报表",
+    groupCode: "REPORTS_MENUS"
   }
 ];
 

src/modules/portal/views/home/main/HomeMain.vue

@@ -48,6 +48,9 @@ const moduleDesc = {
   },
   print: {
     detail: "记录线下纸笔考试数码印刷准确数量与实施过程"
+  },
+  reports: {
+    detail: "报表"
   }
 };
 

src/modules/portal/views/tips/Tips.vue

@@ -219,6 +219,18 @@ const ALL_INSTRUCTIONS = {
         }
       ]
     }
+  ],
+  "/reports/tips": [
+    {
+      menu1Name: "分析项目",
+      menu2: [
+        {
+          name: "分析项目——项目列表",
+          link: "/reports/project",
+          detail: "分析项目——项目列表"
+        }
+      ]
+    }
   ]
 };
 

src/modules/reports/routes/routes.js

@@ -0,0 +1,21 @@
+import Home from "../../portal/views/home/Home.vue";
+import Tips from "../../portal/views/tips/Tips.vue";
+import Project from "../views/Project.vue";
+
+export default [
+  {
+    path: "/reports",
+    component: Home,
+    children: [
+      {
+        path: "tips", //模块说明
+        component: Tips
+      },
+      {
+        path: "project", //分析项目
+        meta: { privilegeCodes: "index_project" },
+        component: Project
+      }
+    ]
+  }
+];

src/modules/reports/views/Project.vue

@@ -0,0 +1,582 @@
+<template>
+  <section class="content">
+    <div class="box box-info">
+      <div
+        class="box-body"
+        v-loading.body="loading"
+        v-loading.fullscreen="loading"
+        element-loading-text="请稍后..."
+      >
+        <!-- 表单 -->
+        <el-form inline :model="formSearch">
+          <el-form-item label="项目名称">
+            <el-input
+              placeholder="请输入项目名称"
+              v-model="formSearch.name"
+              style="width: 180px"
+            />
+          </el-form-item>
+          <el-form-item label="分析类型">
+            <el-select
+              v-model="formSearch.analyseType"
+              :clearable="true"
+              class="input"
+            >
+              <el-option label="单项分析" value="SINGLE"> </el-option>
+              <el-option label="趋势分析" value="TREND"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="数据来源">
+            <el-select
+              v-model="formSearch.dataOrigin"
+              :clearable="true"
+              class="input"
+            >
+              <el-option label="同步" value="SYNC"> </el-option>
+              <el-option label="导入" value="IMPORT"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              @click="handleSearchBtn"
+            >
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-plus"
+              @click="openAddDialog"
+            >
+              新增
+            </el-button>
+            <el-button
+              size="small"
+              type="success"
+              icon="el-icon-check"
+              :disabled="noBatchSelected"
+              @click="enable('')"
+              >启用
+            </el-button>
+            <el-button
+              size="small"
+              type="danger"
+              icon="el-icon-close"
+              :disabled="noBatchSelected"
+              @click="disable('')"
+            >
+              禁用
+            </el-button>
+          </el-form-item>
+        </el-form>
+
+        <div class="block-seperator"></div>
+        <!-- 页面列表 -->
+        <el-table
+          :data="tableData"
+          border
+          resizable
+          stripe
+          @selection-change="selectChange"
+          style="width: 100%;"
+        >
+          <el-table-column type="selection" width="50"></el-table-column>
+          <el-table-column width="50" label="ID">
+            <span slot-scope="scope">{{ scope.row.id }}</span>
+          </el-table-column>
+          <el-table-column width="120" prop="name" label="项目名称">
+          </el-table-column>
+          <el-table-column width="100" prop="analyseTypeName" label="分析类型">
+          </el-table-column>
+          <el-table-column width="100" prop="dataOriginName" label="数据来源">
+          </el-table-column>
+          <el-table-column width="100" prop="sampleCount" label="样本数量">
+          </el-table-column>
+          <el-table-column width="100" prop="reportStatusName" label="项目状态">
+          </el-table-column>
+          <el-table-column prop="remarks" label="备注说明"> </el-table-column>
+          <el-table-column width="50" label="状态">
+            <span slot-scope="scope">
+              <span v-if="scope.row.enable">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="启用"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="禁用"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
+          </el-table-column>
+          <el-table-column :context="_self" label="操作" width="270">
+            <div slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                @click="openEdtDialog(scope.row)"
+              >
+                <i class="el-icon-edit"></i> 修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                plain
+                @click="deleteProject(scope.row)"
+              >
+                <i class="el-icon-delete"></i> 删除
+              </el-button>
+              <el-button
+                v-if="!scope.row.enable"
+                size="mini"
+                plain
+                type="primary"
+                icon="el-icon-check"
+                @click="enable(scope.row)"
+              >
+                <i class="fa fa-check" aria-hidden="true"></i>启用
+              </el-button>
+              <el-button
+                v-else-if="scope.row.enable"
+                size="mini"
+                type="danger"
+                icon="el-icon-close"
+                @click="disable(scope.row)"
+              >
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
+              </el-button>
+            </div>
+          </el-table-column>
+        </el-table>
+        <div class="page pull-right">
+          <el-pagination
+            v-if="paginationShow"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :page-sizes="[10, 20, 50, 100]"
+            @size-change="handleSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          />
+        </div>
+      </div>
+      <el-dialog
+        :title="this.getTitle()"
+        width="500px"
+        :visible.sync="model"
+        :close-on-click-modal="false"
+        @close="closeModel"
+      >
+        <el-form
+          :inline="true"
+          :model="projectForm"
+          ref="projectForm"
+          :rules="rules"
+          label-width="90px"
+          :key="modelKey"
+          class="editForm"
+        >
+          <el-row>
+            <el-form-item label="项目名称" prop="name" class="form-item">
+              <el-input
+                class="pull-length"
+                v-model="projectForm.name"
+                maxlength="50"
+              />
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="分析类型" prop="analyseType" class="form-item">
+              <el-select
+                v-model="projectForm.analyseType"
+                :clearable="true"
+                class="input"
+                :disabled="this.isEdit()"
+              >
+                <el-option label="单项分析" value="SINGLE"> </el-option>
+                <el-option label="趋势分析" value="TREND"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="数据来源" prop="dataOrigin" class="form-item">
+              <el-select
+                v-model="projectForm.dataOrigin"
+                :clearable="true"
+                class="input"
+                :disabled="this.isEdit()"
+              >
+                <el-option label="同步" value="SYNC"> </el-option>
+                <el-option label="导入" value="IMPORT"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row v-if="projectForm.dataOrigin == 'IMPORT'">
+            <el-form-item label="样本数量" prop="sampleCount" class="form-item">
+              <el-input
+                class="pull-length"
+                v-model="projectForm.sampleCount"
+                :disabled="this.isEdit()"
+                maxlength="3"
+              />
+            </el-form-item>
+          </el-row>
+          <el-row v-if="projectForm.dataOrigin == 'SYNC'">
+            <el-form-item label="选择考试" prop="examIds" class="form-item">
+              <el-select
+                class="input"
+                ref="select"
+                v-model="projectForm.examIds"
+                clearable
+                filterable
+                multiple
+                :loading="loading"
+                :disabled="this.isEdit()"
+              >
+                <el-option
+                  v-for="item in this.examList"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.name"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="备注说明" prop="remarks" class="form-item">
+              <el-input
+                class="pull-length"
+                v-model="projectForm.remarks"
+                maxlength="255"
+              />
+            </el-form-item>
+          </el-row>
+          <el-row class="pull-center">
+            <el-button
+              type="primary"
+              @click="sub"
+              :loading="this.projectForm.loading"
+              >确定</el-button
+            >
+            <el-button @click="closeModel">取消</el-button>
+          </el-row>
+        </el-form>
+      </el-dialog>
+    </div>
+  </section>
+</template>
+<script>
+import { REPORTS_API } from "@/constants/constants.js";
+import { mapState } from "vuex";
+
+export default {
+  name: "Project",
+  data() {
+    return {
+      examList: [],
+      examSelectloading: false,
+      loading: false,
+      selectedIds: [],
+      analyseTypeList: [
+        {
+          value: "SINGLE",
+          label: "单项分析"
+        },
+        {
+          value: "TREND",
+          label: "趋势分析"
+        }
+      ],
+      model: false,
+      modelKey: Math.random(),
+
+      paginationShow: false,
+      formSearch: {
+        analyseType: "",
+        dataOrigin: "",
+        name: ""
+      },
+      projectForm: {
+        id: null,
+        name: "",
+        analyseType: "",
+        dataOrigin: "",
+        sampleCount: null,
+        examIds: [],
+        loading: false
+      },
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 10,
+
+      rules: {
+        name: [
+          { required: true, message: "请输入项目名称", trigger: "change" }
+        ],
+        analyseType: [
+          { required: true, message: "请选择分析类型", trigger: "change" }
+        ],
+        dataOrigin: [
+          { required: true, message: "请选择数据来源", trigger: "change" }
+        ],
+        sampleCount: [
+          { required: true, message: "请输入样本数量", trigger: "change" },
+          {
+            pattern: /^[1-5]{1}$/,
+            message: "样本数量必须为1-5的整数",
+            trigger: "change"
+          }
+        ],
+        examIds: [
+          {
+            required: true,
+            type: "array",
+            message: "请选择考试",
+            trigger: "change"
+          }
+        ]
+      }
+    };
+  },
+  computed: {
+    ...mapState({ user: state => state.user }),
+    ids() {
+      var ids = "";
+      for (let id of this.selectedIds) {
+        if (!ids) {
+          ids += id;
+        } else {
+          ids += "," + id;
+        }
+      }
+      return ids;
+    },
+    noBatchSelected() {
+      return this.selectedIds.length === 0;
+    },
+    isSuperAdmin() {
+      return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    }
+  },
+  methods: {
+    deleteProject(row) {
+      this.$confirm("确定删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        var url = REPORTS_API + "/project/" + row.id;
+        this.$httpWithMsg.delete(url).then(() => {
+          this.$notify({
+            type: "success",
+            message: "删除成功！"
+          });
+          this.searchForm();
+        });
+      });
+    },
+    async examSearch() {
+      this.$http.get(REPORTS_API + "/project/allExam").then(response => {
+        this.examList = response.data;
+      });
+    },
+    getTitle() {
+      if (this.projectForm.id) {
+        return "修改项目";
+      } else {
+        return "新增项目";
+      }
+    },
+    isEdit() {
+      if (this.projectForm.id) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    //禁用
+    disable(row) {
+      var ids = this.checkIds(row);
+      if (!ids) return;
+      this.$confirm("是否禁用所选项目？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        var url = REPORTS_API + "/project/disable?ids=" + ids;
+        this.$httpWithMsg.put(url).then(() => {
+          this.$notify({
+            type: "success",
+            message: "禁用成功"
+          });
+          this.searchForm();
+        });
+      });
+    },
+
+    //启用
+    enable(row) {
+      var ids = this.checkIds(row);
+      if (!ids) return;
+      this.$confirm("是否启用所选项目？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        var url = REPORTS_API + "/project/enable?ids=" + ids;
+        this.$httpWithMsg.put(url).then(() => {
+          this.$notify({
+            type: "success",
+            message: "启用成功"
+          });
+          this.searchForm();
+        });
+      });
+    },
+    checkIds(row) {
+      if (row) {
+        return row.id;
+      } else {
+        if (this.ids.length == 0) {
+          this.$notify({
+            type: "warning",
+            message: "请选择项目"
+          });
+          return "";
+        } else {
+          return this.ids;
+        }
+      }
+    },
+    selectChange(row) {
+      this.selectedIds = [];
+      row.forEach(element => {
+        this.selectedIds.push(element.id);
+      });
+    },
+    openAddDialog() {
+      this.projectForm = Object.assign({});
+      this.modelKey = Math.random();
+      this.model = true;
+    },
+    openEdtDialog(row) {
+      this.modelKey = Math.random();
+      this.projectForm = Object.assign({}, row);
+      this.model = true;
+    },
+    async sub() {
+      const res = await this.$refs.projectForm.validate();
+
+      if (res === false) {
+        return;
+      }
+      this.projectForm.loading = true;
+      if (this.projectForm.id) {
+        let url = REPORTS_API + "/project/update";
+        this.$httpWithMsg
+          .post(url, this.projectForm)
+          .then(() => {
+            this.$notify({
+              type: "success",
+              message: "修改成功！"
+            });
+            this.closeModel();
+            this.searchForm();
+          })
+          .finally(() => (this.projectForm.loading = false));
+      } else {
+        let url = REPORTS_API + "/project/add";
+        this.$httpWithMsg
+          .post(url, this.projectForm)
+          .then(() => {
+            this.$notify({
+              type: "success",
+              message: "保存成功！"
+            });
+            this.closeModel();
+            this.searchForm();
+          })
+          .finally(() => (this.projectForm.loading = false));
+      }
+    },
+    closeModel() {
+      this.model = false;
+      this.$refs.projectForm.resetFields();
+      this.modelKey = Math.random();
+    },
+    handleSearchBtn() {
+      this.currentPage = 1;
+      this.searchForm();
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.searchForm();
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.searchForm();
+    },
+    //查询
+    searchForm() {
+      this.loading = true;
+      var url =
+        REPORTS_API + "/project/page/" + this.currentPage + "/" + this.pageSize;
+      this.$httpWithMsg
+        .get(url, { params: this.formSearch })
+        .then(response => {
+          this.tableData = response.data.list;
+          this.total = response.data.total;
+          this.loading = false;
+
+          this.$nextTick(function() {
+            this.paginationShow = true;
+          });
+        })
+        .finally(() => (this.loading = false));
+    },
+    init() {
+      this.searchForm();
+      this.examSearch();
+    }
+  },
+  //初始化查询
+  created() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped>
+.page {
+  margin-top: 10px;
+}
+.pull-length {
+  width: 300px;
+}
+.pull-center {
+  margin-top: 20px;
+}
+.editForm .el-form-item {
+  margin-bottom: 12px;
+}
+</style>

src/router.js

@@ -7,6 +7,7 @@ import MarklRoutes from "./modules/marking/routes/routes";
 import QuestionsRoutes from "./modules/questions/routes/routes";
 import OeRoutes from "./modules/oe/routes/routes";
 import PrintRoutes from "./modules/print/routes/routes";
+import ReportsRoutes from "./modules/reports/routes/routes";
 import { CORE_API } from "@/constants/constants.js";
 
 Vue.use(Router);
@@ -21,7 +22,8 @@ let router = new Router({
     ...MarklRoutes,
     ...QuestionsRoutes,
     ...OeRoutes,
-    ...PrintRoutes
+    ...PrintRoutes,
+    ...ReportsRoutes
   ]
 });
 

vue.config.js

@@ -42,6 +42,10 @@ const proxy = {
   "/api/ctr/task": {
     target: process.env.VUE_APP_PRINT_HOST_URL || "http://192.168.10.39:8011",
     changeOrigin: true
+  },
+  "/api/ecs_reports": {
+    target: process.env.VUE_APP_REPORTS_HOST_URL || "http://192.168.10.39:8015",
+    changeOrigin: true
   }
 };