Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/api/system/operating/operating.js

@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 查询类型列表
+export function listType(query) {
+  return request({
+    url: '/system/operating/listType',
+    method: 'get',
+    params: query
+  })
+}
+//查询具体数据列表
+export function listData(query) {
+  return request({
+    url: '/system/operating/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//查询类型数据
+export function getType(id) {
+  return request({
+    url: '/system/operating/type/' + id,
+    method: 'get'
+  })
+}
+
+//查询具体数据
+export function getData(id) {
+  return request({
+    url: '/system/operating/data/' + id,
+    method: 'get'
+  })
+}
+//获取所有的分类数据
+export function getTypes() {
+  return request({
+    url: '/system/operating/type/list' ,
+    method: 'get'
+  })
+}
+
+// 添加或者编辑类型数据
+export function addOrEditType(data) {
+  return request({
+    url: '/system/operating/addType',
+    method: 'post',
+    data: data
+  })
+}
+
+//添加或者编辑具体数据
+export function addOrEditData(data) {
+  return request({
+    url: '/system/operating/addData',
+    method: 'post',
+    data: data
+  })
+}
+
+//删除类型数据
+export function delType(id) {
+  return request({
+    url: '/system/operating/type/' + id,
+    method: 'delete'
+  })
+}
+
+//删除具体数据
+export function delData(id) {
+  return request({
+    url: '/system/operating/data/' + id,
+    method: 'delete'
+  })
+}
+

src/views/core/reportForms/monitorAccessReport.vue

@@ -65,7 +65,7 @@
             </el-table-column>
             <el-table-column label="地区" align="center" prop="city" />
             <el-table-column label="单位名称" align="center" prop="orgName" />
-            <el-table-column label="网点数量" align="left" prop="networkNumber"/>
+            <el-table-column label="网点数量" align="center" prop="networkNumber"/>
             <el-table-column label="应调阅次数" align="center" prop="planAccessNumber"/>
             <el-table-column label="调阅次数" align="center" prop="realityAccessNumber"/>
             <el-table-column label="平均调阅时长(小时)" align="center" prop="duration"/>

src/views/core/reportForms/resumptionReport.vue

@@ -83,7 +83,7 @@
             </el-table-column>
             <el-table-column label="地区" align="center" prop="city" />
             <el-table-column label="单位名称" align="center" prop="orgName" width="240"/>
-            <el-table-column label="网点数量" align="left" prop="networkNumber" width="100"/>
+            <el-table-column label="网点数量" align="center" prop="networkNumber" width="100"/>
 
                 <el-table-column label="总计" align="center">
            <el-table-column label="应履职次数" align="center" prop="totalPlanNumber" width="120"/>

src/views/core/reportForms/serviceBankReport.vue

@@ -68,8 +68,8 @@
               </template>
             </el-table-column>
             <el-table-column label="地区" align="center" prop="city" />
-            <el-table-column label="单位名称" align="center" prop="orgName" width="100"/>
-            <el-table-column label="网点数量" align="left" prop="networkNumber" width="100"/>
+            <el-table-column label="单位名称" align="center" prop="orgName" width="340"/>
+            <el-table-column label="网点数量" align="center" prop="networkNumber"/>
             <el-table-column label="应履职次数" align="center" prop="planNumber"/>
             <el-table-column label="已履职次数" align="center" prop="realityNumber"/>
             <el-table-column label="履职完成率" align="center" prop="realityRate"/>

src/views/system/operating/data/index.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="app-container">
+    <div class="main-right-box">
+      <!--    搜索条件    -->
+      <div class="main-search-box">
+        <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
+          <el-form-item label="资料类型" prop="sourceId">
+            <el-select style="width: 100%" v-model="queryParams.sourceId" placeholder="请选择资料类型">
+              <el-option
+                v-for="item in types"
+                :key="item.id"
+                :label="item.sourceName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+        </el-form>
+
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"
+            >搜索
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
+            >重置
+            </el-button>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-button  icon="el-icon-plus" size="mini" type="primary"
+                       @click="handleAdd">新增
+            </el-button>
+          </el-col>
+
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </div>
+
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        border
+        height="646" size="small" >
+        <el-table-column align="center" label="序号" width="100">
+          <template v-slot:default="scope">
+            <span v-text="getPageIndex(scope.$index)"> </span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="资料类型" prop="sourceName"/>
+        <el-table-column :show-overflow-tooltip="true" label="文件名称" prop="fileName"/>
+        <el-table-column :show-overflow-tooltip="true" label="排序" prop="sort"/>
+        <el-table-column align="center" label="创建时间" prop="createTime" width="200">
+        </el-table-column>
+        <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+          <template v-if="scope.row.id !== 1" slot-scope="scope">
+            <el-button  icon="el-icon-edit-outline" size="mini" type="text"
+                       @click="handleUpdate(scope.row)">编辑
+            </el-button>
+            <el-button  icon="el-icon-delete" size="mini" type="text"
+                       @click="handleDelete(scope.row)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total"
+                  @pagination="getList"/>
+
+    </div>
+
+
+    <!-- 添加或修改角色配置对话框 -->
+    <DialogCom :title="title" :visible.sync="open" append-to-body width="650px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="22">
+            <el-form-item label="资料类型" prop="sourceName">
+              <el-select style="width: 100%" v-model="form.sourceId" placeholder="请选择资料类型">
+                <el-option
+                  v-for="item in types"
+                  :key="item.id"
+                  :label="item.sourceName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="22">
+            <el-form-item label="上传文件" ref="files" prop="fileList">
+              <K-file-upload
+                ref="upload"
+                :defaultValue="formFileListDefualtValue"
+                v-model="form.fileList"
+                :limit="1"
+                :fileType="['pdf','doc','docx']"
+                @input="fileListChanged"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="22">
+            <el-form-item label="资料排序" prop="sort">
+              <el-input-number v-model="form.sort"
+                               :max="1000"
+                               :min="0" controls-position="right" style="width: 100%"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </DialogCom>
+  </div>
+</template>
+
+<script>
+import {
+  listData,delData,addOrEditData,getData,getTypes
+} from "@/api/system/operating/operating";
+import KFileUpload from "@/components/K-FileUpload/index.vue";
+export default {
+  name: "operatingData",
+  components: {KFileUpload},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      formFileListDefualtValue: [],
+      // 选中数组
+      ids: [],
+      types:[],
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      typeList:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sourceId: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        sourceId: [
+          {required: true, message: "资料分类不能为空", trigger: "blur"}
+        ],
+        sort: [
+          {required: true, message: "排序不能为空", trigger: "blur"}
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getTypes();
+  },
+  methods: {
+    fileListChanged(list) {
+      this.$refs.files.clearValidate();
+    },
+    getPageIndex($index) {
+      //表格序号
+      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+
+    },
+    getTypes(){
+      getTypes().then(response => {
+          this.types = response.data;
+        }
+      );
+    },
+    /** 查询角色列表 */
+    getList() {
+      this.loading = true;
+      listData(this.queryParams).then(response => {
+          this.typeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      if (this.$refs.menu !== undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+        this.form = {
+          sourceName: undefined,
+          sort: 0,
+        };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增操作手册";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getData(id).then(response => {
+        this.form = response.data;
+        let file = {url:this.form.fileUrl,name:this.form.fileName};
+        let fileList = [];
+        fileList.push(JSON.stringify(file));
+        this.form.fileList = fileList;
+        this.formFileListDefualtValue = fileList;
+        this.open = true;
+        this.title = "编辑操作手册";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        console.log(this.form)
+        console.log(this.form.fileList)
+        if(this.form.fileList.length === 0){
+          this.$modal.msgError("请上传文件！");
+          throw new Error("请上传文件！");
+        }
+        if (valid) {
+          let file = JSON.parse(this.form.fileList[0]);
+          this.form.fileUrl = file.url;
+          this.form.fileName = file.name;
+          if (this.form.id !== undefined) {
+            addOrEditData(this.form).then(response => {
+              this.$modal.msgSuccess("处理成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            console.log(this.form);
+            addOrEditData(this.form).then(response => {
+              this.$modal.msgSuccess("处理成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id || this.ids;
+      this.$modal.confirm('确认要删除"' + row.sourceName + '"吗?').then(function () {
+        return delData(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+  }
+};
+</script>

src/views/system/operating/type/index.vue

@@ -0,0 +1,235 @@
+<template>
+  <div class="app-container">
+    <div class="main-right-box">
+      <!--    搜索条件    -->
+      <div class="main-search-box">
+        <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
+          <el-form-item label="资料类型" prop="sourceName">
+            <el-input v-model="queryParams.sourceName" :maxlength="50" clearable placeholder="请输入资料类型"
+                      style="width: 240px"
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+
+        </el-form>
+
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery"
+            >搜索
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
+            >重置
+            </el-button>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-button  icon="el-icon-plus" size="mini" type="primary"
+                       @click="handleAdd">新增
+            </el-button>
+          </el-col>
+
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </div>
+
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        border
+        height="646" size="small" @selection-change="handleSelectionChange">
+        <el-table-column align="center" label="序号" width="100">
+          <template v-slot:default="scope">
+            <span v-text="getPageIndex(scope.$index)"> </span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="资料类型" prop="sourceName"/>
+        <el-table-column :show-overflow-tooltip="true" label="排序" prop="sort"/>
+        <el-table-column align="center" label="创建时间" prop="createTime" width="200">
+        </el-table-column>
+        <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+          <template v-if="scope.row.id !== 1" slot-scope="scope">
+            <el-button v-hasPermi="[]" icon="el-icon-edit-outline" size="mini" type="text"
+                       @click="handleUpdate(scope.row)">编辑
+            </el-button>
+            <el-button v-hasPermi="[]" icon="el-icon-delete" size="mini" type="text"
+                       @click="handleDelete(scope.row)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total"
+                  @pagination="getList"/>
+
+    </div>
+
+
+    <!-- 添加或修改角色配置对话框 -->
+    <DialogCom :title="title" :visible.sync="open" append-to-body width="450px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="22">
+            <el-form-item label="资料类型" prop="sourceName">
+              <el-input v-model="form.sourceName" :maxlength="50" placeholder="请输入资料类型"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="22">
+            <el-form-item label="资料排序" prop="sort">
+              <el-input-number v-model="form.sort"
+                               :max="1000"
+                               :min="0" controls-position="right" style="width: 100%"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </DialogCom>
+  </div>
+</template>
+
+<script>
+import {
+  listType,delType,addOrEditType,getType
+} from "@/api/system/operating/operating";
+export default {
+  name: "operatingType",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      typeList:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sourceName: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        sourceName: [
+          {required: true, message: "资料分类不能为空", trigger: "blur"}
+        ],
+        sort: [
+          {required: true, message: "排序不能为空", trigger: "blur"}
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getPageIndex($index) {
+      //表格序号
+      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+
+    },
+    /** 查询角色列表 */
+    getList() {
+      this.loading = true;
+      listType(this.queryParams).then(response => {
+          this.typeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+        this.form = {
+          sourceName: undefined,
+          sort: 0,
+        };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增资料类型";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getType(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "编辑资料类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            addOrEditType(this.form).then(response => {
+              this.$modal.msgSuccess("处理成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOrEditType(this.form).then(response => {
+              this.$modal.msgSuccess("处理成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id || this.ids;
+      this.$modal.confirm('确认要删除"' + row.sourceName + '"吗?').then(function () {
+        return delType(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+  }
+};
+</script>